Enable PSK if corresponding mask set.

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

Enable PSK if corresponding mask set.
Reviewed-by: N Matt Caswell <matt@openssl.org>
526f94ad · Dr. Stephen Henson · fe5eef3a · 526f94ad
显示空白变更内容
内联并排

Showing with 6 addition and 0 deletion

ssl/ssl_lib.c ssl/ssl_lib.c +6 -0

未找到文件。
--- 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;