From e06c1c49c14c3f56cf4ddae080514f7802669335 Mon Sep 17 00:00:00 2001 From: Janusz Dziemidowicz Date: Wed, 18 Jul 2012 21:57:28 +0200 Subject: [PATCH 1/5] Disable SSL 2.0 in TLS driver SSL 2.0 is not used anywhere as it has security problems. Disable it unconditionally both in server and client mode. This does _not_ disable support for SSL 2.0 compatible client hello which still will be accepted in the server mode. --- src/tls/tls_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tls/tls_drv.c b/src/tls/tls_drv.c index 6dbdccbe9..da11b50a4 100644 --- a/src/tls/tls_drv.c +++ b/src/tls/tls_drv.c @@ -354,6 +354,8 @@ static ErlDrvSSizeT tls_drv_control(ErlDrvData handle, res = SSL_CTX_check_private_key(ctx); die_unless(res > 0, "SSL_CTX_check_private_key failed"); + SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_TICKET); + SSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_OFF); SSL_CTX_set_default_verify_paths(ctx); #ifdef SSL_MODE_RELEASE_BUFFERS @@ -386,10 +388,8 @@ static ErlDrvSSizeT tls_drv_control(ErlDrvData handle, SSL_set_bio(d->ssl, d->bio_read, d->bio_write); if (command == SET_CERTIFICATE_FILE_ACCEPT) { - SSL_set_options(d->ssl, SSL_OP_NO_TICKET); SSL_set_accept_state(d->ssl); } else { - SSL_set_options(d->ssl, SSL_OP_NO_SSLv2|SSL_OP_NO_TICKET); SSL_set_connect_state(d->ssl); } break; From d2d51381ec3fea97d0bd968cd7ffed2364b644c6 Mon Sep 17 00:00:00 2001 From: Janusz Dziemidowicz Date: Wed, 18 Jul 2012 22:00:58 +0200 Subject: [PATCH 2/5] Disable old and unsecure ciphers in TLS driver Disable: - export ciphers - broken by design, 40 and 56 bit encryption - low encryption ciphers - 56 and 64 bit encryption - SSLv2 ciphers - some ciphers using MD5 MAC --- src/tls/tls_drv.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/tls/tls_drv.c b/src/tls/tls_drv.c index da11b50a4..4096a48fb 100644 --- a/src/tls/tls_drv.c +++ b/src/tls/tls_drv.c @@ -44,6 +44,8 @@ typedef unsigned __int32 uint32_t; #define SSL_OP_NO_TICKET 0 #endif +#define CIPHERS "DEFAULT:!EXPORT:!LOW:!SSLv2" + /* * R15B changed several driver callbacks to use ErlDrvSizeT and * ErlDrvSSizeT typedefs instead of int. @@ -356,6 +358,8 @@ static ErlDrvSSizeT tls_drv_control(ErlDrvData handle, SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_TICKET); + SSL_CTX_set_cipher_list(ctx, CIPHERS); + SSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_OFF); SSL_CTX_set_default_verify_paths(ctx); #ifdef SSL_MODE_RELEASE_BUFFERS From a407382d9fabee4eab0bebfedffa3325b7ef52ef Mon Sep 17 00:00:00 2001 From: Janusz Dziemidowicz Date: Wed, 18 Jul 2012 22:14:11 +0200 Subject: [PATCH 3/5] Enable ECDHE key exchange in TSL driver --- src/tls/tls_drv.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/tls/tls_drv.c b/src/tls/tls_drv.c index 4096a48fb..6e16a65d4 100644 --- a/src/tls/tls_drv.c +++ b/src/tls/tls_drv.c @@ -278,6 +278,24 @@ static int verify_callback(int preverify_ok, X509_STORE_CTX *ctx) return 1; } +/* + * ECDHE is enabled only on OpenSSL 1.0.0e and later. + * See http://www.openssl.org/news/secadv_20110906.txt + * for details. + */ +#if OPENSSL_VERSION_NUMBER >= 0x1000005fL && !defined(OPENSSL_NO_ECDH) +static void setup_ecdh(SSL_CTX *ctx) +{ + EC_KEY *ecdh; + + ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); + SSL_CTX_set_options(ctx, SSL_OP_SINGLE_ECDH_USE); + SSL_CTX_set_tmp_ecdh(ctx, ecdh); + + EC_KEY_free(ecdh); +} +#endif + #define SET_CERTIFICATE_FILE_ACCEPT 1 #define SET_CERTIFICATE_FILE_CONNECT 2 #define SET_ENCRYPTED_INPUT 3 @@ -360,6 +378,12 @@ static ErlDrvSSizeT tls_drv_control(ErlDrvData handle, SSL_CTX_set_cipher_list(ctx, CIPHERS); +#if OPENSSL_VERSION_NUMBER >= 0x1000005fL && !defined(OPENSSL_NO_ECDH) + if (command == SET_CERTIFICATE_FILE_ACCEPT) { + setup_ecdh(ctx); + } +#endif + SSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_OFF); SSL_CTX_set_default_verify_paths(ctx); #ifdef SSL_MODE_RELEASE_BUFFERS From bc65b5008ec08b75d5ebbbf9b47d5db3a005e56c Mon Sep 17 00:00:00 2001 From: Janusz Dziemidowicz Date: Wed, 18 Jul 2012 22:34:43 +0200 Subject: [PATCH 4/5] Enable DHE key exchange in TLS driver --- src/tls/tls_drv.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/src/tls/tls_drv.c b/src/tls/tls_drv.c index 6e16a65d4..889a0f303 100644 --- a/src/tls/tls_drv.c +++ b/src/tls/tls_drv.c @@ -296,6 +296,68 @@ static void setup_ecdh(SSL_CTX *ctx) } #endif +#ifndef OPENSSL_NO_DH +/* +1024-bit MODP Group with 160-bit prime order subgroup (RFC5114) +-----BEGIN DH PARAMETERS----- +MIIBDAKBgQCxC4+WoIDgHd6S3l6uXVTsUsmfvPsGo8aaap3KUtI7YWBz4oZ1oj0Y +mDjvHi7mUsAT7LSuqQYRIySXXDzUm4O/rMvdfZDEvXCYSI6cIZpzck7/1vrlZEc4 ++qMaT/VbzMChUa9fDci0vUW/N982XBpl5oz9p21NpwjfH7K8LkpDcQKBgQCk0cvV +w/00EmdlpELvuZkF+BBN0lisUH/WQGz/FCZtMSZv6h5cQVZLd35pD1UE8hMWAhe0 +sBuIal6RVH+eJ0n01/vX07mpLuGQnQ0iY/gKdqaiTAh6CR9THb8KAWm2oorWYqTR +jnOvoy13nVkY0IvIhY9Nzvl8KiSFXm7rIrOy5QICAKA= +-----END DH PARAMETERS----- + */ +static unsigned char dh1024_p[] = { + 0xB1,0x0B,0x8F,0x96,0xA0,0x80,0xE0,0x1D,0xDE,0x92,0xDE,0x5E, + 0xAE,0x5D,0x54,0xEC,0x52,0xC9,0x9F,0xBC,0xFB,0x06,0xA3,0xC6, + 0x9A,0x6A,0x9D,0xCA,0x52,0xD2,0x3B,0x61,0x60,0x73,0xE2,0x86, + 0x75,0xA2,0x3D,0x18,0x98,0x38,0xEF,0x1E,0x2E,0xE6,0x52,0xC0, + 0x13,0xEC,0xB4,0xAE,0xA9,0x06,0x11,0x23,0x24,0x97,0x5C,0x3C, + 0xD4,0x9B,0x83,0xBF,0xAC,0xCB,0xDD,0x7D,0x90,0xC4,0xBD,0x70, + 0x98,0x48,0x8E,0x9C,0x21,0x9A,0x73,0x72,0x4E,0xFF,0xD6,0xFA, + 0xE5,0x64,0x47,0x38,0xFA,0xA3,0x1A,0x4F,0xF5,0x5B,0xCC,0xC0, + 0xA1,0x51,0xAF,0x5F,0x0D,0xC8,0xB4,0xBD,0x45,0xBF,0x37,0xDF, + 0x36,0x5C,0x1A,0x65,0xE6,0x8C,0xFD,0xA7,0x6D,0x4D,0xA7,0x08, + 0xDF,0x1F,0xB2,0xBC,0x2E,0x4A,0x43,0x71, +}; +static unsigned char dh1024_g[] = { + 0xA4,0xD1,0xCB,0xD5,0xC3,0xFD,0x34,0x12,0x67,0x65,0xA4,0x42, + 0xEF,0xB9,0x99,0x05,0xF8,0x10,0x4D,0xD2,0x58,0xAC,0x50,0x7F, + 0xD6,0x40,0x6C,0xFF,0x14,0x26,0x6D,0x31,0x26,0x6F,0xEA,0x1E, + 0x5C,0x41,0x56,0x4B,0x77,0x7E,0x69,0x0F,0x55,0x04,0xF2,0x13, + 0x16,0x02,0x17,0xB4,0xB0,0x1B,0x88,0x6A,0x5E,0x91,0x54,0x7F, + 0x9E,0x27,0x49,0xF4,0xD7,0xFB,0xD7,0xD3,0xB9,0xA9,0x2E,0xE1, + 0x90,0x9D,0x0D,0x22,0x63,0xF8,0x0A,0x76,0xA6,0xA2,0x4C,0x08, + 0x7A,0x09,0x1F,0x53,0x1D,0xBF,0x0A,0x01,0x69,0xB6,0xA2,0x8A, + 0xD6,0x62,0xA4,0xD1,0x8E,0x73,0xAF,0xA3,0x2D,0x77,0x9D,0x59, + 0x18,0xD0,0x8B,0xC8,0x85,0x8F,0x4D,0xCE,0xF9,0x7C,0x2A,0x24, + 0x85,0x5E,0x6E,0xEB,0x22,0xB3,0xB2,0xE5, +}; + +static void setup_dh(SSL_CTX *ctx) +{ + DH *dh; + + dh = DH_new(); + if (dh == NULL) { + return; + } + + dh->p = BN_bin2bn(dh1024_p, sizeof(dh1024_p), NULL); + dh->g = BN_bin2bn(dh1024_g, sizeof(dh1024_g), NULL); + if (dh->p == NULL || dh->g == NULL) { + DH_free(dh); + return; + } + + SSL_CTX_set_options(ctx, SSL_OP_SINGLE_DH_USE); + SSL_CTX_set_tmp_dh(ctx, dh); + + DH_free(dh); +} +#endif + #define SET_CERTIFICATE_FILE_ACCEPT 1 #define SET_CERTIFICATE_FILE_CONNECT 2 #define SET_ENCRYPTED_INPUT 3 @@ -383,6 +445,11 @@ static ErlDrvSSizeT tls_drv_control(ErlDrvData handle, setup_ecdh(ctx); } #endif +#if !defined(OPENSSL_NO_DH) + if (command == SET_CERTIFICATE_FILE_ACCEPT) { + setup_dh(ctx); + } +#endif SSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_OFF); SSL_CTX_set_default_verify_paths(ctx); From 5e7a1c88298c3a41558087bfdb4549865cf53a73 Mon Sep 17 00:00:00 2001 From: Janusz Dziemidowicz Date: Tue, 24 Jul 2012 07:40:07 +0200 Subject: [PATCH 5/5] Detect OpenSSL version at runtime, not at compile time --- src/tls/tls_drv.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/tls/tls_drv.c b/src/tls/tls_drv.c index 889a0f303..b79d30c03 100644 --- a/src/tls/tls_drv.c +++ b/src/tls/tls_drv.c @@ -283,11 +283,15 @@ static int verify_callback(int preverify_ok, X509_STORE_CTX *ctx) * See http://www.openssl.org/news/secadv_20110906.txt * for details. */ -#if OPENSSL_VERSION_NUMBER >= 0x1000005fL && !defined(OPENSSL_NO_ECDH) +#ifndef OPENSSL_NO_ECDH static void setup_ecdh(SSL_CTX *ctx) { EC_KEY *ecdh; + if (SSLeay() < 0x1000005fL) { + return; + } + ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); SSL_CTX_set_options(ctx, SSL_OP_SINGLE_ECDH_USE); SSL_CTX_set_tmp_ecdh(ctx, ecdh); @@ -440,12 +444,12 @@ static ErlDrvSSizeT tls_drv_control(ErlDrvData handle, 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) { setup_ecdh(ctx); } #endif -#if !defined(OPENSSL_NO_DH) +#ifndef OPENSSL_NO_DH if (command == SET_CERTIFICATE_FILE_ACCEPT) { setup_dh(ctx); }