summaryrefslogtreecommitdiffstats
path: root/ssl/ssl_local.h
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2021-01-13 12:39:40 +0000
committerMatt Caswell <matt@openssl.org>2021-02-05 15:20:36 +0000
commit5b64ce89b0859956387cda1d56718d2a5f09d928 (patch)
tree842aef9e8c3f1b2b0d86ff75414ed475d6ec7125 /ssl/ssl_local.h
parent9ca08f91e9817892c3545612a91d38687e593e14 (diff)
Remove OPENSSL_NO_DH guards from libssl
This removes man unnecessary OPENSSL_NO_DH guards from libssl. Now that libssl is entirely using the EVP APIs and implementations can be plugged in via providers it is no longer needed to disable DH at compile time in libssl. Instead it should detect at runtime whether DH is available from the loaded providers. Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/13916)
Diffstat (limited to 'ssl/ssl_local.h')
-rw-r--r--ssl/ssl_local.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h
index 1b8a43d131..fa1130e59d 100644
--- a/ssl/ssl_local.h
+++ b/ssl/ssl_local.h
@@ -2009,9 +2009,7 @@ typedef struct cert_st {
CERT_PKEY *key;
EVP_PKEY *dh_tmp;
-#ifndef OPENSSL_NO_DH
DH *(*dh_tmp_cb) (SSL *ssl, int is_export, int keysize);
-#endif
int dh_tmp_auto;
/* Flags related to certificates */
uint32_t cert_flags;