projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disable unsupported PSK algorithms
[openssl.git]
/
ssl
/
ssl_ciph.c
diff --git
a/ssl/ssl_ciph.c
b/ssl/ssl_ciph.c
index dd325bbaa0b5f380090a6decad3386832c62d50c..da64301b58badc305238349cad8eba1367cd43aa 100644
(file)
--- a/
ssl/ssl_ciph.c
+++ b/
ssl/ssl_ciph.c
@@
-495,22
+495,22
@@
void ssl_load_ciphers(void)
disabled_auth_mask = 0;
#ifdef OPENSSL_NO_RSA
disabled_auth_mask = 0;
#ifdef OPENSSL_NO_RSA
- disabled_mkey_mask |= SSL_kRSA;
+ disabled_mkey_mask |= SSL_kRSA
| SSL_kRSAPSK
;
disabled_auth_mask |= SSL_aRSA;
#endif
#ifdef OPENSSL_NO_DSA
disabled_auth_mask |= SSL_aDSS;
#endif
#ifdef OPENSSL_NO_DH
disabled_auth_mask |= SSL_aRSA;
#endif
#ifdef OPENSSL_NO_DSA
disabled_auth_mask |= SSL_aDSS;
#endif
#ifdef OPENSSL_NO_DH
- disabled_mkey_mask |= SSL_kDHr | SSL_kDHd | SSL_kDHE;
+ disabled_mkey_mask |= SSL_kDHr | SSL_kDHd | SSL_kDHE
| SSL_kDHEPSK
;
disabled_auth_mask |= SSL_aDH;
#endif
#ifdef OPENSSL_NO_EC
disabled_auth_mask |= SSL_aDH;
#endif
#ifdef OPENSSL_NO_EC
- disabled_mkey_mask |= SSL_kECDHe | SSL_kECDHr;
+ disabled_mkey_mask |= SSL_kECDHe | SSL_kECDHr
| SSL_kECDHEPSK
;
disabled_auth_mask |= SSL_aECDSA | SSL_aECDH;
#endif
#ifdef OPENSSL_NO_PSK
disabled_auth_mask |= SSL_aECDSA | SSL_aECDH;
#endif
#ifdef OPENSSL_NO_PSK
- disabled_mkey_mask |= SSL_
k
PSK;
+ disabled_mkey_mask |= SSL_PSK;
disabled_auth_mask |= SSL_aPSK;
#endif
#ifdef OPENSSL_NO_SRP
disabled_auth_mask |= SSL_aPSK;
#endif
#ifdef OPENSSL_NO_SRP