Fix mutex guards to use WP_SINGLE_THREADED

Author: JeremiahM37

src/wp_dh_kmgmt.c

@@ -401,7 +401,7 @@ static wp_Dh* wp_dh_new(WOLFPROV_CTX *provCtx)
             WOLFPROV_MSG_DEBUG_RETCODE(WP_LOG_LEVEL_DEBUG, "wc_InitDhKey_ex", rc);
             ok = 0;
         }
-    #ifndef SINGLE_THREADED
+    #ifndef WP_SINGLE_THREADED
         if (ok) {
             rc = wc_InitMutex(&dh->mutex);
             if (rc != 0) {

src/wp_ecc_kmgmt.c

@@ -350,7 +350,7 @@ static wp_Ecc* wp_ecc_new(WOLFPROV_CTX *provCtx)
             }
         }
 
-    #ifndef SINGLE_THREADED
+    #ifndef WP_SINGLE_THREADED
         if (ok) {
             rc = wc_InitMutex(&ecc->mutex);
             if (rc != 0) {

src/wp_ecx_kmgmt.c

@@ -283,7 +283,7 @@ static wp_Ecx* wp_ecx_new(WOLFPROV_CTX* provCtx, const wp_EcxData* data)
             ok = 0;
         }
 
-    #ifndef SINGLE_THREADED
+    #ifndef WP_SINGLE_THREADED
         if (ok) {
             rc = wc_InitMutex(&ecx->mutex);
             if (rc != 0) {
@@ -698,6 +698,9 @@ static int wp_ecx_match_priv_key(const wp_Ecx* ecx1, const wp_Ecx* ecx2)
         ok = 0;
     }
 
+    OPENSSL_cleanse(key1, sizeof(key1));
+    OPENSSL_cleanse(key2, sizeof(key2));
+
     WOLFPROV_LEAVE(WP_LOG_COMP_KE, __FILE__ ":" WOLFPROV_STRINGIZE(__LINE__), ok);
     return ok;
 }
@@ -1273,8 +1276,7 @@ static int wp_ecx_gen_set_params(wp_EcxGenCtx* ctx, const OSSL_PARAM params[])
             &name)) {
         ok = 0;
     }
-    if (ok && (name != NULL) && (XSTRNCMP(name, ctx->name,
-            XSTRLEN(name)) != 0)) {
+    if (ok && (name != NULL) && (XSTRCMP(name, ctx->name) != 0)) {
         ok = 0;
     }
 

src/wp_kdf_kmgmt.c

@@ -96,7 +96,7 @@ static wp_Kdf* wp_kdf_new(WOLFPROV_CTX *provCtx)
         kdf = (wp_Kdf*)OPENSSL_zalloc(sizeof(*kdf));
     }
     if (kdf != NULL) {
-    #ifndef SINGLE_THREADED
+    #ifndef WP_SINGLE_THREADED
         int rc = wc_InitMutex(&kdf->mutex);
         if (rc != 0) {
             WOLFPROV_MSG_DEBUG_RETCODE(WP_LOG_LEVEL_DEBUG, "wc_InitMutex", rc);

src/wp_mac_kmgmt.c

@@ -190,7 +190,7 @@ static wp_Mac* wp_mac_new(WOLFPROV_CTX *provCtx, int type)
         mac = (wp_Mac*)OPENSSL_zalloc(sizeof(*mac));
     }
     if (mac != NULL) {
-    #ifndef SINGLE_THREADED
+    #ifndef WP_SINGLE_THREADED
         int rc = wc_InitMutex(&mac->mutex);
         if (rc != 0) {
             WOLFPROV_MSG_DEBUG_RETCODE(WP_LOG_LEVEL_DEBUG, "wc_InitMutex", rc);

src/wp_rsa_kmgmt.c

@@ -470,7 +470,7 @@ static wp_Rsa* wp_rsa_base_new(WOLFPROV_CTX* provCtx, int type)
             ok = 0;
         }
 
-    #ifndef SINGLE_THREADED
+    #ifndef WP_SINGLE_THREADED
         if (ok) {
             rc = wc_InitMutex(&rsa->mutex);
             if (rc != 0) {
@@ -600,7 +600,7 @@ static int wp_rsa_pss_params_set_pss_defaults(wp_RsaPssParams* pss)
     pss->hashType = WP_RSA_PSS_DIGEST_DEF;
     pss->mgf = WP_RSA_PSS_MGF_DEF;
     XSTRNCPY(pss->mdName, "SHA-1", sizeof(pss->mdName));
-    XSTRNCPY(pss->mgfMdName, "SHA-1", sizeof(pss->mdName));
+    XSTRNCPY(pss->mgfMdName, "SHA-1", sizeof(pss->mgfMdName));
     pss->saltLen = WP_RSA_DEFAULT_SALT_LEN;
     pss->derTrailer = 1; /* Default: RFC8017 A.2.3 */
 
@@ -1228,7 +1228,7 @@ static int wp_rsa_import_key_data(wp_Rsa* rsa, const OSSL_PARAM params[],
             p = &params[i];
             index = -1;
             for (j = 0; j < (int)ARRAY_SIZE(wp_rsa_param_key); j++) {
-                if (XSTRNCMP(p->key, wp_rsa_param_key[j], XSTRLEN(p->key)) == 0) {
+                if (XSTRCMP(p->key, wp_rsa_param_key[j]) == 0) {
                     index = j;
                     break;
                 }