Address CI failures

Author: aidangarske

wolfcrypt/src/ecc.c

@@ -14484,12 +14484,8 @@ int wc_ecc_encrypt_ex(ecc_key* privKey, ecc_key* pubKey, const byte* msg,
 
     RESTORE_VECTOR_REGISTERS();
 
-    if (sharedSecret != NULL) {
-        ForceZero(sharedSecret, sharedSz);
-    }
-    if (keys != NULL) {
-        ForceZero(keys, (word32)keysLen);
-    }
+    ForceZero(sharedSecret, sharedSz);
+    ForceZero(keys, (word32)keysLen);
     WC_FREE_VAR_EX(sharedSecret, ctx->heap, DYNAMIC_TYPE_ECC_BUFFER);
     WC_FREE_VAR_EX(keys, ctx->heap, DYNAMIC_TYPE_ECC_BUFFER);
 
@@ -14888,12 +14884,8 @@ int wc_ecc_decrypt(ecc_key* privKey, ecc_key* pubKey, const byte* msg,
     if (pubKey == peerKey)
         wc_ecc_free(peerKey);
 #endif
-    if (sharedSecret != NULL) {
-        ForceZero(sharedSecret, sharedSz);
-    }
-    if (keys != NULL) {
-        ForceZero(keys, (word32)keysLen);
-    }
+    ForceZero(sharedSecret, sharedSz);
+    ForceZero(keys, (word32)keysLen);
 #ifdef WOLFSSL_SMALL_STACK
 #ifndef WOLFSSL_ECIES_OLD
     XFREE(peerKey, ctx->heap, DYNAMIC_TYPE_ECC_BUFFER);

wolfcrypt/src/hpke.c

@@ -796,12 +796,8 @@ static int wc_HpkeEncap(Hpke* hpke, void* ephemeralKey, void* receiverKey,
             hpke->Npk * 2, sharedSecret);
     }
 
-    if (dh != NULL) {
-        ForceZero(dh, hpke->Ndh);
-    }
-    if (kemContext != NULL) {
-        ForceZero(kemContext, hpke->Npk * 2);
-    }
+    ForceZero(dh, hpke->Ndh);
+    ForceZero(kemContext, hpke->Npk * 2);
     WC_FREE_VAR_EX(dh, hpke->heap, DYNAMIC_TYPE_TMP_BUFFER);
     WC_FREE_VAR_EX(kemContext, hpke->heap, DYNAMIC_TYPE_TMP_BUFFER);
 
@@ -833,9 +829,7 @@ static int wc_HpkeSetupBaseSender(Hpke* hpke, HpkeBaseContext* context,
             infoSz);
     }
 
-    if (sharedSecret != NULL) {
-        ForceZero(sharedSecret, hpke->Nsecret);
-    }
+    ForceZero(sharedSecret, hpke->Nsecret);
     WC_FREE_VAR_EX(sharedSecret, hpke->heap, DYNAMIC_TYPE_TMP_BUFFER);
 
     return ret;
@@ -923,9 +917,7 @@ int wc_HpkeSealBase(Hpke* hpke, void* ephemeralKey, void* receiverKey,
 
     PRIVATE_KEY_LOCK();
 
-    if (context != NULL) {
-        ForceZero(context, sizeof(HpkeBaseContext));
-    }
+    ForceZero(context, sizeof(HpkeBaseContext));
     WC_FREE_VAR_EX(context, hpke->heap, DYNAMIC_TYPE_TMP_BUFFER);
 
     return ret;
@@ -1044,9 +1036,7 @@ static int wc_HpkeDecap(Hpke* hpke, void* receiverKey, const byte* pubKey,
             hpke->Npk * 2, sharedSecret);
     }
 
-    if (dh != NULL) {
-        ForceZero(dh, hpke->Ndh);
-    }
+    ForceZero(dh, hpke->Ndh);
     WC_FREE_VAR_EX(dh, hpke->heap, DYNAMIC_TYPE_TMP_BUFFER);
     WC_FREE_VAR_EX(kemContext, hpke->heap, DYNAMIC_TYPE_TMP_BUFFER);
 
@@ -1073,9 +1063,7 @@ static int wc_HpkeSetupBaseReceiver(Hpke* hpke, HpkeBaseContext* context,
             infoSz);
     }
 
-    if (sharedSecret != NULL) {
-        ForceZero(sharedSecret, hpke->Nsecret);
-    }
+    ForceZero(sharedSecret, hpke->Nsecret);
     WC_FREE_VAR_EX(sharedSecret, hpke->heap, DYNAMIC_TYPE_TMP_BUFFER);
 
     return ret;
@@ -1162,9 +1150,7 @@ int wc_HpkeOpenBase(Hpke* hpke, void* receiverKey, const byte* pubKey,
 
     PRIVATE_KEY_LOCK();
 
-    if (context != NULL) {
-        ForceZero(context, sizeof(HpkeBaseContext));
-    }
+    ForceZero(context, sizeof(HpkeBaseContext));
     WC_FREE_VAR_EX(context, hpke->heap, DYNAMIC_TYPE_TMP_BUFFER);
 
     return ret;