From: tb <tb@openbsd.org>
Date: Thu, 20 Oct 2022 15:20:27 +0000 (+0000)
Subject: Extend SSL_SESSION struct for TLSv1.3 PSK
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=0bf82b5bdba203ef79b03fda40920c7d060c49db;p=openbsd

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
---

diff --git a/lib/libssl/ssl_locl.h b/lib/libssl/ssl_locl.h
index 8046ad8c866..1ddc5e0d5c1 100644
--- a/lib/libssl/ssl_locl.h
+++ b/lib/libssl/ssl_locl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_locl.h,v 1.427 2022/10/02 16:36:41 jsing Exp $ */
+/* $OpenBSD: ssl_locl.h,v 1.428 2022/10/20 15:20:27 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -502,10 +502,12 @@ struct ssl_session_st {
 
 	char *tlsext_hostname;
 
-	/* RFC4507 info */
+	/* Session resumption - RFC 5077 and RFC 8446. */
 	unsigned char *tlsext_tick;		/* Session ticket */
 	size_t tlsext_ticklen;			/* Session ticket length */
 	uint32_t tlsext_tick_lifetime_hint;	/* Session lifetime hint in seconds */
+	uint32_t tlsext_tick_age_add; /* TLSv1.3 ticket age obfuscation (in ms) */
+	struct tls13_secret resumption_master_secret;
 
 	CRYPTO_EX_DATA ex_data; /* application specific data */