From 736fdc7bedf7fe8b17717032f7380c5c6e247d0d Mon Sep 17 00:00:00 2001 From: tb <> Date: Sat, 17 Mar 2018 15:55:53 +0000 Subject: Provide SSL_SESSION_get_ticket_lifetime_hint() and SSL_SESSION_has_ticket() ok jsing --- src/lib/libssl/Symbols.list | 2 ++ src/lib/libssl/ssl.h | 4 +++- src/lib/libssl/ssl_sess.c | 14 +++++++++++++- 3 files changed, 18 insertions(+), 2 deletions(-) (limited to 'src/lib') diff --git a/src/lib/libssl/Symbols.list b/src/lib/libssl/Symbols.list index 3f63272442..581b292a74 100644 --- a/src/lib/libssl/Symbols.list +++ b/src/lib/libssl/Symbols.list @@ -147,8 +147,10 @@ SSL_SESSION_get_ex_new_index SSL_SESSION_get_id SSL_SESSION_get_master_key SSL_SESSION_get_protocol_version +SSL_SESSION_get_ticket_lifetime_hint SSL_SESSION_get_time SSL_SESSION_get_timeout +SSL_SESSION_has_ticket SSL_SESSION_new SSL_SESSION_print SSL_SESSION_print_fp diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index 17b9467ae0..05939f214d 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl.h,v 1.151 2018/03/17 15:48:31 tb Exp $ */ +/* $OpenBSD: ssl.h,v 1.152 2018/03/17 15:55:52 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1327,6 +1327,8 @@ const unsigned char *SSL_SESSION_get_id(const SSL_SESSION *ss, unsigned int *len); const unsigned char *SSL_SESSION_get0_id_context(const SSL_SESSION *ss, unsigned int *len); +unsigned long SSL_SESSION_get_ticket_lifetime_hint(const SSL_SESSION *s); +int SSL_SESSION_has_ticket(const SSL_SESSION *s); unsigned int SSL_SESSION_get_compress_id(const SSL_SESSION *ss); int SSL_SESSION_print_fp(FILE *fp, const SSL_SESSION *ses); int SSL_SESSION_print(BIO *fp, const SSL_SESSION *ses); diff --git a/src/lib/libssl/ssl_sess.c b/src/lib/libssl/ssl_sess.c index b97dfd7867..4903719fb3 100644 --- a/src/lib/libssl/ssl_sess.c +++ b/src/lib/libssl/ssl_sess.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_sess.c,v 1.76 2018/03/17 14:47:48 tb Exp $ */ +/* $OpenBSD: ssl_sess.c,v 1.77 2018/03/17 15:55:53 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -249,6 +249,18 @@ SSL_SESSION_get_compress_id(const SSL_SESSION *ss) return 0; } +unsigned long +SSL_SESSION_get_ticket_lifetime_hint(const SSL_SESSION *s) +{ + return s->tlsext_tick_lifetime_hint; +} + +int +SSL_SESSION_has_ticket(const SSL_SESSION *s) +{ + return (s->tlsext_ticklen > 0) ? 1 : 0; +} + /* * SSLv3/TLSv1 has 32 bytes (256 bits) of session ID space. As such, filling * the ID with random gunk repeatedly until we have no conflict is going to -- cgit v1.2.3-55-g6feb