summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_srvr.c
diff options
context:
space:
mode:
authorbluhm <>2018-11-11 06:27:57 +0000
committerbluhm <>2018-11-11 06:27:57 +0000
commit32ccc9aa9f3dd1c0efa02d4b21376521a91e4705 (patch)
tree465efc0a08b3252d3a70fe65c96bdd639cda5e32 /src/lib/libssl/ssl_srvr.c
parent455b97ce03e47e95dd1e82064b65eb686dc87f47 (diff)
downloadopenbsd-32ccc9aa9f3dd1c0efa02d4b21376521a91e4705.tar.gz
openbsd-32ccc9aa9f3dd1c0efa02d4b21376521a91e4705.tar.bz2
openbsd-32ccc9aa9f3dd1c0efa02d4b21376521a91e4705.zip
Free the server tls transcript in case session reuse did not work.
Regression found by Perl module p5-IO-Socket-SSL tests. with beck@ tb@
Diffstat (limited to 'src/lib/libssl/ssl_srvr.c')
-rw-r--r--src/lib/libssl/ssl_srvr.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_srvr.c b/src/lib/libssl/ssl_srvr.c
index 03ae29a278..d9d78a7bef 100644
--- a/src/lib/libssl/ssl_srvr.c
+++ b/src/lib/libssl/ssl_srvr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_srvr.c,v 1.57 2018/11/11 02:22:34 beck Exp $ */ 1/* $OpenBSD: ssl_srvr.c,v 1.58 2018/11/11 06:27:57 bluhm Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -676,9 +676,10 @@ ssl3_accept(SSL *s)
676 if (ret <= 0) 676 if (ret <= 0)
677 goto end; 677 goto end;
678 S3I(s)->hs.state = SSL3_ST_SW_FLUSH; 678 S3I(s)->hs.state = SSL3_ST_SW_FLUSH;
679 if (s->internal->hit) 679 if (s->internal->hit) {
680 S3I(s)->hs.next_state = SSL3_ST_SR_FINISHED_A; 680 S3I(s)->hs.next_state = SSL3_ST_SR_FINISHED_A;
681 else 681 tls1_transcript_free(s);
682 } else
682 S3I(s)->hs.next_state = SSL_ST_OK; 683 S3I(s)->hs.next_state = SSL_ST_OK;
683 s->internal->init_num = 0; 684 s->internal->init_num = 0;
684 break; 685 break;