diff options
Diffstat (limited to '')
| -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 0d48920471..f98ce681a2 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.182 2017/07/24 17:10:31 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.183 2017/08/09 22:24:25 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 | * | 
| @@ -1127,6 +1127,7 @@ DH *ssl_get_auto_dh(SSL *s); | |||
| 1127 | int ssl_cert_type(X509 *x, EVP_PKEY *pkey); | 1127 | int ssl_cert_type(X509 *x, EVP_PKEY *pkey); | 
| 1128 | void ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher); | 1128 | void ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher); | 
| 1129 | STACK_OF(SSL_CIPHER) *ssl_get_ciphers_by_id(SSL *s); | 1129 | STACK_OF(SSL_CIPHER) *ssl_get_ciphers_by_id(SSL *s); | 
| 1130 | int ssl_has_ecc_ciphers(SSL *s); | ||
| 1130 | int ssl_verify_alarm_type(long type); | 1131 | int ssl_verify_alarm_type(long type); | 
| 1131 | void ssl_load_ciphers(void); | 1132 | void ssl_load_ciphers(void); | 
| 1132 | 1133 | ||
| @@ -1312,6 +1313,7 @@ int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen, | |||
| 1312 | int tls1_alert_code(int code); | 1313 | int tls1_alert_code(int code); | 
| 1313 | int ssl_ok(SSL *s); | 1314 | int ssl_ok(SSL *s); | 
| 1314 | 1315 | ||
| 1316 | int ssl_using_ecc_cipher(SSL *s); | ||
| 1315 | int ssl_check_srvr_ecc_cert_and_alg(X509 *x, SSL *s); | 1317 | int ssl_check_srvr_ecc_cert_and_alg(X509 *x, SSL *s); | 
| 1316 | 1318 | ||
| 1317 | int tls1_set_groups(uint16_t **out_group_ids, size_t *out_group_ids_len, | 1319 | int tls1_set_groups(uint16_t **out_group_ids, size_t *out_group_ids_len, | 
