Merge pull request #371 from padelsbach/wp-finding-270

Use sizeof(var) rather than sizeof(type) where appropriate

Author: ColtonWilley

src/wp_digests.c

@@ -62,7 +62,7 @@ static CTX* name##_newctx(WOLFPROV_CTX* provCtx)                               \
     CTX* ctx = NULL;                                                           \
     (void)provCtx;                                                             \
     if (wolfssl_prov_is_running()) {                                           \
-        ctx = OPENSSL_zalloc(sizeof(CTX));                                     \
+        ctx = OPENSSL_zalloc(sizeof(*ctx));                                    \
     }                                                                          \
     return ctx;                                                                \
 }

src/wp_drbg.c

@@ -190,7 +190,7 @@ static int wp_drbg_instantiate(wp_DrbgCtx* ctx, unsigned int strength,
 
         if (ok) {
             /* Initialize wolfCrypt RNG with parent-provided seed */
-            ctx->rng = OPENSSL_zalloc(sizeof(WC_RNG));
+            ctx->rng = OPENSSL_zalloc(sizeof(*ctx->rng));
             if (ctx->rng == NULL) {
                 ok = 0;
             }

src/wp_internal.c

@@ -925,7 +925,7 @@ int wp_encrypt_key(WOLFPROV_CTX* provCtx, const char* cipherName,
         ok = 0;
     }
     if (ok) {
-        XMEMSET(info, 0, sizeof(EncryptedInfo));
+        XMEMSET(info, 0, sizeof(info));
         XSTRNCPY(info->name, cipherName, NAME_SZ-1);
         info->name[NAME_SZ-1] = '\0';
 

src/wp_wolfprov.c

@@ -217,7 +217,7 @@ static WOLFPROV_CTX* wolfssl_prov_ctx_new(void)
 
     WP_CHECK_FIPS_ALGO_PTR(WP_CAST_ALGO_DRBG);
 
-    ctx = (WOLFPROV_CTX*)OPENSSL_zalloc(sizeof(WOLFPROV_CTX));
+    ctx = (WOLFPROV_CTX*)OPENSSL_zalloc(sizeof(*ctx));
     if ((ctx != NULL) && (wc_InitRng(&ctx->rng) != 0)) {
         OPENSSL_free(ctx);
         ctx = NULL;