diff --git a/CHANGELOG b/CHANGELOG index b820a5839..8664cbd85 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,8 @@ #s wa Nmap Changelog ($Id$); -*-text-*- +o [Ncat][Nsock][GH#972] Remove RC4 from the list of TLS ciphers used by + default, in accordance with RFC 7465. [Codarren Velvindron] + o [NSE][GH#1022] Fix a false positive condition in ipmi-cipher-zero caused by not checking the error code in responses. Implementations which return an error are not vulnerable. [Juho Jokelainen] diff --git a/ncat/docs/ncat.xml b/ncat/docs/ncat.xml index 9692dcdec..ada7fd572 100644 --- a/ncat/docs/ncat.xml +++ b/ncat/docs/ncat.xml @@ -394,7 +394,7 @@ when connecting to servers or when accepting SSL connections from clients. The syntax is described in the OpenSSL ciphers(1) man page, and defaults to - ALL:!aNULL:!eNULL:!LOW:!EXP:!MD5:@STRENGTH + ALL:!aNULL:!eNULL:!LOW:!EXP:!RC4:!MD5:@STRENGTH diff --git a/ncat/docs/ncatguide.xml b/ncat/docs/ncatguide.xml index 0b4a07e43..eb64fa34f 100644 --- a/ncat/docs/ncatguide.xml +++ b/ncat/docs/ncatguide.xml @@ -440,7 +440,7 @@ Content-Type: text/html; charset=UTF-8 client) or accept (as a server) is a matter of choice between the greatest compatibility and the greatest security. The default set, expressed as an OpenSSL cipherlist, is - ALL:!aNULL:!eNULL:!LOW:!EXP:!MD5:@STRENGTH, a reasonable balance + ALL:!aNULL:!eNULL:!LOW:!EXP:!RC4:!MD5:@STRENGTH, a reasonable balance between the two ends of the spectrum. To set a different priority or initial choice, use the option. (Ncat option) diff --git a/ncat/ncat_connect.c b/ncat/ncat_connect.c index 77bf2ae72..2454d831d 100644 --- a/ncat/ncat_connect.c +++ b/ncat/ncat_connect.c @@ -249,7 +249,7 @@ static void set_ssl_ctx_options(SSL_CTX *ctx) bye("The --ssl-key and --ssl-cert options must be used together."); } if (o.sslciphers == NULL) { - if (!SSL_CTX_set_cipher_list(ctx, "ALL:!aNULL:!eNULL:!LOW:!EXP:!MD5:@STRENGTH")) + if (!SSL_CTX_set_cipher_list(ctx, "ALL:!aNULL:!eNULL:!LOW:!EXP:!RC4:!MD5:@STRENGTH")) bye("Unable to set OpenSSL cipher list: %s", ERR_error_string(ERR_get_error(), NULL)); } else { diff --git a/ncat/ncat_ssl.c b/ncat/ncat_ssl.c index dbebef957..bbfeba9df 100644 --- a/ncat/ncat_ssl.c +++ b/ncat/ncat_ssl.c @@ -197,7 +197,7 @@ SSL_CTX *setup_ssl_listen(void) /* Secure ciphers list taken from Nsock. */ if (o.sslciphers == NULL) { - if (!SSL_CTX_set_cipher_list(sslctx, "ALL:!aNULL:!eNULL:!LOW:!EXP:!MD5:@STRENGTH")) + if (!SSL_CTX_set_cipher_list(sslctx, "ALL:!aNULL:!eNULL:!LOW:!EXP:!RC4:!MD5:@STRENGTH")) bye("Unable to set OpenSSL cipher list: %s", ERR_error_string(ERR_get_error(), NULL)); } else { diff --git a/nsock/src/nsock_ssl.c b/nsock/src/nsock_ssl.c index 7683afff4..9cf131739 100644 --- a/nsock/src/nsock_ssl.c +++ b/nsock/src/nsock_ssl.c @@ -71,7 +71,7 @@ * OpenSSL. To see exactly what ciphers are enabled, use the command * openssl ciphers -v '...' * where ... is the string below. */ -#define CIPHERS_SECURE "ALL:!aNULL:!eNULL:!LOW:!EXP:!MD5:@STRENGTH" +#define CIPHERS_SECURE "ALL:!aNULL:!eNULL:!LOW:!EXP:!RC4:!MD5:@STRENGTH" /* This list of ciphers is for speed and compatibility, not security. Any cipher * is accepted, and the list is sorted by speed based on Brian Hatch's