summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl3.h
diff options
context:
space:
mode:
authorjsing <>2014-12-10 14:58:56 +0000
committerjsing <>2014-12-10 14:58:56 +0000
commit73d0add4b5d2e01d460eb9eaa91dd531da22e21c (patch)
treee9391008296b8ff8be480e9f3e9eb1be0aab121a /src/lib/libssl/ssl3.h
parentbeadb77d202842e04b02ab287d37d0397108d0a3 (diff)
downloadopenbsd-73d0add4b5d2e01d460eb9eaa91dd531da22e21c.tar.gz
openbsd-73d0add4b5d2e01d460eb9eaa91dd531da22e21c.tar.bz2
openbsd-73d0add4b5d2e01d460eb9eaa91dd531da22e21c.zip
Add support for ALPN.
Based on OpenSSL and BoringSSL. ok bcook@
Diffstat (limited to 'src/lib/libssl/ssl3.h')
-rw-r--r--src/lib/libssl/ssl3.h16
1 files changed, 15 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl3.h b/src/lib/libssl/ssl3.h
index 5b9e31754b..2055f0f834 100644
--- a/src/lib/libssl/ssl3.h
+++ b/src/lib/libssl/ssl3.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl3.h,v 1.29 2014/11/18 05:33:43 miod Exp $ */ 1/* $OpenBSD: ssl3.h,v 1.30 2014/12/10 14:58:56 jsing 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 *
@@ -497,6 +497,20 @@ typedef struct ssl3_state_st {
497 int next_proto_neg_seen; 497 int next_proto_neg_seen;
498#endif 498#endif
499 499
500 /*
501 * ALPN information
502 * (we are in the process of transitioning from NPN to ALPN).
503 */
504
505 /*
506 * In a server these point to the selected ALPN protocol after the
507 * ClientHello has been processed. In a client these contain the
508 * protocol that the server selected once the ServerHello has been
509 * processed.
510 */
511 unsigned char *alpn_selected;
512 unsigned int alpn_selected_len;
513
500 /* This is set to true if we believe that this is a version of Safari 514 /* This is set to true if we believe that this is a version of Safari
501 * running on OS X 10.6 or newer. We wish to know this because Safari 515 * running on OS X 10.6 or newer. We wish to know this because Safari
502 * on 10.8 .. 10.8.3 has broken ECDHE-ECDSA support. */ 516 * on 10.8 .. 10.8.3 has broken ECDHE-ECDSA support. */