From 8007465805b60ee08ec66aa02d3525e1a058629c Mon Sep 17 00:00:00 2001 From: jsing <> Date: Mon, 27 Aug 2018 16:42:48 +0000 Subject: Simplify new session ticket encoding/generation. The original code did a crazy encode/malloc/encode/decode/modify/encode dance, in order to encode a session in the form needed to encrypt then add to a session ticket. By modifying the encoding functions slightly, we can do this entire dance as a single encode. Inspired by similar changes in BoringSSL. ok inoguchi@ tb@ --- src/lib/libssl/ssl_locl.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/lib/libssl/ssl_locl.h') diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index 44afd1717e..39aabb05fb 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_locl.h,v 1.209 2018/08/24 18:10:25 jsing Exp $ */ +/* $OpenBSD: ssl_locl.h,v 1.210 2018/08/27 16:42:48 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1089,6 +1089,8 @@ int ssl_has_ecc_ciphers(SSL *s); int ssl_verify_alarm_type(long type); void ssl_load_ciphers(void); +int SSL_SESSION_ticket(SSL_SESSION *ss, unsigned char **out, size_t *out_len); + const SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p); int ssl3_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p); int ssl3_send_server_certificate(SSL *s); -- cgit v1.2.3-55-g6feb