diff options
Diffstat (limited to 'src/lib/libssl/src/ssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/src/ssl/ssl_locl.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libssl/src/ssl/ssl_locl.h b/src/lib/libssl/src/ssl/ssl_locl.h index 955c169244..e7bcb890e4 100644 --- a/src/lib/libssl/src/ssl/ssl_locl.h +++ b/src/lib/libssl/src/ssl/ssl_locl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_locl.h,v 1.72 2014/10/31 14:51:01 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.73 2014/10/31 15:25:55 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 | * |
@@ -442,6 +442,7 @@ typedef struct cert_st { | |||
442 | 442 | ||
443 | DH *dh_tmp; | 443 | DH *dh_tmp; |
444 | DH *(*dh_tmp_cb)(SSL *ssl, int is_export, int keysize); | 444 | DH *(*dh_tmp_cb)(SSL *ssl, int is_export, int keysize); |
445 | int dh_tmp_auto; | ||
445 | 446 | ||
446 | EC_KEY *ecdh_tmp; | 447 | EC_KEY *ecdh_tmp; |
447 | EC_KEY *(*ecdh_tmp_cb)(SSL *ssl, int is_export, int keysize); | 448 | EC_KEY *(*ecdh_tmp_cb)(SSL *ssl, int is_export, int keysize); |
@@ -588,6 +589,7 @@ int ssl_undefined_const_function(const SSL *s); | |||
588 | CERT_PKEY *ssl_get_server_send_pkey(const SSL *s); | 589 | CERT_PKEY *ssl_get_server_send_pkey(const SSL *s); |
589 | X509 *ssl_get_server_send_cert(const SSL *); | 590 | X509 *ssl_get_server_send_cert(const SSL *); |
590 | EVP_PKEY *ssl_get_sign_pkey(SSL *s, const SSL_CIPHER *c, const EVP_MD **pmd); | 591 | EVP_PKEY *ssl_get_sign_pkey(SSL *s, const SSL_CIPHER *c, const EVP_MD **pmd); |
592 | DH *ssl_get_auto_dh(SSL *s); | ||
591 | int ssl_cert_type(X509 *x, EVP_PKEY *pkey); | 593 | int ssl_cert_type(X509 *x, EVP_PKEY *pkey); |
592 | void ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher); | 594 | void ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher); |
593 | STACK_OF(SSL_CIPHER) *ssl_get_ciphers_by_id(SSL *s); | 595 | STACK_OF(SSL_CIPHER) *ssl_get_ciphers_by_id(SSL *s); |