Merge pull request #6580 from dgarske/sig_verify

Fix for `wc_SignatureGenerate_ex` calling verify twice
wolfSSL · Jul 6, 2023 · f3bae31 · f3bae31
2 parents fb0c769 + 9ca53ac
commit f3bae31
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/wolfcrypt/src/signature.c b/wolfcrypt/src/signature.c
@@ -525,17 +525,12 @@ int wc_SignatureGenerate_ex(
  #endif
  }
  if (ret == 0) {
- /* Generate signature using hash */
- ret = wc_SignatureGenerateHash(hash_type, sig_type,
- hash_data, hash_enc_len, sig, sig_len, key, key_len, rng);
+ /* Generate signature using hash (also handles verify) */
+ ret = wc_SignatureGenerateHash_ex(hash_type, sig_type, hash_data,
+ hash_enc_len, sig, sig_len, key, key_len, rng, verify);
  }
  }
 
- if (ret == 0 && verify) {
- ret = wc_SignatureVerifyHash(hash_type, sig_type, hash_data,
- hash_enc_len, sig, *sig_len, key, key_len);
- }
-
 #if defined(WOLFSSL_SMALL_STACK) || defined(NO_ASN)
  XFREE(hash_data, NULL, DYNAMIC_TYPE_TMP_BUFFER);
 #endif