Skoll Fixes

Author: aidankeefe2022

tests/api/test_aes.c

@@ -3274,7 +3274,7 @@ int test_wc_AesGcmEncryptDecrypt_Sizes(void)
     }
 
     i = 0;
-    for (sz = WC_AES_BLOCK_SIZE; sz < GCM_LEN; sz *= 2) {
+    for (sz = WC_AES_BLOCK_SIZE; sz <= GCM_LEN; sz *= 2) {
         XMEMSET(cipher, 0, GCM_LEN);
         ExpectIntEQ(wc_AesGcmEncrypt(&aes, cipher, plain, sz, iv, ivLen, tag,
             sizeof(tag), NULL, 0), 0);

wolfcrypt/src/port/devcrypto/devcrypto_hash.c

@@ -175,7 +175,7 @@ int wc_Sha256Final(wc_Sha256* sha, byte* hash)
     ret = GetDigest(sha, CRYPTO_SHA2_256, hash);
     if (ret != 0) {
         wc_Sha256Free(sha);
-       return ret;
+        return ret;
     }
 
     wc_Sha256Free(sha);
@@ -199,9 +199,10 @@ int wc_Sha256GetHash(wc_Sha256* sha, byte* hash)
          * in wc_Sha256Copy() does not close fd 0 (cfd == -1 is the
          * "no session" sentinel, matching wc_AesInit()) */
         cpy.ctx.cfd = -1;
-        wc_Sha256Copy(sha, &cpy);
+        ret = wc_Sha256Copy(sha, &cpy);
 
-        if ((ret = HashUpdate(&cpy, CRYPTO_SHA2_256, cpy.msg, cpy.used)) == 0) {
+        if (ret == 0 &&
+        (ret = HashUpdate(&cpy, CRYPTO_SHA2_256, cpy.msg, cpy.used)) == 0) {
             /* help static analysis tools out */
             XMEMSET(hash, 0, WC_SHA256_DIGEST_SIZE);
             ret = GetDigest(&cpy, CRYPTO_SHA2_256, hash);
@@ -225,9 +226,9 @@ int wc_Sha256Copy(wc_Sha256* src, wc_Sha256* dst)
         return BAD_FUNC_ARG;
     }
 
+#ifdef WOLFSSL_DEVCRYPTO_HASH_KEEP
     wc_Sha256Free(dst);
     wc_InitSha256_ex(dst, src->heap, 0);
-#ifdef WOLFSSL_DEVCRYPTO_HASH_KEEP
     dst->len  = src->len;
     dst->used = src->used;
     dst->msg = (byte*)XMALLOC(src->len, dst->heap, DYNAMIC_TYPE_TMP_BUFFER);

wolfcrypt/src/random.c

@@ -3726,7 +3726,7 @@ static int wc_GenerateSeed_IntelRD(OS_Seed* os, byte* output, word32 sz)
 
     for (; (sz / sizeof(word64)) > 0; sz -= sizeof(word64),
                                                     output += sizeof(word64)) {
-        word32 rndTmplocal;
+        word64 rndTmpLocal;
         ret = IntelRDseed64_r(&rndTmpLocal);
         if (ret != 0)
             return ret;

wolfssl/wolfcrypt/ecc.h

@@ -532,7 +532,7 @@ struct ecc_key {
 #endif
 
 #ifdef WOLFSSL_CAAM
-    #ifndef CAAM_ADDRESS
+    #ifdef CAAM_ADDRESS
         CAAM_ADDRESS blackKey;     /* address of key encrypted and in secure memory */
         CAAM_ADDRESS securePubKey; /* address of public key in secure memory */
     #else