generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Enable PSK if corresponding mask set.

Browse Source 
Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Dr. Stephen Henson 2015-06-28 17:02:56 +01:00
parent fe5eef3a3b
commit 526f94ad68
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ssl/ssl_lib.c
View File

@ -2112,6 +2112,12 @@ void ssl_set_masks(SSL *s, const SSL_CIPHER *cipher)
mask_a |= SSL_aPSK; mask_a |= SSL_aPSK;
emask_k |= SSL_kPSK; emask_k |= SSL_kPSK;
emask_a |= SSL_aPSK; 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 #endif
s->s3->tmp.mask_k = mask_k; s->s3->tmp.mask_k = mask_k;