forked from wolfSSL/wolfssl
fix DTLS cookies and session resumption
This commit is contained in:
11
src/ssl.c
11
src/ssl.c
@ -2254,7 +2254,10 @@ int CyaSSL_set_cipher_list(CYASSL* ssl, const char* list)
|
||||
neededState = ssl->options.resuming ? SERVER_FINISHED_COMPLETE :
|
||||
SERVER_HELLODONE_COMPLETE;
|
||||
#ifdef CYASSL_DTLS
|
||||
if (ssl->options.dtls && !ssl->options.resuming)
|
||||
/* In DTLS, when resuming, we can go straight to FINISHED,
|
||||
* or do a cookie exchange and then skip to FINISHED, assume
|
||||
* we need the cookie exchange first. */
|
||||
if (ssl->options.dtls)
|
||||
neededState = SERVER_HELLOVERIFYREQUEST_COMPLETE;
|
||||
#endif
|
||||
/* get response */
|
||||
@ -2281,7 +2284,7 @@ int CyaSSL_set_cipher_list(CYASSL* ssl, const char* list)
|
||||
return SSL_SUCCESS;
|
||||
|
||||
#ifdef CYASSL_DTLS
|
||||
if (ssl->options.dtls && !ssl->options.resuming) {
|
||||
if (ssl->options.dtls) {
|
||||
/* re-init hashes, exclude first hello and verify request */
|
||||
InitMd5(&ssl->hashMd5);
|
||||
InitSha(&ssl->hashSha);
|
||||
@ -2501,7 +2504,7 @@ int CyaSSL_set_cipher_list(CYASSL* ssl, const char* list)
|
||||
|
||||
case ACCEPT_CLIENT_HELLO_DONE :
|
||||
#ifdef CYASSL_DTLS
|
||||
if (ssl->options.dtls && !ssl->options.resuming)
|
||||
if (ssl->options.dtls)
|
||||
if ( (ssl->error = SendHelloVerifyRequest(ssl)) != 0) {
|
||||
CYASSL_ERROR(ssl->error);
|
||||
return SSL_FATAL_ERROR;
|
||||
@ -2512,7 +2515,7 @@ int CyaSSL_set_cipher_list(CYASSL* ssl, const char* list)
|
||||
|
||||
case HELLO_VERIFY_SENT:
|
||||
#ifdef CYASSL_DTLS
|
||||
if (ssl->options.dtls && !ssl->options.resuming) {
|
||||
if (ssl->options.dtls) {
|
||||
ssl->options.clientState = NULL_STATE; /* get again */
|
||||
/* re-init hashes, exclude first hello and verify request */
|
||||
InitMd5(&ssl->hashMd5);
|
||||
|
Reference in New Issue
Block a user