summaryrefslogtreecommitdiff
path: root/lib/libssl/ssl3.h
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2014-12-10 14:58:57 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2014-12-10 14:58:57 +0000
commit9cb18454aa496dd3af3549e8eb7147cc8e169aad (patch)
tree50cae476f04d5143eb43b03e9ef23590ffda7e52 /lib/libssl/ssl3.h
parent47275fddbcb5efb0d84c4b1ea4cd717e2d5ddc85 (diff)
Add support for ALPN.
Based on OpenSSL and BoringSSL. ok bcook@
Diffstat (limited to 'lib/libssl/ssl3.h')
-rw-r--r--lib/libssl/ssl3.h16
1 files changed, 15 insertions, 1 deletions
diff --git a/lib/libssl/ssl3.h b/lib/libssl/ssl3.h
index 5b9e31754ba..2055f0f8344 100644
--- a/lib/libssl/ssl3.h
+++ b/lib/libssl/ssl3.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl3.h,v 1.29 2014/11/18 05:33:43 miod Exp $ */
+/* $OpenBSD: ssl3.h,v 1.30 2014/12/10 14:58:56 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -497,6 +497,20 @@ typedef struct ssl3_state_st {
int next_proto_neg_seen;
#endif
+ /*
+ * ALPN information
+ * (we are in the process of transitioning from NPN to ALPN).
+ */
+
+ /*
+ * In a server these point to the selected ALPN protocol after the
+ * ClientHello has been processed. In a client these contain the
+ * protocol that the server selected once the ServerHello has been
+ * processed.
+ */
+ unsigned char *alpn_selected;
+ unsigned int alpn_selected_len;
+
/* This is set to true if we believe that this is a version of Safari
* running on OS X 10.6 or newer. We wish to know this because Safari
* on 10.8 .. 10.8.3 has broken ECDHE-ECDSA support. */