feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

CAVP, Windows, and FIPS tests

Browse Source
This commit is contained in:
Juliusz Sosinowicz
2020-09-29 13:41:58 +02:00
parent d18e2d7386
commit b4754d5706
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/ssl.c
View File

@ -30949,7 +30949,7 @@ int wolfSSL_RSA_sign_ex(int type, const unsigned char* m,
ret = BAD_FUNC_ARG; ret = BAD_FUNC_ARG;
break; break;
#endif #endif
#ifdef WC_RSA_PSS #if !defined(HAVE_FIPS) && !defined(HAVE_SELFTEST) && defined(WC_RSA_PSS)
case RSA_PKCS1_PSS_PADDING: case RSA_PKCS1_PSS_PADDING:
{ {
enum wc_HashType hType = wc_OidGetHash(type); enum wc_HashType hType = wc_OidGetHash(type);
@ -30977,7 +30977,6 @@ int wolfSSL_RSA_sign_ex(int type, const unsigned char* m,
} }
#endif #endif
case RSA_PKCS1_PADDING: case RSA_PKCS1_PADDING:
default:
signSz = wc_EncodeSignature(encodedSig, m, mLen, type); signSz = wc_EncodeSignature(encodedSig, m, mLen, type);
if (signSz == 0) { if (signSz == 0) {
WOLFSSL_MSG("Bad Encode Signature"); WOLFSSL_MSG("Bad Encode Signature");
@ -30985,6 +30984,11 @@ int wolfSSL_RSA_sign_ex(int type, const unsigned char* m,
DEBUG_SIGN_msg("Encoded Message", encodedSig, signSz); DEBUG_SIGN_msg("Encoded Message", encodedSig, signSz);
ret = wc_RsaSSL_Sign(encodedSig, signSz, sigRet, outLen, ret = wc_RsaSSL_Sign(encodedSig, signSz, sigRet, outLen,
(RsaKey*)rsa->internal, rng); (RsaKey*)rsa->internal, rng);
break;
default:
WOLFSSL_MSG("Unsupported padding");
ret = BAD_FUNC_ARG;
break;
} }
if (ret <= 0) { if (ret <= 0) {
WOLFSSL_MSG("Bad Rsa Sign"); WOLFSSL_MSG("Bad Rsa Sign");
@ -31050,10 +31054,12 @@ int wolfSSL_RSA_verify_ex(int type, const unsigned char* m,
int ret = WOLFSSL_FAILURE; int ret = WOLFSSL_FAILURE;
unsigned char *sigRet = NULL; unsigned char *sigRet = NULL;
unsigned char *sigDec = NULL; unsigned char *sigDec = NULL;
unsigned int len; unsigned int len = 0;
int verLen; int verLen;
#if !defined(HAVE_FIPS) && !defined(HAVE_SELFTEST)
int hSum = nid2HashSum(type); int hSum = nid2HashSum(type);
enum wc_HashType hType; enum wc_HashType hType;
#endif
WOLFSSL_ENTER("wolfSSL_RSA_verify"); WOLFSSL_ENTER("wolfSSL_RSA_verify");
if ((m == NULL) || (sig == NULL)) { if ((m == NULL) || (sig == NULL)) {
@ -31083,22 +31089,35 @@ int wolfSSL_RSA_verify_ex(int type, const unsigned char* m,
DEBUG_SIGN_msg("Encoded Message", m, mLen); DEBUG_SIGN_msg("Encoded Message", m, mLen);
} }
/* decrypt signature */ /* decrypt signature */
#if !defined(HAVE_FIPS) && !defined(HAVE_SELFTEST)
hType = wc_OidGetHash(hSum); hType = wc_OidGetHash(hSum);
if ((verLen = wc_RsaSSL_Verify_ex(sig, sigLen, (unsigned char *)sigDec, if ((verLen = wc_RsaSSL_Verify_ex(sig, sigLen, (unsigned char *)sigDec,
sigLen, (RsaKey*)rsa->internal, padding, hType)) <= 0) { sigLen, (RsaKey*)rsa->internal, padding, hType)) <= 0) {
WOLFSSL_MSG("RSA Decrypt error"); WOLFSSL_MSG("RSA Decrypt error");
goto cleanup; goto cleanup;
} }
#else
verLen = wc_RsaSSL_Verify(sig, sigLen, (unsigned char *)sigDec, sigLen,
(RsaKey*)rsa->internal);
#endif
DEBUG_SIGN_msg("Decrypted Signature", sigDec, ret); DEBUG_SIGN_msg("Decrypted Signature", sigDec, ret);
#if !defined(HAVE_FIPS) && !defined(HAVE_SELFTEST) && defined(WC_RSA_PSS)
if (padding == RSA_PKCS1_PSS_PADDING) { if (padding == RSA_PKCS1_PSS_PADDING) {
if (wc_RsaPSS_CheckPadding_ex(m, mLen, sigDec, verLen, if (wc_RsaPSS_CheckPadding_ex(m, mLen, sigDec, verLen,
hType, RSA_PSS_SALT_LEN_DEFAULT, hType,
#ifndef WOLFSSL_PSS_SALT_LEN_DISCOVER
RSA_PSS_SALT_LEN_DEFAULT,
#else
RSA_PSS_SALT_LEN_DISCOVER,
#endif
mp_count_bits(&((RsaKey*)rsa->internal)->n)) != 0) { mp_count_bits(&((RsaKey*)rsa->internal)->n)) != 0) {
WOLFSSL_MSG("wolfSSL_RSA_verify failed"); WOLFSSL_MSG("wolfSSL_RSA_verify failed");
goto cleanup; goto cleanup;
} }
} }
else if ((int)len != verLen || XMEMCMP(sigRet, sigDec, verLen) != 0) { else
#endif /* !defined(HAVE_FIPS) && !defined(HAVE_SELFTEST) */
if ((int)len != verLen || XMEMCMP(sigRet, sigDec, verLen) != 0) {
WOLFSSL_MSG("wolfSSL_RSA_verify failed"); WOLFSSL_MSG("wolfSSL_RSA_verify failed");
goto cleanup; goto cleanup;
} }

2
tests/api.c
View File

@ -26657,7 +26657,9 @@ static void test_wolfSSL_EVP_MD_rsa_signing(void)
size_t i; size_t i;
int paddings[] = { int paddings[] = {
RSA_PKCS1_PADDING, RSA_PKCS1_PADDING,
#if !defined(HAVE_FIPS) && !defined(HAVE_SELFTEST) && defined(WC_RSA_PSS)
RSA_PKCS1_PSS_PADDING, RSA_PKCS1_PSS_PADDING,
#endif
}; };