OSSP CVS Repository

ossp - Check-in [5531]
Not logged in 		[Honeypot]  [Browse]  [Home]  [Login]  [Reports] 
[Search]  [Ticket]  [Timeline] 
  [Patchset]  [Tagging/Branching] 

Check-in Number: 5531
Date: 2006-Jul-28 21:16:03 (local)
2006-Jul-28 19:16:03 (UTC)
User:rse
Branch:
Comment: Even more pendantic code cleanups according to complains by SPLINT
Tickets:
Inspections:
Files:
ossp-pkg/uuid/uuid_md5.c      1.13 -> 1.14     1 inserted, 0 deleted
ossp-pkg/uuid/uuid_prng.c      1.11 -> 1.12     7 inserted, 5 deleted
ossp-pkg/uuid/uuid_sha1.c      1.3 -> 1.4     29 inserted, 25 deleted
ossp-pkg/uuid/uuid_sha1.h      1.2 -> 1.3     2 inserted, 1 deleted
ossp-pkg/uuid/uuid_md5.c 1.13 -> 1.14 

--- uuid_md5.c   2006/07/28 18:18:39     1.13
+++ uuid_md5.c   2006/07/28 19:16:03     1.14
@@ -155,6 +155,7 @@
     context->state[1] = 0xefcdab89;
     context->state[2] = 0x98badcfe;
     context->state[3] = 0x10325476;
+    return;
 }
 
 /* MD5 block update operation. Continues an MD5 message-digest

ossp-pkg/uuid/uuid_prng.c 1.11 -> 1.12 

--- uuid_prng.c  2006/01/13 06:44:31     1.11
+++ uuid_prng.c  2006/07/28 19:16:03     1.12
@@ -48,7 +48,7 @@
     int fd = -1;
     struct timeval tv;
     pid_t pid;
-    size_t i;
+    unsigned int i;
 
     /* sanity check argument(s) */
     if (prng == NULL)
@@ -68,8 +68,10 @@
     }
 
     /* initialize MD5 engine */
-    if (md5_create(&((*prng)->md5)) != MD5_RC_OK)
+    if (md5_create(&((*prng)->md5)) != MD5_RC_OK) {
+        free(*prng);
         return PRNG_RC_INT;
+    }
 
     /* initialize time resolution compensation counter */
     (*prng)->cnt = 0;
@@ -115,7 +117,7 @@
     if (prng->dev != -1) {
         retries = 0;
         while (n > 0) {
-            i = read(prng->dev, (void *)p, n);
+            i = (int)read(prng->dev, (void *)p, n);
             if (i <= 0) {
                 if (retries++ > 16)
                     break;
@@ -159,10 +161,10 @@
 
     /* close PRNG device */
     if (prng->dev != -1)
-        close(prng->dev);
+        (void)close(prng->dev);
 
     /* destroy MD5 engine */
-    md5_destroy(prng->md5);
+    (void)md5_destroy(prng->md5);
 
     /* free object */
     free(prng);

ossp-pkg/uuid/uuid_sha1.c 1.3 -> 1.4 

--- uuid_sha1.c  2006/01/13 06:44:31     1.3
+++ uuid_sha1.c  2006/07/28 19:16:05     1.4
@@ -111,7 +111,7 @@
 /* Function Prototypes */
 static int SHA1Reset  (SHA1Context *);
 static int SHA1Input  (SHA1Context *, const sha1_uint8_t *, unsigned int);
-static int SHA1Result (SHA1Context *, sha1_uint8_t Message_Digest[SHA1HashSize]);
+static int SHA1Result (SHA1Context *, sha1_uint8_t Message_Digest[]);
 
 /* Local Function Prototyptes */
 static void SHA1PadMessage         (SHA1Context *);
@@ -152,7 +152,7 @@
  *  of hash is stored in the 0th element, the last octet of hash in the
  *  19th element.
  */
-static int SHA1Result(SHA1Context *context, sha1_uint8_t Message_Digest[SHA1HashSize])
+static int SHA1Result(SHA1Context *context, sha1_uint8_t Message_Digest[])
 {
     int i;
 
@@ -165,14 +165,14 @@
         SHA1PadMessage(context);
         for (i = 0; i < 64; i++) {
             /* message may be sensitive, clear it out */
-            context->Message_Block[i] = 0;
+            context->Message_Block[i] = (sha1_uint8_t)0;
         }
         context->Length_Low  = 0; /* and clear length */
         context->Length_High = 0;
         context->Computed    = 1;
     }
     for (i = 0; i < SHA1HashSize; i++)
-        Message_Digest[i] = context->Intermediate_Hash[i>>2] >> (8 * (3 - (i & 0x03)));
+        Message_Digest[i] = (sha1_uint8_t)(context->Intermediate_Hash[i>>2] >> (8 * (3 - (i & 0x03))));
 
     return shaSuccess;
 }
@@ -231,10 +231,10 @@
 
     /* Initialize the first 16 words in the array W */
     for (t = 0; t < 16; t++) {
-        W[t]  = context->Message_Block[t * 4    ] << 24;
-        W[t] |= context->Message_Block[t * 4 + 1] << 16;
-        W[t] |= context->Message_Block[t * 4 + 2] << 8;
-        W[t] |= context->Message_Block[t * 4 + 3];
+        W[t]  = (sha1_uint32_t)(context->Message_Block[t * 4    ] << 24);
+        W[t] |= (sha1_uint32_t)(context->Message_Block[t * 4 + 1] << 16);
+        W[t] |= (sha1_uint32_t)(context->Message_Block[t * 4 + 2] <<  8);
+        W[t] |= (sha1_uint32_t)(context->Message_Block[t * 4 + 3]      );
     }
 
     for (t = 16; t < 80; t++)
@@ -309,28 +309,28 @@
        the initial padding bits and length. If so, we will pad the block,
        process it, and then continue padding into a second block. */
     if (context->Message_Block_Index > 55) {
-        context->Message_Block[context->Message_Block_Index++] = 0x80;
+        context->Message_Block[context->Message_Block_Index++] = (sha1_uint8_t)0x80;
         while (context->Message_Block_Index < 64)
-            context->Message_Block[context->Message_Block_Index++] = 0;
+            context->Message_Block[context->Message_Block_Index++] = (sha1_uint8_t)0;
         SHA1ProcessMessageBlock(context);
         while(context->Message_Block_Index < 56)
-            context->Message_Block[context->Message_Block_Index++] = 0;
+            context->Message_Block[context->Message_Block_Index++] = (sha1_uint8_t)0;
     }
     else {
-        context->Message_Block[context->Message_Block_Index++] = 0x80;
+        context->Message_Block[context->Message_Block_Index++] = (sha1_uint8_t)0x80;
         while(context->Message_Block_Index < 56)
-            context->Message_Block[context->Message_Block_Index++] = 0;
+            context->Message_Block[context->Message_Block_Index++] = (sha1_uint8_t)0;
     }
 
     /* Store the message length as the last 8 octets */
-    context->Message_Block[56] = context->Length_High >> 24;
-    context->Message_Block[57] = context->Length_High >> 16;
-    context->Message_Block[58] = context->Length_High >> 8;
-    context->Message_Block[59] = context->Length_High;
-    context->Message_Block[60] = context->Length_Low  >> 24;
-    context->Message_Block[61] = context->Length_Low  >> 16;
-    context->Message_Block[62] = context->Length_Low  >> 8;
-    context->Message_Block[63] = context->Length_Low;
+    context->Message_Block[56] = (sha1_uint8_t)(context->Length_High >> 24);
+    context->Message_Block[57] = (sha1_uint8_t)(context->Length_High >> 16);
+    context->Message_Block[58] = (sha1_uint8_t)(context->Length_High >>  8);
+    context->Message_Block[59] = (sha1_uint8_t)(context->Length_High      );
+    context->Message_Block[60] = (sha1_uint8_t)(context->Length_Low  >> 24);
+    context->Message_Block[61] = (sha1_uint8_t)(context->Length_Low  >> 16);
+    context->Message_Block[62] = (sha1_uint8_t)(context->Length_Low  >>  8);
+    context->Message_Block[63] = (sha1_uint8_t)(context->Length_Low       );
 
     SHA1ProcessMessageBlock(context);
     return;
@@ -350,7 +350,8 @@
         return SHA1_RC_ARG;
     if ((*sha1 = (sha1_t *)malloc(sizeof(sha1_t))) == NULL)
         return SHA1_RC_MEM;
-    SHA1Reset(&((*sha1)->ctx));
+    if (SHA1Reset(&((*sha1)->ctx)) != shaSuccess)
+        return SHA1_RC_INT;
     return SHA1_RC_OK;
 }
 
@@ -358,7 +359,8 @@
 {
     if (sha1 == NULL)
         return SHA1_RC_ARG;
-    SHA1Reset(&(sha1->ctx));
+    if (SHA1Reset(&(sha1->ctx)) != shaSuccess)
+        return SHA1_RC_INT;
     return SHA1_RC_OK;
 }
 
@@ -366,7 +368,8 @@
 {
     if (sha1 == NULL)
         return SHA1_RC_ARG;
-    SHA1Input(&(sha1->ctx), (unsigned char *)data_ptr, (unsigned int)data_len);
+    if (SHA1Input(&(sha1->ctx), (unsigned char *)data_ptr, (unsigned int)data_len) != shaSuccess)
+        return SHA1_RC_INT;
     return SHA1_RC_OK;
 }
 
@@ -390,7 +393,8 @@
         }
     }
     memcpy((void *)(&ctx), (void *)(&(sha1->ctx)), sizeof(SHA1Context));
-    SHA1Result(&(ctx), (unsigned char *)(*data_ptr));
+    if (SHA1Result(&(ctx), (unsigned char *)(*data_ptr)) != shaSuccess)
+        return SHA1_RC_INT;
     return SHA1_RC_OK;
 }

ossp-pkg/uuid/uuid_sha1.h 1.2 -> 1.3 

--- uuid_sha1.h  2006/01/13 06:44:31     1.2
+++ uuid_sha1.h  2006/07/28 19:16:05     1.3
@@ -62,7 +62,8 @@
 typedef enum {
     SHA1_RC_OK  = 0,
     SHA1_RC_ARG = 1,
-    SHA1_RC_MEM = 2
+    SHA1_RC_MEM = 2,
+    SHA1_RC_INT = 3
 } sha1_rc_t;
 
 extern sha1_rc_t sha1_create  (sha1_t **sha1);

CVSTrac 2.0.1