summaryrefslogtreecommitdiff
path: root/src/lib/libtls/tls_internal.h
diff options
context:
space:
mode:
authorjsing <>2018-02-10 04:41:24 +0000
committerjsing <>2018-02-10 04:41:24 +0000
commitad2580ae7b71760c38ec88f34f360d5f1e6b3f13 (patch)
treed414866dbbe43d007a4873fb2dc7e6cb637f7bce /src/lib/libtls/tls_internal.h
parent87264e9d7a6c2a965876fcf5e4b3dc46470e2562 (diff)
downloadopenbsd-ad2580ae7b71760c38ec88f34f360d5f1e6b3f13.tar.gz
openbsd-ad2580ae7b71760c38ec88f34f360d5f1e6b3f13.tar.bz2
openbsd-ad2580ae7b71760c38ec88f34f360d5f1e6b3f13.zip
Add support to libtls for client-side TLS session resumption.
A libtls client can specify a session file descriptor (a regular file with appropriate ownership and permissions) and libtls will manage reading and writing of session data across TLS handshakes. Discussed at length with deraadt@ and tedu@. Rides previous minor bump. ok beck@
Diffstat (limited to '')
-rw-r--r--src/lib/libtls/tls_internal.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libtls/tls_internal.h b/src/lib/libtls/tls_internal.h
index eb08d47074..14265037eb 100644
--- a/src/lib/libtls/tls_internal.h
+++ b/src/lib/libtls/tls_internal.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls_internal.h,v 1.68 2018/02/08 10:19:31 jsing Exp $ */ 1/* $OpenBSD: tls_internal.h,v 1.69 2018/02/10 04:41:24 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Jeremie Courreges-Anglas <jca@openbsd.org> 3 * Copyright (c) 2014 Jeremie Courreges-Anglas <jca@openbsd.org>
4 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 4 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
@@ -95,6 +95,7 @@ struct tls_config {
95 int ocsp_require_stapling; 95 int ocsp_require_stapling;
96 uint32_t protocols; 96 uint32_t protocols;
97 unsigned char session_id[TLS_MAX_SESSION_ID_LENGTH]; 97 unsigned char session_id[TLS_MAX_SESSION_ID_LENGTH];
98 int session_fd;
98 int session_lifetime; 99 int session_lifetime;
99 struct tls_ticket_key ticket_keys[TLS_NUM_TICKETS]; 100 struct tls_ticket_key ticket_keys[TLS_NUM_TICKETS];
100 uint32_t ticket_keyrev; 101 uint32_t ticket_keyrev;
@@ -111,6 +112,7 @@ struct tls_conninfo {
111 char *alpn; 112 char *alpn;
112 char *cipher; 113 char *cipher;
113 char *servername; 114 char *servername;
115 int session_resumed;
114 char *version; 116 char *version;
115 117
116 char *hash; 118 char *hash;