mirror of
https://github.com/processone/ejabberd.git
synced 2024-09-29 14:37:44 +02:00
Detect OpenSSL version at runtime, not at compile time
This commit is contained in:
parent
347e8b28ef
commit
906161b27f
@ -283,11 +283,15 @@ static int verify_callback(int preverify_ok, X509_STORE_CTX *ctx)
|
|||||||
* See http://www.openssl.org/news/secadv_20110906.txt
|
* See http://www.openssl.org/news/secadv_20110906.txt
|
||||||
* for details.
|
* for details.
|
||||||
*/
|
*/
|
||||||
#if OPENSSL_VERSION_NUMBER >= 0x1000005fL && !defined(OPENSSL_NO_ECDH)
|
#ifndef OPENSSL_NO_ECDH
|
||||||
static void setup_ecdh(SSL_CTX *ctx)
|
static void setup_ecdh(SSL_CTX *ctx)
|
||||||
{
|
{
|
||||||
EC_KEY *ecdh;
|
EC_KEY *ecdh;
|
||||||
|
|
||||||
|
if (SSLeay() < 0x1000005fL) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
|
ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
|
||||||
SSL_CTX_set_options(ctx, SSL_OP_SINGLE_ECDH_USE);
|
SSL_CTX_set_options(ctx, SSL_OP_SINGLE_ECDH_USE);
|
||||||
SSL_CTX_set_tmp_ecdh(ctx, ecdh);
|
SSL_CTX_set_tmp_ecdh(ctx, ecdh);
|
||||||
@ -438,12 +442,12 @@ static ErlDrvSSizeT tls_drv_control(ErlDrvData handle,
|
|||||||
|
|
||||||
SSL_CTX_set_cipher_list(ctx, CIPHERS);
|
SSL_CTX_set_cipher_list(ctx, CIPHERS);
|
||||||
|
|
||||||
#if OPENSSL_VERSION_NUMBER >= 0x1000005fL && !defined(OPENSSL_NO_ECDH)
|
#ifndef OPENSSL_NO_ECDH
|
||||||
if (command == SET_CERTIFICATE_FILE_ACCEPT) {
|
if (command == SET_CERTIFICATE_FILE_ACCEPT) {
|
||||||
setup_ecdh(ctx);
|
setup_ecdh(ctx);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#if !defined(OPENSSL_NO_DH)
|
#ifndef OPENSSL_NO_DH
|
||||||
if (command == SET_CERTIFICATE_FILE_ACCEPT) {
|
if (command == SET_CERTIFICATE_FILE_ACCEPT) {
|
||||||
setup_dh(ctx);
|
setup_dh(ctx);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user