Merge pull request #5031 from douzzer/20220407-clang-tidy

20220407 clang-tidy

src/ssl.c

@@ -21721,7 +21721,7 @@ static int Asn1TimeToTm(WOLFSSL_ASN1_TIME* asnTime, struct tm* tm)
     tm->tm_min = (asn1TimeBuf[i] - '0') * 10; i++;
     tm->tm_min += (asn1TimeBuf[i] - '0'); i++;
     tm->tm_sec = (asn1TimeBuf[i] - '0') * 10; i++;
-    tm->tm_sec += (asn1TimeBuf[i] - '0'); 
+    tm->tm_sec += (asn1TimeBuf[i] - '0');
 
 #ifdef XMKTIME
     /* Call XMKTIME on tm to get the tm_wday and tm_yday fields populated. */

wolfcrypt/benchmark/benchmark.h

@@ -40,15 +40,15 @@ int  benchmark_init(void);
 int  benchmark_free(void);
 void benchmark_configure(int block_size);
 
-void bench_des(int doAsync);
-void bench_arc4(int doAsync);
+void bench_des(int useDeviceID);
+void bench_arc4(int useDeviceID);
 void bench_chacha(void);
 void bench_chacha20_poly1305_aead(void);
-void bench_aescbc(int doAsync);
-void bench_aesgcm(int doAsync);
+void bench_aescbc(int useDeviceID);
+void bench_aesgcm(int useDeviceID);
 void bench_gmac(void);
 void bench_aesccm(void);
-void bench_aesecb(int doAsync);
+void bench_aesecb(int useDeviceID);
 void bench_aesxts(void);
 void bench_aesctr(void);
 void bench_aescfb(void);
@@ -56,34 +56,34 @@ void bench_aesofb(void);
 void bench_aessiv(void);
 void bench_poly1305(void);
 void bench_camellia(void);
-void bench_md5(int doAsync);
-void bench_sha(int doAsync);
-void bench_sha224(int doAsync);
-void bench_sha256(int doAsync);
-void bench_sha384(int doAsync);
-void bench_sha512(int doAsync);
-void bench_sha3_224(int doAsync);
-void bench_sha3_256(int doAsync);
-void bench_sha3_384(int doAsync);
-void bench_sha3_512(int doAsync);
+void bench_md5(int useDeviceID);
+void bench_sha(int useDeviceID);
+void bench_sha224(int useDeviceID);
+void bench_sha256(int useDeviceID);
+void bench_sha384(int useDeviceID);
+void bench_sha512(int useDeviceID);
+void bench_sha3_224(int useDeviceID);
+void bench_sha3_256(int useDeviceID);
+void bench_sha3_384(int useDeviceID);
+void bench_sha3_512(int useDeviceID);
 int  bench_ripemd(void);
 void bench_cmac(void);
 void bench_scrypt(void);
-void bench_hmac_md5(int doAsync);
-void bench_hmac_sha(int doAsync);
-void bench_hmac_sha224(int doAsync);
-void bench_hmac_sha256(int doAsync);
-void bench_hmac_sha384(int doAsync);
-void bench_hmac_sha512(int doAsync);
+void bench_hmac_md5(int useDeviceID);
+void bench_hmac_sha(int useDeviceID);
+void bench_hmac_sha224(int useDeviceID);
+void bench_hmac_sha256(int useDeviceID);
+void bench_hmac_sha384(int useDeviceID);
+void bench_hmac_sha512(int useDeviceID);
 void bench_siphash(void);
-void bench_rsaKeyGen(int doAsync);
-void bench_rsaKeyGen_size(int doAsync, int keySz);
-void bench_rsa(int doAsync);
-void bench_rsa_key(int doAsync, int keySz);
-void bench_dh(int doAsync);
+void bench_rsaKeyGen(int useDeviceID);
+void bench_rsaKeyGen_size(int useDeviceID, int keySz);
+void bench_rsa(int useDeviceID);
+void bench_rsa_key(int useDeviceID, int keySz);
+void bench_dh(int useDeviceID);
 void bench_ecc_curve(int curveId);
-void bench_eccMakeKey(int doAsync, int curveId);
-void bench_ecc(int doAsync, int curveId);
+void bench_eccMakeKey(int useDeviceID, int curveId);
+void bench_ecc(int useDeviceID, int curveId);
 void bench_eccEncrypt(int curveId);
 void bench_curve25519KeyGen(void);
 void bench_curve25519KeyAgree(void);

wolfcrypt/src/aes.c

@@ -12056,15 +12056,18 @@ static WARN_UNUSED_RESULT int S2V(
         }
     }
 
-    if ((ret == 0) && (nonceSz > 0)) {
-        ShiftAndXorRb(tmp[0], tmp[1]);
-        ret = wc_AesCmacGenerate(tmp[1], &macSz, nonce, nonceSz, key, keySz);
-        if (ret == 0) {
-            xorbuf(tmp[0], tmp[1], AES_BLOCK_SIZE);
+    if (ret == 0) {
+        if (nonceSz > 0) {
+            ShiftAndXorRb(tmp[0], tmp[1]);
+            ret = wc_AesCmacGenerate(tmp[1], &macSz, nonce, nonceSz, key,
+                                     keySz);
+            if (ret == 0) {
+                xorbuf(tmp[0], tmp[1], AES_BLOCK_SIZE);
+            }
+        }
+        else {
+            XMEMCPY(tmp[0], tmp[1], AES_BLOCK_SIZE);
         }
-    }
-    else {
-        XMEMCPY(tmp[0], tmp[1], AES_BLOCK_SIZE);
     }
 
     if (ret == 0) {

wolfssl/wolfcrypt/sha256.h

@@ -242,7 +242,7 @@ WOLFSSL_API int wc_Sha256Transform(wc_Sha256* sha, const unsigned char* data);
 #if defined(WOLFSSL_HASH_KEEP)
 WOLFSSL_API int wc_Sha256_Grow(wc_Sha256* sha256, const byte* in, int inSz);
 #endif
-WOLFSSL_API int wc_Sha256GetHash(wc_Sha256*, byte*);
+WOLFSSL_API int wc_Sha256GetHash(wc_Sha256* sha256, byte* hash);
 WOLFSSL_API int wc_Sha256Copy(wc_Sha256* src, wc_Sha256* dst);
 
 #ifdef WOLFSSL_PIC32MZ_HASH
@@ -294,7 +294,7 @@ WOLFSSL_API void wc_Sha224Free(wc_Sha224* sha224);
 #if defined(WOLFSSL_HASH_KEEP)
 WOLFSSL_API int wc_Sha224_Grow(wc_Sha224* sha224, const byte* in, int inSz);
 #endif
-WOLFSSL_API int wc_Sha224GetHash(wc_Sha224*, byte*);
+WOLFSSL_API int wc_Sha224GetHash(wc_Sha224* sha224, byte* hash);
 WOLFSSL_API int wc_Sha224Copy(wc_Sha224* src, wc_Sha224* dst);
 
 #ifdef WOLFSSL_HASH_FLAGS