diff options
author | jsing <> | 2018-08-27 16:42:48 +0000 |
---|---|---|
committer | jsing <> | 2018-08-27 16:42:48 +0000 |
commit | 8007465805b60ee08ec66aa02d3525e1a058629c (patch) | |
tree | 71671a4717389a51b5152df1689cea13e657f8ca /src/lib/libssl/ssl_locl.h | |
parent | efb4b7d294563bb79e9a64739754b78928308802 (diff) | |
download | openbsd-8007465805b60ee08ec66aa02d3525e1a058629c.tar.gz openbsd-8007465805b60ee08ec66aa02d3525e1a058629c.tar.bz2 openbsd-8007465805b60ee08ec66aa02d3525e1a058629c.zip |
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@
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 4 |
1 files changed, 3 insertions, 1 deletions
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 @@ | |||
1 | /* $OpenBSD: ssl_locl.h,v 1.209 2018/08/24 18:10:25 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.210 2018/08/27 16:42:48 jsing 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 | * |
@@ -1089,6 +1089,8 @@ int ssl_has_ecc_ciphers(SSL *s); | |||
1089 | int ssl_verify_alarm_type(long type); | 1089 | int ssl_verify_alarm_type(long type); |
1090 | void ssl_load_ciphers(void); | 1090 | void ssl_load_ciphers(void); |
1091 | 1091 | ||
1092 | int SSL_SESSION_ticket(SSL_SESSION *ss, unsigned char **out, size_t *out_len); | ||
1093 | |||
1092 | const SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p); | 1094 | const SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p); |
1093 | int ssl3_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p); | 1095 | int ssl3_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p); |
1094 | int ssl3_send_server_certificate(SSL *s); | 1096 | int ssl3_send_server_certificate(SSL *s); |