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

scr session resumption example

Browse Source
This commit is contained in:
toddouska
2014-09-26 10:47:57 -07:00
parent a260171e23
commit 95585e93df
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
examples/client/client.c
View File

@@ -694,13 +694,21 @@ THREAD_RETURN CYASSL_THREAD client_test(void* args)
if (nonBlocking) { if (nonBlocking) {
printf("not doing secure renegotiation on example with" printf("not doing secure renegotiation on example with"
" nonblocking yet"); " nonblocking yet");
} } else {
else if (CyaSSL_Rehandshake(ssl) != SSL_SUCCESS) { #ifndef NO_SESSION_CACHE
int err = CyaSSL_get_error(ssl, 0); if (resumeSession) {
char buffer[CYASSL_MAX_ERROR_SZ]; session = CyaSSL_get_session(ssl);
printf("err = %d, %s\n", err, CyaSSL_set_session(ssl, session);
resumeSession = 0; /* only resume once */
}
#endif
if (CyaSSL_Rehandshake(ssl) != SSL_SUCCESS) {
int err = CyaSSL_get_error(ssl, 0);
char buffer[CYASSL_MAX_ERROR_SZ];
printf("err = %d, %s\n", err,
CyaSSL_ERR_error_string(err, buffer)); CyaSSL_ERR_error_string(err, buffer));
err_sys("CyaSSL_Rehandshake failed"); err_sys("CyaSSL_Rehandshake failed");
}
} }
} }
#endif /* HAVE_SECURE_RENEGOTIATION */ #endif /* HAVE_SECURE_RENEGOTIATION */

8
src/internal.c
View File

@@ -8960,6 +8960,10 @@ static void PickHashSigAlgo(CYASSL* ssl,
ssl->options.serverState = SERVER_HELLO_COMPLETE; ssl->options.serverState = SERVER_HELLO_COMPLETE;
if (ssl->keys.encryptionOn) {
*inOutIdx += ssl->keys.padSz;
}
if (ssl->options.resuming) { if (ssl->options.resuming) {
if (ssl->options.haveSessionId && XMEMCMP(ssl->arrays->sessionID, if (ssl->options.haveSessionId && XMEMCMP(ssl->arrays->sessionID,
ssl->session.sessionID, ID_LEN) == 0) { ssl->session.sessionID, ID_LEN) == 0) {
@@ -8998,10 +9002,6 @@ static void PickHashSigAlgo(CYASSL* ssl,
} }
#endif #endif
if (ssl->keys.encryptionOn) {
*inOutIdx += ssl->keys.padSz;
}
return SetCipherSpecs(ssl); return SetCipherSpecs(ssl);
} }