summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2022-10-20 15:20:27 +0000
committertb <>2022-10-20 15:20:27 +0000
commitbe3b9070d79c9bbb6b9363cd77ed867a5b8a2bb8 (patch)
tree060c483542965e64d8ff2f169251eb77d997c8ef /src
parent06d46a56a0e6f5c4b81f1aee0f3f5d2b1d7dd107 (diff)
downloadopenbsd-be3b9070d79c9bbb6b9363cd77ed867a5b8a2bb8.tar.gz
openbsd-be3b9070d79c9bbb6b9363cd77ed867a5b8a2bb8.tar.bz2
openbsd-be3b9070d79c9bbb6b9363cd77ed867a5b8a2bb8.zip
Extend SSL_SESSION struct for TLSv1.3 PSK
Add members necessary to store the "ticket_age_add" value and the resumption master secret needed in the TLSv1.3 version of session resumption. ok jsing
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/ssl_locl.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index 8046ad8c86..1ddc5e0d5c 100644
--- a/src/lib/libssl/ssl_locl.h
+++ b/src/lib/libssl/ssl_locl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_locl.h,v 1.427 2022/10/02 16:36:41 jsing Exp $ */ 1/* $OpenBSD: ssl_locl.h,v 1.428 2022/10/20 15:20:27 tb 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 *
@@ -502,10 +502,12 @@ struct ssl_session_st {
502 502
503 char *tlsext_hostname; 503 char *tlsext_hostname;
504 504
505 /* RFC4507 info */ 505 /* Session resumption - RFC 5077 and RFC 8446. */
506 unsigned char *tlsext_tick; /* Session ticket */ 506 unsigned char *tlsext_tick; /* Session ticket */
507 size_t tlsext_ticklen; /* Session ticket length */ 507 size_t tlsext_ticklen; /* Session ticket length */
508 uint32_t tlsext_tick_lifetime_hint; /* Session lifetime hint in seconds */ 508 uint32_t tlsext_tick_lifetime_hint; /* Session lifetime hint in seconds */
509 uint32_t tlsext_tick_age_add; /* TLSv1.3 ticket age obfuscation (in ms) */
510 struct tls13_secret resumption_master_secret;
509 511
510 CRYPTO_EX_DATA ex_data; /* application specific data */ 512 CRYPTO_EX_DATA ex_data; /* application specific data */
511 513