From 08826cf1fd4b00b8fdf28c4356682e05802c6308 Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Thu, 4 Jul 2013 16:37:44 +0200 Subject: [PATCH] fix memset calls in sha2.c --- src/repodata.c | 2 +- src/sha2.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/repodata.c b/src/repodata.c index c150e6fa..4b423bfa 100644 --- 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 e8b9db18..715e4482 100644 --- 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; -- 2.47.2