From 73d0add4b5d2e01d460eb9eaa91dd531da22e21c Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Wed, 10 Dec 2014 14:58:56 +0000
Subject: Add support for ALPN.

Based on OpenSSL and BoringSSL.

ok bcook@
---
 src/lib/libssl/s3_lib.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/lib/libssl/s3_lib.c')

diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index f2d2cb040d..9897fba6c5 100644
--- a/src/lib/libssl/s3_lib.c
+++ b/src/lib/libssl/s3_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_lib.c,v 1.85 2014/11/18 05:33:43 miod Exp $ */
+/* $OpenBSD: s3_lib.c,v 1.86 2014/12/10 14:58:56 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1905,6 +1905,8 @@ ssl3_free(SSL *s)
 		sk_X509_NAME_pop_free(s->s3->tmp.ca_names, X509_NAME_free);
 	BIO_free(s->s3->handshake_buffer);
 	ssl3_free_digest_list(s);
+	free(s->s3->alpn_selected);
+
 	OPENSSL_cleanse(s->s3, sizeof *s->s3);
 	free(s->s3);
 	s->s3 = NULL;
@@ -1939,6 +1941,9 @@ ssl3_clear(SSL *s)
 
 	ssl3_free_digest_list(s);
 
+	free(s->s3->alpn_selected);
+	s->s3->alpn_selected = NULL;
+
 	memset(s->s3, 0, sizeof *s->s3);
 	s->s3->rbuf.buf = rp;
 	s->s3->wbuf.buf = wp;
-- 
cgit v1.2.3-55-g6feb