From b75dcc327d73d0f5f00f1367a7d98e3979ddbd9f Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Mon, 1 Aug 2016 17:32:19 +0000
Subject: Add ALPN support to libtls.

ok beck@ doug@
---
 src/lib/libtls/tls_internal.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/lib/libtls/tls_internal.h')

diff --git a/src/lib/libtls/tls_internal.h b/src/lib/libtls/tls_internal.h
index 6c56e6fb84..17358429c7 100644
--- a/src/lib/libtls/tls_internal.h
+++ b/src/lib/libtls/tls_internal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls_internal.h,v 1.32 2016/07/13 16:30:48 jsing Exp $ */
+/* $OpenBSD: tls_internal.h,v 1.33 2016/08/01 17:32:19 jsing Exp $ */
 /*
  * Copyright (c) 2014 Jeremie Courreges-Anglas <jca@openbsd.org>
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
@@ -55,6 +55,8 @@ struct tls_keypair {
 struct tls_config {
 	struct tls_error error;
 
+	char *alpn;
+	size_t alpn_len;
 	const char *ca_file;
 	const char *ca_path;
 	char *ca_mem;
@@ -73,6 +75,7 @@ struct tls_config {
 };
 
 struct tls_conninfo {
+	char *alpn;
 	char *issuer;
 	char *subject;
 	char *hash;
@@ -104,6 +107,7 @@ struct tls {
 	SSL *ssl_conn;
 	SSL_CTX *ssl_ctx;
 	X509 *ssl_peer_cert;
+
 	struct tls_conninfo *conninfo;
 };
 
-- 
cgit v1.2.3-55-g6feb