Commit ac38115c authored by Kurt Roeckx's avatar Kurt Roeckx
Browse files

Correctly check for export size limit 



40 bit ciphers are limited to 512 bit RSA, 56 bit ciphers to 1024 bit.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent c5f28105

crypto/x509/x509type.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -121,9 +121,6 @@ int X509_certificate_type(X509 *x, EVP_PKEY *pkey) 
        }

        }

    }

    }





    /* /8 because it's 1024 bits we look for, not bytes */

    if (EVP_PKEY_size(pk) <= 1024 / 8)

        ret |= EVP_PKT_EXP;

    if (pkey == NULL)

    if (pkey == NULL)

        EVP_PKEY_free(pk);

        EVP_PKEY_free(pk);

    return (ret);

    return (ret);

include/openssl/evp.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -94,7 +94,6 @@ 
# define EVP_PKS_RSA     0x0100

# define EVP_PKS_RSA     0x0100

# define EVP_PKS_DSA     0x0200

# define EVP_PKS_DSA     0x0200

# define EVP_PKS_EC      0x0400

# define EVP_PKS_EC      0x0400

# define EVP_PKT_EXP     0x1000 /* <= 512 bit key */





# define EVP_PKEY_NONE   NID_undef

# define EVP_PKEY_NONE   NID_undef

# define EVP_PKEY_RSA    NID_rsaEncryption

# define EVP_PKEY_RSA    NID_rsaEncryption

ssl/s3_clnt.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -3324,6 +3324,7 @@ int ssl3_check_cert_and_algorithm(SSL *s) 
    int i, idx;

    int i, idx;

    long alg_k, alg_a;

    long alg_k, alg_a;

    EVP_PKEY *pkey = NULL;

    EVP_PKEY *pkey = NULL;

    int pkey_bits;

    SESS_CERT *sc;

    SESS_CERT *sc;

#ifndef OPENSSL_NO_RSA

#ifndef OPENSSL_NO_RSA

    RSA *rsa;

    RSA *rsa;
@@ -3373,6 +3374,7 @@ int ssl3_check_cert_and_algorithm(SSL *s) 
    }

    }

#endif

#endif

    pkey = X509_get_pubkey(sc->peer_pkeys[idx].x509);

    pkey = X509_get_pubkey(sc->peer_pkeys[idx].x509);

    pkey_bits = EVP_PKEY_bits(pkey);

    i = X509_certificate_type(sc->peer_pkeys[idx].x509, pkey);

    i = X509_certificate_type(sc->peer_pkeys[idx].x509, pkey);

    EVP_PKEY_free(pkey);

    EVP_PKEY_free(pkey);
@@ -3418,7 +3420,8 @@ int ssl3_check_cert_and_algorithm(SSL *s) 
# endif

# endif

#endif

#endif





    if (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher) && !has_bits(i, EVP_PKT_EXP)) {

    if (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher) &&

        pkey_bits > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher)) {

#ifndef OPENSSL_NO_RSA

#ifndef OPENSSL_NO_RSA

        if (alg_k & SSL_kRSA) {

        if (alg_k & SSL_kRSA) {

            if (rsa == NULL

            if (rsa == NULL