Commit ab650f07 authored by Dmitry Belyavsky's avatar Dmitry Belyavsky Committed by Matt Caswell
Browse files

Avoid KCI attack for GOST 



Russian GOST ciphersuites are vulnerable to the KCI attack because they use
long-term keys to establish the connection when ssl client authorization is
on. This change brings the GOST implementation into line with the latest
specs in order to avoid the attack. It should not break backwards
compatibility.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent 2c0d295e

ssl/s3_clnt.c

+0 −19
Original line number Diff line number Diff line
@@ -2878,19 +2878,6 @@ int ssl3_send_client_key_exchange(SSL *s) 
                       ERR_R_INTERNAL_ERROR);

                goto err;

            }

            /*

             * If we have client certificate, use its secret as peer key

             */

            if (s->s3->tmp.cert_req && s->cert->key->privatekey) {

                if (EVP_PKEY_derive_set_peer

                    (pkey_ctx, s->cert->key->privatekey) <= 0) {

                    /*

                     * If there was an error - just ignore it. Ephemeral key

                     * * would be used

                     */

                    ERR_clear_error();

                }

            }

            /*

             * Compute shared IV and store it in algorithm-specific context

             * data
@@ -2937,12 +2924,6 @@ int ssl3_send_client_key_exchange(SSL *s) 
                n = msglen + 2;

            }

            memcpy(p, tmp, msglen);

            /* Check if pubkey from client certificate was used */

            if (EVP_PKEY_CTX_ctrl

                (pkey_ctx, -1, -1, EVP_PKEY_CTRL_PEER_KEY, 2, NULL) > 0) {

                /* Set flag "skip certificate verify" */

                s->s3->flags |= TLS1_FLAGS_SKIP_CERT_VERIFY;

            }

            EVP_PKEY_CTX_free(pkey_ctx);

            s->session->master_key_length =

                s->method->ssl3_enc->generate_master_secret(s,