From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 28 Jun 2015 16:01:52 +0000 (+0100)
Subject: Make auto DH work with DHEPSK
X-Git-Tag: OpenSSL_1_1_0-pre1~889
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=adc5506adf4f4cb2719026354a8512e3a7807f8a;p=oweals%2Fopenssl.git

Make auto DH work with DHEPSK

Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index a91e152cb9..47abf2b9f9 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -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