diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-06-28 17:02:56 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-07-30 14:43:35 +0100 |
| commit | 526f94ad68345a18559ee334e03d7f31c96f47d6 (patch) | |
| tree | 850f4ee6bd9543995fc7e40d4aa1aea3738b29c9 /ssl | |
| parent | fe5eef3a3b3e6844394d976a182d88225c59ddb5 (diff) | |
| download | openssl-526f94ad68345a18559ee334e03d7f31c96f47d6.tar.gz | |
Enable PSK if corresponding mask set.
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl_lib.c | 6 |
1 files changed, 6 insertions, 0 deletions
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; |