summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2008-09-03 12:36:16 +0000
committerDr. Stephen Henson <steve@openssl.org>2008-09-03 12:36:16 +0000
commit305514000c7e404490951f4c14a65379098c7baf (patch)
treed99676ded70573a7be8e8c6ada62eb93ce770796 /ssl
parent0702150f53ae7a9afd61801a9e208aff07729024 (diff)
Do not discard cached handshake records during resumed sessions:
they are used for mac computation.
Diffstat (limited to 'ssl')
-rw-r--r--ssl/s3_srvr.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 8a4faa66fa..4ffc2fcf39 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -1067,7 +1067,6 @@ int ssl3_get_client_hello(SSL *s)
goto f_err;
}
s->s3->tmp.new_cipher=c;
- ssl3_digest_cached_records(s);
}
else
{
@@ -1098,10 +1097,9 @@ int ssl3_get_client_hello(SSL *s)
else
#endif
s->s3->tmp.new_cipher=s->session->cipher;
- /* Clear cached handshake records */
- BIO_free(s->s3->handshake_buffer);
- s->s3->handshake_buffer = NULL;
}
+
+ ssl3_digest_cached_records(s);
/* we now have the following setup.
* client_random