From 526f94ad68345a18559ee334e03d7f31c96f47d6 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Sun, 28 Jun 2015 17:02:56 +0100 Subject: [PATCH] Enable PSK if corresponding mask set. Reviewed-by: Matt Caswell --- ssl/ssl_lib.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index d20d95be70..5a0ec8afc8 100644 --- 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; -- 2.34.1