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

simplify build verify hashes to one spot

Browse Source
This commit is contained in:
toddouska
2015-04-30 09:22:25 -07:00
parent ada5ff876a
commit 162214924f
1 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/internal.c
View File

@ -6631,16 +6631,9 @@ int ProcessReply(WOLFSSL* ssl)
if ( (ret = InitStreams(ssl)) != 0) if ( (ret = InitStreams(ssl)) != 0)
return ret; return ret;
#endif #endif
if (ssl->options.resuming && ret = BuildFinished(ssl, &ssl->hsHashes->verifyHashes,
ssl->options.side == WOLFSSL_CLIENT_END) { ssl->options.side == WOLFSSL_CLIENT_END ?
ret = BuildFinished(ssl, &ssl->hsHashes->verifyHashes, server : client);
server);
}
else if (!ssl->options.resuming &&
ssl->options.side == WOLFSSL_SERVER_END) {
ret = BuildFinished(ssl, &ssl->hsHashes->verifyHashes,
client);
}
if (ret != 0) if (ret != 0)
return ret; return ret;
break; break;
@ -7146,7 +7139,7 @@ int SendFinished(WOLFSSL* ssl)
/* make finished hashes */ /* make finished hashes */
hashes = (Hashes*)&input[headerSz]; hashes = (Hashes*)&input[headerSz];
ret = BuildFinished(ssl, hashes, ret = BuildFinished(ssl, hashes,
ssl->options.side == WOLFSSL_CLIENT_END ? client : server); ssl->options.side == WOLFSSL_CLIENT_END ? client : server);
if (ret != 0) return ret; if (ret != 0) return ret;
#ifdef HAVE_SECURE_RENEGOTIATION #ifdef HAVE_SECURE_RENEGOTIATION
@ -7176,11 +7169,7 @@ int SendFinished(WOLFSSL* ssl)
#ifndef NO_SESSION_CACHE #ifndef NO_SESSION_CACHE
AddSession(ssl); /* just try */ AddSession(ssl); /* just try */
#endif #endif
if (ssl->options.side == WOLFSSL_CLIENT_END) { if (ssl->options.side == WOLFSSL_SERVER_END) {
ret = BuildFinished(ssl, &ssl->hsHashes->verifyHashes, server);
if (ret != 0) return ret;
}
else {
ssl->options.handShakeState = HANDSHAKE_DONE; ssl->options.handShakeState = HANDSHAKE_DONE;
ssl->options.handShakeDone = 1; ssl->options.handShakeDone = 1;
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
@ -7206,10 +7195,6 @@ int SendFinished(WOLFSSL* ssl)
} }
#endif #endif
} }
else {
ret = BuildFinished(ssl, &ssl->hsHashes->verifyHashes, client);
if (ret != 0) return ret;
}
} }
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
if (ssl->options.dtls) { if (ssl->options.dtls) {
@ -11327,7 +11312,7 @@ int DoSessionTicket(WOLFSSL* ssl,
ssl->expect_session_ticket = 0; ssl->expect_session_ticket = 0;
return BuildFinished(ssl, &ssl->hsHashes->verifyHashes, server); return 0;
} }
#endif /* HAVE_SESSION_TICKET */ #endif /* HAVE_SESSION_TICKET */