aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-08-16 13:28:14 +0100
committerMatt Caswell <matt@openssl.org>2016-08-16 17:11:43 +0100
commit2ecb9f2d18614fb7b7b42830a358b7163ed43221 (patch)
tree07e34844fdd54b6aeb39ce9ea91b9c53da0adda3
parentf9cf774cbd31c3498ade4574c3b0ae6cb9773e28 (diff)
downloadopenssl-2ecb9f2d18614fb7b7b42830a358b7163ed43221.tar.gz
Provide compat macros for SSL_CTX_set_ecdh_auto() and SSL_set_ecdh_auto()
These functions are no longer relevant to 1.1.0 (we always have auto ecdh on) - but no reason to break old code that tries to call it. The macros will only return a dummy "success" result if the app was trying to enable ecdh. Disabling can't be done in quite this way any more. Fixes Github Issue #1437 Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
-rw-r--r--include/openssl/ssl.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 014570733d..288b018ed6 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -1279,6 +1279,8 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
# define SSL_CTX_set_tmp_rsa(ctx,rsa) 1
# define SSL_need_tmp_RSA(ssl) 0
# define SSL_set_tmp_rsa(ssl,rsa) 1
+# define SSL_CTX_set_ecdh_auto(dummy, onoff) ((onoff) != 0)
+# define SSL_set_ecdh_auto(dummy, onoff) ((onoff) != 0)
/*
* We "pretend" to call the callback to avoid warnings about unused static
* functions.