diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-06-28 17:01:52 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-07-30 14:43:35 +0100 |
| commit | adc5506adf4f4cb2719026354a8512e3a7807f8a (patch) | |
| tree | cc7cdd50250e81403c8425ddf6b0c138fd13424b /ssl | |
| parent | 13be69f3e67f8b974183e6fff6d12d9a841ee97f (diff) | |
| download | openssl-adc5506adf4f4cb2719026354a8512e3a7807f8a.tar.gz | |
Make auto DH work with DHEPSK
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/t1_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |