Compare commits

...
2 Commits
Author SHA1 Message Date
Hakase 6aa2bc2941 Revert patch 2018-04-25 22:36:15 +09:00
Hakase d87ea3e4e4 New Patch 2018-04-25 22:13:22 +09:00
+3 -4
View File
@@ -4200,11 +4200,10 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
s->version != DTLS1_VERSION))
ok = 0;
/* not use ECDSA under TLS v1.2 */
// if ((alg_a & SSL_aECDSA) && s->version != TLS1_2_VERSION) ok = 0;
if ((alg_a & SSL_aRSA) &&
/* Not use weak cipher after TLSv1.0 */
if ((alg_a & SSL_aRSA) &&
(alg_k & SSL_kRSA) &&
(s->version != TLS1_VERSION)) ok = 0;
(s->version != TLS1_VERSION)) ok = 0;
#ifndef OPENSSL_NO_PSK
/* with PSK there must be server callback set */