Commit 91e64e14 authored by Matt Caswell's avatar Matt Caswell
Browse files

Clean Kerberos pre-master secret 



Ensure the Kerberos pre-master secret has OPENSSL_cleanse called on it.

With thanks to the Open Crypto Audit Project for reporting this issue.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(cherry picked from commit 4e3dbe37)
parent 0d3a7e7c

ssl/s3_srvr.c

+16 −5
Original line number Diff line number Diff line
@@ -2215,6 +2215,7 @@ int ssl3_get_client_key_exchange(SSL *s) 
        int padl, outl;

        krb5_timestamp authtime = 0;

        krb5_ticket_times ttimes;

        int kerr = 0;



        EVP_CIPHER_CTX_init(&ciph_ctx);
@@ -2317,23 +2318,27 @@ int ssl3_get_client_key_exchange(SSL *s) 
        {

            SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,

                   SSL_R_DECRYPTION_FAILED);

            goto err;

            kerr = 1;

            goto kclean;

        }

        if (outl > SSL_MAX_MASTER_KEY_LENGTH) {

            SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,

                   SSL_R_DATA_LENGTH_TOO_LONG);

            goto err;

            kerr = 1;

            goto kclean;

        }

        if (!EVP_DecryptFinal_ex(&ciph_ctx, &(pms[outl]), &padl)) {

            SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,

                   SSL_R_DECRYPTION_FAILED);

            goto err;

            kerr = 1;

            goto kclean;

        }

        outl += padl;

        if (outl > SSL_MAX_MASTER_KEY_LENGTH) {

            SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,

                   SSL_R_DATA_LENGTH_TOO_LONG);

            goto err;

            kerr = 1;

            goto kclean;

        }

        if (!((pms[0] == (s->client_version >> 8))

              && (pms[1] == (s->client_version & 0xff)))) {
@@ -2350,7 +2355,8 @@ int ssl3_get_client_key_exchange(SSL *s) 
            if (!(s->options & SSL_OP_TLS_ROLLBACK_BUG)) {

                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,

                       SSL_AD_DECODE_ERROR);

                goto err;

                kerr = 1;

                goto kclean;

            }

        }
@@ -2376,6 +2382,11 @@ int ssl3_get_client_key_exchange(SSL *s) 
         *  kssl_ctx = kssl_ctx_free(kssl_ctx);

         *  if (s->kssl_ctx)  s->kssl_ctx = NULL;

         */



 kclean:

        OPENSSL_cleanse(pms, sizeof(pms));

        if (kerr)

            goto err;

    } else

#endif                          /* OPENSSL_NO_KRB5 */