diff options
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index b895de1fd3..c3c762a5fa 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.246 2019/04/22 14:49:42 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.247 2019/04/22 15:12:20 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 | * |
@@ -1096,8 +1096,7 @@ int ssl_cert_add1_chain_cert(CERT *c, X509 *cert); | |||
1096 | SESS_CERT *ssl_sess_cert_new(void); | 1096 | SESS_CERT *ssl_sess_cert_new(void); |
1097 | void ssl_sess_cert_free(SESS_CERT *sc); | 1097 | void ssl_sess_cert_free(SESS_CERT *sc); |
1098 | int ssl_get_new_session(SSL *s, int session); | 1098 | int ssl_get_new_session(SSL *s, int session); |
1099 | int ssl_get_prev_session(SSL *s, const unsigned char *session_id, | 1099 | int ssl_get_prev_session(SSL *s, CBS *session_id, CBS *ext_block); |
1100 | int session_id_len, CBS *ext_block); | ||
1101 | int ssl_cipher_id_cmp(const SSL_CIPHER *a, const SSL_CIPHER *b); | 1100 | int ssl_cipher_id_cmp(const SSL_CIPHER *a, const SSL_CIPHER *b); |
1102 | SSL_CIPHER *OBJ_bsearch_ssl_cipher_id(SSL_CIPHER *key, SSL_CIPHER const *base, | 1101 | SSL_CIPHER *OBJ_bsearch_ssl_cipher_id(SSL_CIPHER *key, SSL_CIPHER const *base, |
1103 | int num); | 1102 | int num); |
@@ -1327,8 +1326,8 @@ int ssl_check_clienthello_tlsext_early(SSL *s); | |||
1327 | int ssl_check_clienthello_tlsext_late(SSL *s); | 1326 | int ssl_check_clienthello_tlsext_late(SSL *s); |
1328 | int ssl_check_serverhello_tlsext(SSL *s); | 1327 | int ssl_check_serverhello_tlsext(SSL *s); |
1329 | 1328 | ||
1330 | int tls1_process_ticket(SSL *s, const unsigned char *session_id, | 1329 | int tls1_process_ticket(SSL *s, CBS *session_id, CBS *ext_block, |
1331 | int session_id_len, CBS *ext_block, SSL_SESSION **ret); | 1330 | SSL_SESSION **ret); |
1332 | 1331 | ||
1333 | long ssl_get_algorithm2(SSL *s); | 1332 | long ssl_get_algorithm2(SSL *s); |
1334 | 1333 | ||