Changes suggested in review.

Author: anhu

wolfcrypt/src/evp.c

@@ -3328,7 +3328,7 @@ int wolfSSL_EVP_PKEY_sign(WOLFSSL_EVP_PKEY_CTX *ctx, unsigned char *sig,
             return WOLFSSL_SUCCESS;
         }
 
-#if defined(OPENSSL_ALL) && (!defined(HAVE_FIPS) || FIPS_VERSION_GT(2,0))
+#if defined(WC_RSA_PSS) && (!defined(HAVE_FIPS) || FIPS_VERSION_GT(2,0))
         /* Handle PSS padding using RSA_padding_add_PKCS1_PSS_mgf1 if saltlen
          * or mgf1 hash were set.  Use generic signing otherwise. */
         if (ctx->mgf1_md || ctx->saltlen) {
@@ -3514,7 +3514,7 @@ int wolfSSL_EVP_PKEY_verify(WOLFSSL_EVP_PKEY_CTX *ctx, const unsigned char *sig,
     switch (ctx->pkey->type) {
 #ifndef NO_RSA
     case WC_EVP_PKEY_RSA:
-#if defined(OPENSSL_ALL) && (!defined(HAVE_FIPS) || FIPS_VERSION_GT(2,0))
+#if defined(WC_RSA_PSS) && (!defined(HAVE_FIPS) || FIPS_VERSION_GT(2,0))
         /* Verify PSS padding using wolfSSL_RSA_verify_PKCS1_PSS_mgf1 if saltlen
          * or mgf1 hash were set. Do generic verification otherwise. */
         if (ctx->mgf1_md || ctx->saltlen) {

wolfssl/openssl/evp.h

@@ -750,7 +750,7 @@ struct WOLFSSL_EVP_PKEY_CTX {
 #ifdef HAVE_ECC
     int curveNID;
 #endif
-#ifndef NO_RSA
+#ifdef WC_RSA_PSS
     const WOLFSSL_EVP_MD* md;
     const WOLFSSL_EVP_MD* mgf1_md;
     int saltlen;

wolfssl/openssl/hmac.h

@@ -42,7 +42,7 @@
     extern "C" {
 #endif
 
-#define HMAC_MAX_MD_CBLOCK 128
+#define HMAC_MAX_MD_CBLOCK WC_MAX_BLOCK_SIZE
 
 WOLFSSL_API unsigned char* wolfSSL_HMAC(const WOLFSSL_EVP_MD* evp_md,
                                const void* key, int key_len,