new patch

This commit is contained in:
Hakase
2018-04-08 00:47:55 +09:00
parent 1d97942e16
commit ee402b515c
+3 -3
View File
@@ -4198,10 +4198,10 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
if (c->algorithm_enc == SSL_3DES &&
(s->version != TLS1_VERSION &&
s->version != DTLS1_VERSION))
ok = 0;
continue;
/* not use ECDSA under TLS v1.2 */
// if ((alg_a & SSL_aECDSA) && s->version != TLS1_2_VERSION) ok = 0;
if ((alg_a & SSL_kRSA) && (alg_k & SSL_aRSA) && s->version == TLS1_2_VERSION) ok = 0;
// if ((alg_a & SSL_aECDSA) && s->version != TLS1_2_VERSION) continue;
if ((alg_a & SSL_kRSA) && (alg_k & SSL_aRSA) && s->version == TLS1_2_VERSION) continue;
#ifndef OPENSSL_NO_PSK
/* with PSK there must be server callback set */