Commit adc5506a authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Make auto DH work with DHEPSK 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent 13be69f3

ssl/t1_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -4165,7 +4165,7 @@ DH *ssl_get_auto_dh(SSL *s) 
    int dh_secbits = 80;

    if (s->cert->dh_tmp_auto == 2)

        return DH_get_1024_160();

    if (s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL) {

    if (s->s3->tmp.new_cipher->algorithm_auth & (SSL_aNULL | SSL_aPSK)) {

        if (s->s3->tmp.new_cipher->strength_bits == 256)

            dh_secbits = 128;

        else