WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #5475 from dgarske/rsa_pss_async 

Fixes for RSA PSS with `--enable-asynccrypt` in `ConfirmSignature`
pull/5477/head
Daniel Pouzzner 2022-08-17 12:04:05 -05:00 committed by GitHub
parent 3f7d56d957 b9c9ad0339
commit be378a346e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
wolfcrypt/src/asn.c
View File

@ -15006,12 +15006,6 @@ static int ConfirmSignature(SignatureCtx* sigCtx,
byte* rsaKeyIdx) byte* rsaKeyIdx)
{ {
int ret = 0; int ret = 0;
#ifdef WC_RSA_PSS
/* Defaults */
enum wc_HashType hash = WC_HASH_TYPE_SHA;
int mgf = WC_MGF1SHA1;
int saltLen = 20;
#endif
if (sigCtx == NULL || buf == NULL || bufSz == 0 || key == NULL || if (sigCtx == NULL || buf == NULL || bufSz == 0 || key == NULL ||
keySz == 0 || sig == NULL || sigSz == 0) { keySz == 0 || sig == NULL || sigSz == 0) {
@ -15054,21 +15048,28 @@ static int ConfirmSignature(SignatureCtx* sigCtx,
ERROR_OUT(MEMORY_E, exit_cs); ERROR_OUT(MEMORY_E, exit_cs);
} }
#if !defined(NO_RSA) && defined(WC_RSA_PSS)
/* RSA PSS Defaults */
sigCtx->hash = WC_HASH_TYPE_SHA;
sigCtx->mgf = WC_MGF1SHA1;
sigCtx->saltLen = 20;
#endif
sigCtx->state = SIG_STATE_HASH; sigCtx->state = SIG_STATE_HASH;
} /* SIG_STATE_BEGIN */ } /* SIG_STATE_BEGIN */
FALL_THROUGH; FALL_THROUGH;
case SIG_STATE_HASH: case SIG_STATE_HASH:
{ {
#ifdef WC_RSA_PSS #if !defined(NO_RSA) && defined(WC_RSA_PSS)
if (keyOID == RSAPSSk) { if (keyOID == RSAPSSk) {
word32 fakeSigOID = 0; word32 fakeSigOID = 0;
ret = DecodeRsaPssParams(sigParams, sigParamsSz, &hash, &mgf, ret = DecodeRsaPssParams(sigParams, sigParamsSz, &sigCtx->hash,
&saltLen); &sigCtx->mgf, &sigCtx->saltLen);
if (ret != 0) { if (ret != 0) {
goto exit_cs; goto exit_cs;
} }
ret = RsaPssHashOidToSigOid(hash, &fakeSigOID); ret = RsaPssHashOidToSigOid(sigCtx->hash, &fakeSigOID);
if (ret != 0) { if (ret != 0) {
goto exit_cs; goto exit_cs;
} }
@ -15558,7 +15559,8 @@ static int ConfirmSignature(SignatureCtx* sigCtx,
case RSAPSSk: case RSAPSSk:
/* TODO: pkCbRsaPss - RSA PSS callback. */ /* TODO: pkCbRsaPss - RSA PSS callback. */
ret = wc_RsaPSS_VerifyInline_ex(sigCtx->sigCpy, sigSz, ret = wc_RsaPSS_VerifyInline_ex(sigCtx->sigCpy, sigSz,
&sigCtx->out, hash, mgf, saltLen, sigCtx->key.rsa); &sigCtx->out, sigCtx->hash, sigCtx->mgf,
sigCtx->saltLen, sigCtx->key.rsa);
break; break;
#endif #endif
case RSAk: case RSAk:
@ -15694,18 +15696,20 @@ static int ConfirmSignature(SignatureCtx* sigCtx,
(defined(HAVE_FIPS) && defined(HAVE_FIPS_VERSION) && \ (defined(HAVE_FIPS) && defined(HAVE_FIPS_VERSION) && \
(HAVE_FIPS_VERSION < 2)) (HAVE_FIPS_VERSION < 2))
ret = wc_RsaPSS_CheckPadding_ex(sigCtx->digest, ret = wc_RsaPSS_CheckPadding_ex(sigCtx->digest,
sigCtx->digestSz, sigCtx->out, ret, hash, saltLen); sigCtx->digestSz, sigCtx->out, ret, sigCtx->hash,
sigCtx->saltLen);
#elif (defined(HAVE_SELFTEST) && \ #elif (defined(HAVE_SELFTEST) && \
(HAVE_SELFTEST_VERSION == 2)) || \ (HAVE_SELFTEST_VERSION == 2)) || \
(defined(HAVE_FIPS) && defined(HAVE_FIPS_VERSION) && \ (defined(HAVE_FIPS) && defined(HAVE_FIPS_VERSION) && \
(HAVE_FIPS_VERSION == 2)) (HAVE_FIPS_VERSION == 2))
ret = wc_RsaPSS_CheckPadding_ex(sigCtx->digest, ret = wc_RsaPSS_CheckPadding_ex(sigCtx->digest,
sigCtx->digestSz, sigCtx->out, ret, hash, saltLen, sigCtx->digestSz, sigCtx->out, ret, sigCtx->hash,
0); sigCtx->saltLen, 0);
#else #else
ret = wc_RsaPSS_CheckPadding_ex2(sigCtx->digest, ret = wc_RsaPSS_CheckPadding_ex2(sigCtx->digest,
sigCtx->digestSz, sigCtx->out, ret, hash, saltLen, sigCtx->digestSz, sigCtx->out, ret, sigCtx->hash,
wc_RsaEncryptSize(sigCtx->key.rsa)*8, sigCtx->heap); sigCtx->saltLen, wc_RsaEncryptSize(sigCtx->key.rsa) * 8,
sigCtx->heap);
#endif #endif
break; break;
#endif #endif

5
wolfssl/wolfcrypt/asn.h
View File

@ -1439,6 +1439,11 @@ struct SignatureCtx {
defined(HAVE_PK_CALLBACKS) defined(HAVE_PK_CALLBACKS)
CertAttribute CertAtt; CertAttribute CertAtt;
#endif #endif
#ifdef WC_RSA_PSS
enum wc_HashType hash;
int mgf;
int saltLen;
#endif
#endif #endif
}; };