Changeset 137 for trunk/src/sh_forward.c

Timestamp:

Oct 28, 2007, 1:17:58 AM (17 years ago)

Author:

rainer

Message:

Fix compile errors.

File:

• trunk/src/sh_forward.c (modified) (10 diffs)

trunk/src/sh_forward.c

@@ -277 +277 @@
   register int i;
   unsigned char * dez = NULL;
+  char hashbuf[KEYBUF_SIZE];
 
   if (password == NULL)
@@ -297 +298 @@
         }
       (void) sl_strlcpy (skey->vernam,
-                         sh_tiger_hash(skey->vernam, TIGER_DATA, PW_LEN), 
+                         sh_tiger_hash(skey->vernam, TIGER_DATA, PW_LEN,
+                                       hashbuf, sizeof(hashbuf)), 
                          KEY_LEN+1);
     }
@@ -320 +322 @@
   (void) sl_strlcpy (hash, 
                      sh_tiger_hash(combi, TIGER_DATA, 
-                                   (unsigned long) sl_strlen(combi)),
+                                   (unsigned long) sl_strlen(combi),
+                                   hashbuf, sizeof(hashbuf)),
                      KEY_LEN+1);
 
@@ -1012 +1015 @@
       /* --- Create own nonce. ---
        */
-      ticks = (UINT32) taus_get (&(skey->rng0[0]), 
-                                 &(skey->rng1[0]),
-                                 &(skey->rng2[0]));
+      ticks = (UINT32) taus_get ();
+
       (void) sl_strlcpy(nonce_u, 
                         sh_tiger_hash((char *) &ticks, 
@@ -1591 +1593 @@
               /* --- Generate a nonce. ---
                */
-              ticks = (UINT32) taus_get (&(skey->rng0[0]), 
-                                         &(skey->rng1[0]),
-                                         &(skey->rng2[0]));
+              ticks = (UINT32) taus_get ();
               
               (void) sl_strlcpy(nclt, 
@@ -1897 +1897 @@
   char hashbuf[KEYBUF_SIZE];
 
-  val[0] = taus_get (&(skey->rng0[0]), &(skey->rng0[1]), &(skey->rng0[2]));
-  val[1] = taus_get (&(skey->rng0[0]), &(skey->rng0[1]), &(skey->rng0[2]));
+  val[0] = taus_get ();
+  val[1] = taus_get ();
 
   sl_strlcpy (output, 
@@ -2970 +2970 @@
               sl_strlcpy (conn->peer, &(conn->buf[KEY_LEN]), SH_MINIBUF+1);
 
-              ticks = (UINT32) taus_get (&(skey->rng0[0]), 
-                                         &(skey->rng1[0]),
-                                         &(skey->rng2[0]));
+              ticks = (UINT32) taus_get ();
+
               if (conn->K != NULL) 
                 {
@@ -3430 +3429 @@
               sl_strlcpy (conn->peer, &(conn->buf[KEY_LEN]), SH_MINIBUF+1);
 
-              ticks = (UINT32) taus_get (&(skey->rng0[0]), 
-                                         &(skey->rng1[0]),
-                                         &(skey->rng2[0]));
+              ticks = (UINT32) taus_get ();
+
               test = (char *) &ticks;
               sh_util_cpylong (conn->challenge, test, 4);
@@ -3790 +3788 @@
               /* -- create server nounce v --
                */
-              ticks = (UINT32) taus_get (&(skey->rng0[0]), 
-                                         &(skey->rng1[0]),
-                                         &(skey->rng2[0]));
+              ticks = (UINT32) taus_get ();
               
               if (conn->A != NULL)
@@ -4116 +4112 @@
                    * create nonce u 
                    */
-                  ticks = (UINT32) taus_get (&(skey->rng0[0]), 
-                                             &(skey->rng1[0]),
-                                             &(skey->rng2[0])); 
+                  ticks = (UINT32) taus_get ();
+
                   test = (char *) &ticks;
                   sh_util_cpylong (u, test, 4);  /* u        nounce        */