summaryrefslogtreecommitdiffstats
path: root/lib/libssl
diff options
context:
space:
mode:
authorbluhm <bluhm@openbsd.org>2018-11-11 06:27:57 +0000
committerbluhm <bluhm@openbsd.org>2018-11-11 06:27:57 +0000
commite88a9643cb2ad4925692deb277362c7ebadb4970 (patch)
treeec23f0903aaf30d4d12516d4bb432ec375f4c430 /lib/libssl
parentactually use the if_llprio to set the mbuf prio. (diff)
downloadwireguard-openbsd-e88a9643cb2ad4925692deb277362c7ebadb4970.tar.xz
wireguard-openbsd-e88a9643cb2ad4925692deb277362c7ebadb4970.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 'lib/libssl')
-rw-r--r--lib/libssl/ssl_srvr.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/libssl/ssl_srvr.c b/lib/libssl/ssl_srvr.c
index 03ae29a2780..d9d78a7befb 100644
--- a/lib/libssl/ssl_srvr.c
+++ b/lib/libssl/ssl_srvr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_srvr.c,v 1.57 2018/11/11 02:22:34 beck Exp $ */
+/* $OpenBSD: ssl_srvr.c,v 1.58 2018/11/11 06:27:57 bluhm Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -676,9 +676,10 @@ ssl3_accept(SSL *s)
if (ret <= 0)
goto end;
S3I(s)->hs.state = SSL3_ST_SW_FLUSH;
- if (s->internal->hit)
+ if (s->internal->hit) {
S3I(s)->hs.next_state = SSL3_ST_SR_FINISHED_A;
- else
+ tls1_transcript_free(s);
+ } else
S3I(s)->hs.next_state = SSL_ST_OK;
s->internal->init_num = 0;
break;