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

Merge pull request #2534 from SparkiDev/pss_1024_sha512_tls12

Browse Source 
Pass the length of the RSA key in bits to PSS padding check in TLS
This commit is contained in:
toddouska
2019-11-04 11:42:55 -08:00
committed by GitHub
parent f4afa4bc87 eb03e5de1e
commit b723acf0f6
1 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/internal.c
View File

@@ -3847,19 +3847,27 @@ int VerifyRsaSign(WOLFSSL* ssl, byte* verifySig, word32 sigSz,
ret = ssl->ctx->RsaPssSignCheckCb(ssl, verifySig, sigSz, &out,
TypeHash(hashAlgo), mgf,
keyBuf, keySz, ctx);
if (ret > 0) {
ret = wc_RsaPSS_CheckPadding(plain, plainSz, out, ret,
hashType);
if (ret != 0)
ret = VERIFY_CERT_ERROR;
}
}
else
#endif /* HAVE_PK_CALLBACKS */
{
ret = wc_RsaPSS_VerifyInline(verifySig, sigSz, &out, hashType, mgf,
key);
if (ret > 0) {
ret = wc_RsaPSS_CheckPadding_ex(plain, plainSz, out, ret,
hashType, -1,
mp_count_bits(&key->n));
if (ret != 0)
ret = VERIFY_CERT_ERROR;
}
}
if (ret > 0) {
ret = wc_RsaPSS_CheckPadding(plain, plainSz, out, ret, hashType);
if (ret != 0)
ret = VERIFY_CERT_ERROR;
}
}
else
#endif /* WC_RSA_PSS */
@@ -19454,6 +19462,9 @@ typedef struct DskeArgs {
word16 sigSz;
byte sigAlgo;
byte hashAlgo;
#if !defined(NO_RSA) && defined(WC_RSA_PSS)
int bits;
#endif
} DskeArgs;
static void FreeDskeArgs(WOLFSSL* ssl, void* pArgs)
@@ -20208,6 +20219,9 @@ static int DoServerKeyExchange(WOLFSSL* ssl, const byte* input,
if (ret >= 0) {
args->sigSz = (word16)ret;
#ifdef WC_RSA_PSS
args->bits = mp_count_bits(&ssl->peerRsaKey->n);
#endif
ret = 0;
}
#ifdef WOLFSSL_ASYNC_CRYPT
@@ -20327,11 +20341,12 @@ static int DoServerKeyExchange(WOLFSSL* ssl, const byte* input,
#ifndef NO_RSA
#ifdef WC_RSA_PSS
case rsa_pss_sa_algo:
ret = wc_RsaPSS_CheckPadding(
ret = wc_RsaPSS_CheckPadding_ex(
ssl->buffers.digest.buffer,
ssl->buffers.digest.length,
args->output, args->sigSz,
HashAlgoToType(args->hashAlgo));
HashAlgoToType(args->hashAlgo),
-1, args->bits);
if (ret != 0)
return ret;
break;
@@ -25717,11 +25732,12 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
if (args->sigAlgo == rsa_pss_sa_algo) {
SetDigest(ssl, args->hashAlgo);
ret = wc_RsaPSS_CheckPadding(
ssl->buffers.digest.buffer,
ssl->buffers.digest.length,
args->output, args->sigSz,
HashAlgoToType(args->hashAlgo));
ret = wc_RsaPSS_CheckPadding_ex(
ssl->buffers.digest.buffer,
ssl->buffers.digest.length,
args->output, args->sigSz,
HashAlgoToType(args->hashAlgo), -1,
mp_count_bits(&ssl->peerRsaKey->n));
if (ret != 0) {
ret = SIG_VERIFY_E;
goto exit_dcv;