Changeset 34 for trunk/src/sh_srp.c

Timestamp:

May 19, 2006, 8:09:51 PM (18 years ago)

Author:

rainer

Message:

Code cleanup and minor fixes

File:

• trunk/src/sh_srp.c (modified) (14 diffs)

trunk/src/sh_srp.c

@@ -197 +197 @@
 
   char           *combi;
-  size_t          len;
+  size_t          len, l2;
   register int i;
   unsigned char * dez = NULL;
@@ -221 +221 @@
   skey->vernam[KEY_LEN] = '\0';
 
-  len = sl_strlen(salt) + sl_strlen(skey->vernam) + 1;
+  len = sl_strlen(salt) + 1;
+  l2  = sl_strlen(skey->vernam);
+  if (sl_ok_adds(len, l2))
+    len += l2;
 
   /* H(s,P)
@@ -240 +243 @@
 {
   char           *combi;
-  size_t          len;
+  size_t          len, l2, l3;
   static char     hash[KEY_LEN+1];
   
@@ -248 +251 @@
              _("x1 != NULL && x2 != NULL && x3 !=NULL"), NULL);
 
-  len = sl_strlen(x1) + sl_strlen(x2) + sl_strlen(x3) + 1;
+  len = sl_strlen(x1) + 1;
+  l2  = sl_strlen(x2); 
+  l3  = sl_strlen(x3);
+
+  if (sl_ok_adds(len, l2))
+    len += l2;
+  if (sl_ok_adds(len, l3))
+    len += l3;
   
   /* H(x1,x2,x3)
@@ -392 +402 @@
   char    *str;
   char    *combi;
-  size_t   len;
   bigerr_t res;
 
@@ -408 +417 @@
   
   if (str != NULL)
-    {
-      len = sl_strlen(str) + 1;
-      combi = SH_ALLOC(len);
-      (void) sl_strlcpy (combi, str, len);
-    }
+    combi = sh_util_strdup(str);
   else
     combi = NULL;
@@ -430 +435 @@
   char    *str;
   char    *combi;
-  long     len;
   bigerr_t res;
 
@@ -469 +473 @@
   
   if (str != NULL)
-    {
-      len = sl_strlen(str) + 1;
-      combi = SH_ALLOC(len);
-      sl_strlcpy (combi, str, len);
-      /* fprintf(stderr, "OK2a %ld %s\n", len, combi); */
-    }
+    combi = sh_util_strdup(str);
   else
     combi = NULL;
@@ -496 +495 @@
   char    *str;
   char    *combi;
-  size_t   len;
   bigerr_t res;
 
@@ -571 +569 @@
 
   if (str != NULL)
-    {
-      len = sl_strlen(str) + 1;
-      combi = SH_ALLOC(len);
-      (void) sl_strlcpy (combi, str, len);
-    }
+    combi = sh_util_strdup(str);
   else
     combi = NULL;
@@ -601 +595 @@
   char    *str;
   char    *combi;
-  size_t   len;
   bigerr_t res;
 
@@ -651 +644 @@
   
   if (str != NULL)
-    {
-      len = sl_strlen(str) + 1;
-      combi = SH_ALLOC(len);
-      (void) sl_strlcpy (combi, str, len);
-    }
+    combi = sh_util_strdup(str);
   else
     combi = NULL;
@@ -679 +668 @@
   char    *combi;
   char    *str;
-  size_t   len;
   bigerr_t res;
   
@@ -700 +688 @@
   
   if (str != NULL)
-    {
-      len = sl_strlen(str) + 1;
-      combi = SH_ALLOC(len);
-      (void) sl_strlcpy (combi, str, len);
-    }
+    combi = sh_util_strdup(str);
   else
     combi = NULL;