diff options
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index da4bde09f3..8e85f100aa 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.206 2018/08/16 17:49:48 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.207 2018/08/19 15:38:03 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 | * |
@@ -1282,11 +1282,9 @@ int ssl_check_serverhello_tlsext(SSL *s); | |||
1282 | #define tlsext_tick_md EVP_sha256 | 1282 | #define tlsext_tick_md EVP_sha256 |
1283 | int tls1_process_ticket(SSL *s, const unsigned char *session_id, int len, | 1283 | int tls1_process_ticket(SSL *s, const unsigned char *session_id, int len, |
1284 | const unsigned char *limit, SSL_SESSION **ret); | 1284 | const unsigned char *limit, SSL_SESSION **ret); |
1285 | int tls12_get_sigandhash_cbb(CBB *cbb, const EVP_PKEY *pk, | 1285 | int tls12_get_hashid(const EVP_MD *md); |
1286 | const EVP_MD *md); | ||
1287 | int tls12_get_sigandhash(unsigned char *p, const EVP_PKEY *pk, | ||
1288 | const EVP_MD *md); | ||
1289 | int tls12_get_sigid(const EVP_PKEY *pk); | 1286 | int tls12_get_sigid(const EVP_PKEY *pk); |
1287 | int tls12_get_hashandsig(CBB *cbb, const EVP_PKEY *pk, const EVP_MD *md); | ||
1290 | const EVP_MD *tls12_get_hash(unsigned char hash_alg); | 1288 | const EVP_MD *tls12_get_hash(unsigned char hash_alg); |
1291 | 1289 | ||
1292 | void ssl_clear_hash_ctx(EVP_MD_CTX **hash); | 1290 | void ssl_clear_hash_ctx(EVP_MD_CTX **hash); |