Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP1:GA
compat-openssl098
openssl-CVE-2020-1968-raccoon.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File openssl-CVE-2020-1968-raccoon.patch of Package compat-openssl098
From c5b831f21d0d29d1e517d139d9d101763f60c9a2 Mon Sep 17 00:00:00 2001 From: Matt Caswell <matt@openssl.org> Date: Thu, 17 Dec 2015 02:57:20 +0000 Subject: [PATCH] Always generate DH keys for ephemeral DH cipher suites Modified version of the commit ffaef3f15 in the master branch by Stephen Henson. This makes the SSL_OP_SINGLE_DH_USE option a no-op and always generates a new DH key for every handshake regardless. CVE-2016-0701 (fix part 2 or 2) Issue reported by Antonio Sanso Reviewed-by: Viktor Dukhovni <viktor@openssl.org> --- doc/ssl/SSL_CTX_set_tmp_dh_callback.pod | 29 +++++-------------------- ssl/s3_lib.c | 14 ------------ ssl/s3_srvr.c | 17 +++------------ ssl/ssl.h | 2 +- 4 files changed, 9 insertions(+), 53 deletions(-) Index: openssl-0.9.8j/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod =================================================================== --- openssl-0.9.8j.orig/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod 2020-09-10 14:27:12.405381562 +0200 +++ openssl-0.9.8j/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod 2020-09-10 14:27:13.837390891 +0200 @@ -50,24 +50,8 @@ even if he gets hold of the normal (cert only used for signing. In order to perform a DH key exchange the server must use a DH group -(DH parameters) and generate a DH key. The server will always generate a new -DH key during the negotiation, when the DH parameters are supplied via -callback and/or when the SSL_OP_SINGLE_DH_USE option of -L<SSL_CTX_set_options(3)|SSL_CTX_set_options(3)> is set. It will -immediately create a DH key, when DH parameters are supplied via -SSL_CTX_set_tmp_dh() and SSL_OP_SINGLE_DH_USE is not set. In this case, -it may happen that a key is generated on initialization without later -being needed, while on the other hand the computer time during the -negotiation is being saved. - -If "strong" primes were used to generate the DH parameters, it is not strictly -necessary to generate a new key for each handshake but it does improve forward -secrecy. If it is not assured that "strong" primes were used, -SSL_OP_SINGLE_DH_USE must be used in order to prevent small subgroup -attacks. Always using SSL_OP_SINGLE_DH_USE has an impact on the -computer time needed during negotiation, but it is not very large, so -application authors/users should consider always enabling this option. -The option is required to implement perfect forward secrecy (PFS). +(DH parameters) and generate a DH key. The server will always generate +a new DH key during the negotiation. As generating DH parameters is extremely time consuming, an application should not generate the parameters on the fly but supply the parameters. @@ -94,10 +78,9 @@ can supply the DH parameters via a callb Previous versions of the callback used B<is_export> and B<keylength> parameters to control parameter generation for export and non-export cipher suites. Modern servers that do not support export ciphersuites -are advised to either use SSL_CTX_set_tmp_dh() in combination with -SSL_OP_SINGLE_DH_USE, or alternatively, use the callback but ignore -B<keylength> and B<is_export> and simply supply at least 2048-bit -parameters in the callback. +are advised to either use SSL_CTX_set_tmp_dh() or alternatively, use +the callback but ignore B<keylength> and B<is_export> and simply +supply at least 2048-bit parameters in the callback. =head1 EXAMPLES @@ -129,7 +112,6 @@ partly left out.) if (SSL_CTX_set_tmp_dh(ctx, dh_2048) != 1) { /* Error. */ } - SSL_CTX_set_options(ctx, SSL_OP_SINGLE_DH_USE); ... =head1 RETURN VALUES Index: openssl-0.9.8j/ssl/s3_lib.c =================================================================== --- openssl-0.9.8j.orig/ssl/s3_lib.c 2020-09-10 14:27:12.833384350 +0200 +++ openssl-0.9.8j/ssl/s3_lib.c 2020-09-10 14:27:13.837390891 +0200 @@ -1850,15 +1850,6 @@ long ssl3_ctrl(SSL *s, int cmd, long lar SSLerr(SSL_F_SSL3_CTRL, ERR_R_DH_LIB); return(ret); } - if (!(s->options & SSL_OP_SINGLE_DH_USE)) - { - if (!DH_generate_key(dh)) - { - DH_free(dh); - SSLerr(SSL_F_SSL3_CTRL, ERR_R_DH_LIB); - return(ret); - } - } if (s->cert->dh_tmp != NULL) DH_free(s->cert->dh_tmp); s->cert->dh_tmp = dh; @@ -2131,15 +2122,6 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd SSLerr(SSL_F_SSL3_CTX_CTRL,ERR_R_DH_LIB); return 0; } - if (!(ctx->options & SSL_OP_SINGLE_DH_USE)) - { - if (!DH_generate_key(new)) - { - SSLerr(SSL_F_SSL3_CTX_CTRL,ERR_R_DH_LIB); - DH_free(new); - return 0; - } - } if (cert->dh_tmp != NULL) DH_free(cert->dh_tmp); cert->dh_tmp=new; Index: openssl-0.9.8j/ssl/s3_srvr.c =================================================================== --- openssl-0.9.8j.orig/ssl/s3_srvr.c 2020-09-10 14:27:13.689389927 +0200 +++ openssl-0.9.8j/ssl/s3_srvr.c 2020-09-11 09:30:44.750755824 +0200 @@ -1353,28 +1353,10 @@ int ssl3_send_server_key_exchange(SSL *s } s->s3->tmp.dh=dh; - if ((dhp->pub_key == NULL || - dhp->priv_key == NULL || - (s->options & SSL_OP_SINGLE_DH_USE))) - { - if(!DH_generate_key(dh)) - { - SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, - ERR_R_DH_LIB); - goto err; - } - } - else - { - dh->pub_key=BN_dup(dhp->pub_key); - dh->priv_key=BN_dup(dhp->priv_key); - if ((dh->pub_key == NULL) || - (dh->priv_key == NULL)) - { - SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_DH_LIB); - goto err; + if (!DH_generate_key(dh)) { + SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_DH_LIB); + goto err; } - } r[0]=dh->p; r[1]=dh->g; r[2]=dh->pub_key; Index: openssl-0.9.8j/ssl/ssl.h =================================================================== --- openssl-0.9.8j.orig/ssl/ssl.h 2020-09-10 14:27:13.689389927 +0200 +++ openssl-0.9.8j/ssl/ssl.h 2020-09-10 14:27:13.841390918 +0200 @@ -525,7 +525,7 @@ typedef struct ssl_session_st #define SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION 0x00040000L /* If set, always create a new key when using tmp_ecdh parameters */ #define SSL_OP_SINGLE_ECDH_USE 0x00080000L -/* If set, always create a new key when using tmp_dh parameters */ +/* Does nothing: retained for compatibility */ #define SSL_OP_SINGLE_DH_USE 0x00100000L /* Does nothing: retained for compatibiity */ #define SSL_OP_EPHEMERAL_RSA 0x0 Index: openssl-0.9.8j/ssl/d1_srvr.c =================================================================== --- openssl-0.9.8j.orig/ssl/d1_srvr.c 2020-09-10 14:27:12.025379086 +0200 +++ openssl-0.9.8j/ssl/d1_srvr.c 2020-09-11 09:43:05.007397858 +0200 @@ -906,27 +906,10 @@ int dtls1_send_server_key_exchange(SSL * } s->s3->tmp.dh=dh; - if ((dhp->pub_key == NULL || - dhp->priv_key == NULL || - (s->options & SSL_OP_SINGLE_DH_USE))) + if(!DH_generate_key(dh)) { - if(!DH_generate_key(dh)) - { - SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE, - ERR_R_DH_LIB); - goto err; - } - } - else - { - dh->pub_key=BN_dup(dhp->pub_key); - dh->priv_key=BN_dup(dhp->priv_key); - if ((dh->pub_key == NULL) || - (dh->priv_key == NULL)) - { - SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE,ERR_R_DH_LIB); - goto err; - } + SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE, ERR_R_DH_LIB); + goto err; } r[0]=dh->p; r[1]=dh->g;
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
