Fix for scan-build warning with ret not being read in DoServerHello.

This commit is contained in:
David Garske
2017-05-06 14:00:24 -07:00
parent 8cd78edac1
commit 5726c23d81

View File

@@ -15428,20 +15428,20 @@ void PickHashSigAlgo(WOLFSSL* ssl, const byte* hashSigAlgo, word32 hashSigAlgoSz
if (ssl->options.resuming) { if (ssl->options.resuming) {
if (DSH_CheckSessionId(ssl)) { if (DSH_CheckSessionId(ssl)) {
if (SetCipherSpecs(ssl) == 0) { if (SetCipherSpecs(ssl) == 0) {
ret = -1;
XMEMCPY(ssl->arrays->masterSecret, XMEMCPY(ssl->arrays->masterSecret,
ssl->session.masterSecret, SECRET_LEN); ssl->session.masterSecret, SECRET_LEN);
#ifdef NO_OLD_TLS #ifdef NO_OLD_TLS
ret = DeriveTlsKeys(ssl);
#else
ret = -1; /* default value */
#ifndef NO_TLS
if (ssl->options.tls)
ret = DeriveTlsKeys(ssl); ret = DeriveTlsKeys(ssl);
#else #endif
#ifndef NO_TLS if (!ssl->options.tls)
if (ssl->options.tls) ret = DeriveKeys(ssl);
ret = DeriveTlsKeys(ssl); #endif /* NO_OLD_TLS */
#endif
if (!ssl->options.tls)
ret = DeriveKeys(ssl);
#endif
ssl->options.serverState = SERVER_HELLODONE_COMPLETE; ssl->options.serverState = SERVER_HELLODONE_COMPLETE;
return ret; return ret;