Merge pull request #481 from wolfSSL/fix_anon_cipher

Anonymous cipher fix
This commit is contained in:
Chris Conlon
2016-07-15 13:05:32 -06:00
committed by GitHub

View File

@@ -16593,6 +16593,7 @@ int DoSessionTicket(WOLFSSL* ssl,
} }
#endif #endif
if (!ssl->options.usingAnon_cipher) {
/* Determine hash type */ /* Determine hash type */
if (IsAtLeastTLSv1_2(ssl)) { if (IsAtLeastTLSv1_2(ssl)) {
output[idx++] = ssl->suites->hashAlgo; output[idx++] = ssl->suites->hashAlgo;
@@ -16739,6 +16740,7 @@ int DoSessionTicket(WOLFSSL* ssl,
} }
#endif /* NO_RSA */ #endif /* NO_RSA */
} /* switch (ssl->suites->sigAlgo) */ } /* switch (ssl->suites->sigAlgo) */
} /* !ssl->options.usingAnon_cipher */
break; break;
} }
@@ -16821,6 +16823,7 @@ int DoSessionTicket(WOLFSSL* ssl,
#ifndef NO_RSA #ifndef NO_RSA
case rsa_sa_algo: case rsa_sa_algo:
{ {
if (!ssl->options.usingAnon_cipher) {
/* check for signature faults */ /* check for signature faults */
ret = VerifyRsaSign(ssl, ret = VerifyRsaSign(ssl,
output + idx, output + idx,
@@ -16828,6 +16831,7 @@ int DoSessionTicket(WOLFSSL* ssl,
ssl->buffers.sig.buffer, ssl->buffers.sig.buffer,
ssl->buffers.sig.length, ssl->buffers.sig.length,
(RsaKey*)ssl->sigKey); (RsaKey*)ssl->sigKey);
}
break; break;
} }
#endif #endif