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

Don't pick RSA PSS if not compiled in

Browse Source
This commit is contained in:
Sean Parkinson
2019-07-16 14:59:01 +10:00
parent 4e648dd35f
commit 8112c1236d
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/internal.c
View File

@@ -2014,21 +2014,24 @@ static WC_INLINE void AddSuiteHashSigAlgo(Suites* suites, byte macAlgo, byte sig
#endif /* USE_ECDSA_KEYSZ_HASH_ALGO */ #endif /* USE_ECDSA_KEYSZ_HASH_ALGO */
if (addSigAlgo) { if (addSigAlgo) {
#ifdef WC_RSA_PSS
if (sigAlgo == rsa_pss_sa_algo) { if (sigAlgo == rsa_pss_sa_algo) {
/* RSA PSS is sig then mac */ /* RSA PSS is sig then mac */
suites->hashSigAlgo[*inOutIdx] = sigAlgo; suites->hashSigAlgo[*inOutIdx] = sigAlgo;
*inOutIdx += 1; *inOutIdx += 1;
suites->hashSigAlgo[*inOutIdx] = macAlgo; suites->hashSigAlgo[*inOutIdx] = macAlgo;
*inOutIdx += 1; *inOutIdx += 1;
#ifdef WOLFSSL_TLS13 #ifdef WOLFSSL_TLS13
/* Add the certificate algorithm as well */ /* Add the certificate algorithm as well */
suites->hashSigAlgo[*inOutIdx] = sigAlgo; suites->hashSigAlgo[*inOutIdx] = sigAlgo;
*inOutIdx += 1; *inOutIdx += 1;
suites->hashSigAlgo[*inOutIdx] = PSS_RSAE_TO_PSS_PSS(macAlgo); suites->hashSigAlgo[*inOutIdx] = PSS_RSAE_TO_PSS_PSS(macAlgo);
*inOutIdx += 1; *inOutIdx += 1;
#endif #endif
} }
else { else
#endif
{
suites->hashSigAlgo[*inOutIdx] = macAlgo; suites->hashSigAlgo[*inOutIdx] = macAlgo;
*inOutIdx += 1; *inOutIdx += 1;
suites->hashSigAlgo[*inOutIdx] = sigAlgo; suites->hashSigAlgo[*inOutIdx] = sigAlgo;
@@ -17119,8 +17122,13 @@ int PickHashSigAlgo(WOLFSSL* ssl, const byte* hashSigAlgo, word32 hashSigAlgoSz)
} }
else else
#endif #endif
#ifdef WC_RSA_PSS
if (sigAlgo == ssl->suites->sigAlgo || (sigAlgo == rsa_pss_sa_algo && if (sigAlgo == ssl->suites->sigAlgo || (sigAlgo == rsa_pss_sa_algo &&
ssl->suites->sigAlgo == rsa_sa_algo)) { ssl->suites->sigAlgo == rsa_sa_algo))
#else
if (sigAlgo == ssl->suites->sigAlgo)
#endif
{
/* pick highest available between both server and client */ /* pick highest available between both server and client */
switch (hashAlgo) { switch (hashAlgo) {
case sha_mac: case sha_mac:
@@ -21258,6 +21266,7 @@ int SendCertificateVerify(WOLFSSL* ssl)
/* prepend hdr */ /* prepend hdr */
c16toa(args->length, args->verify + args->extraSz); c16toa(args->length, args->verify + args->extraSz);
} }
#ifdef WC_RSA_PSS
else if (args->sigAlgo == rsa_pss_sa_algo) { else if (args->sigAlgo == rsa_pss_sa_algo) {
XMEMCPY(ssl->buffers.sig.buffer, ssl->buffers.digest.buffer, XMEMCPY(ssl->buffers.sig.buffer, ssl->buffers.digest.buffer,
ssl->buffers.digest.length); ssl->buffers.digest.length);
@@ -21267,6 +21276,7 @@ int SendCertificateVerify(WOLFSSL* ssl)
/* prepend hdr */ /* prepend hdr */
c16toa(args->length, args->verify + args->extraSz); c16toa(args->length, args->verify + args->extraSz);
} }
#endif
#endif /* !NO_RSA */ #endif /* !NO_RSA */
#if defined(HAVE_ED25519) && !defined(NO_ED25519_CLIENT_AUTH) #if defined(HAVE_ED25519) && !defined(NO_ED25519_CLIENT_AUTH)
if (args->sigAlgo == ed25519_sa_algo) { if (args->sigAlgo == ed25519_sa_algo) {