fix memset calls in sha2.c

diff --git a/src/repodata.c b/src/repodata.c
index a61b80be6856c0e1d5e3b7e1c8029837884d6859..1fdbc0ef77d1019b9b4a3c68f010639395fdafbc 100644 (file)
--- a/src/repodata.c
+++ b/src/repodata.c
@@ -188,7 +188,7 @@ repodata_schema2id(Repodata *data, Id *schema, int create)
       data->schematahash = schematahash = solv_calloc(256, sizeof(Id));
       for (i = 1; i < data->nschemata; i++)
        {
-         for (sp = data->schemadata + data->schemata[i], h = 0; *sp; len++)
+         for (sp = data->schemadata + data->schemata[i], h = 0; *sp;)
            h = h * 7 + *sp++;
          h &= 255;
          schematahash[h] = i;

diff --git a/src/sha2.c b/src/sha2.c
index e8b9db1883218413f75702f387b223647a6d4bfa..715e448228f2e8cb1f1d0e6d24f2a0dbb8c3b4ee 100644 (file)
--- a/src/sha2.c
+++ b/src/sha2.c
@@ -620,7 +620,7 @@ void solv_SHA256_Final(sha2_byte digest[], SHA256_CTX* context) {
        }
 
        /* Clean up state data: */
-       MEMSET_BZERO(context, sizeof(context));
+       MEMSET_BZERO(context, sizeof(*context));
        usedspace = 0;
 }
 
@@ -641,7 +641,7 @@ char *solv_SHA256_End(SHA256_CTX* context, char buffer[]) {
                }
                *buffer = (char)0;
        } else {
-               MEMSET_BZERO(context, sizeof(context));
+               MEMSET_BZERO(context, sizeof(*context));
        }
        MEMSET_BZERO(digest, SHA256_DIGEST_LENGTH);
        return buffer;
@@ -950,7 +950,7 @@ void solv_SHA512_Final(sha2_byte digest[], SHA512_CTX* context) {
        }
 
        /* Zero out state data */
-       MEMSET_BZERO(context, sizeof(context));
+       MEMSET_BZERO(context, sizeof(*context));
 }
 
 char *solv_SHA512_End(SHA512_CTX* context, char buffer[]) {
@@ -970,7 +970,7 @@ char *solv_SHA512_End(SHA512_CTX* context, char buffer[]) {
                }
                *buffer = (char)0;
        } else {
-               MEMSET_BZERO(context, sizeof(context));
+               MEMSET_BZERO(context, sizeof(*context));
        }
        MEMSET_BZERO(digest, SHA512_DIGEST_LENGTH);
        return buffer;
@@ -1025,7 +1025,7 @@ void solv_SHA384_Final(sha2_byte digest[], SHA384_CTX* context) {
        }
 
        /* Zero out state data */
-       MEMSET_BZERO(context, sizeof(context));
+       MEMSET_BZERO(context, sizeof(*context));
 }
 
 char *solv_SHA384_End(SHA384_CTX* context, char buffer[]) {
@@ -1045,7 +1045,7 @@ char *solv_SHA384_End(SHA384_CTX* context, char buffer[]) {
                }
                *buffer = (char)0;
        } else {
-               MEMSET_BZERO(context, sizeof(context));
+               MEMSET_BZERO(context, sizeof(*context));
        }
        MEMSET_BZERO(digest, SHA384_DIGEST_LENGTH);
        return buffer;