Enable PSK if corresponding mask set.

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

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index d20d95be7080a12fa5f74e5e3484a627f8e3b182..5a0ec8afc8adb5105a00924c789aa9458132cb72 100644 (file)
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -2112,6 +2112,12 @@ void ssl_set_masks(SSL *s, const SSL_CIPHER *cipher)
     mask_a |= SSL_aPSK;
     emask_k |= SSL_kPSK;
     emask_a |= SSL_aPSK;
+    if (mask_k & SSL_kRSA)
+        mask_k |= SSL_kRSAPSK;
+    if (mask_k & SSL_kDHE)
+        mask_k |= SSL_kDHEPSK;
+    if (mask_k & SSL_kECDHE)
+        mask_k |= SSL_kECDHEPSK;
 #endif
 
     s->s3->tmp.mask_k = mask_k;