Delete the skip portion.

This commit is contained in:
2018-05-19 01:56:18 +09:00
parent 576338e81c
commit e8a0afd4a0
-12
View File
@@ -4194,18 +4194,6 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
alg_k = c->algorithm_mkey;
alg_a = c->algorithm_auth;
/* Skip 3DES over TLS v1.0 */
if (c->algorithm_enc == SSL_3DES &&
(s->version != TLS1_VERSION &&
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) &&
(alg_k & SSL_kRSA) &&
(s->version != TLS1_VERSION)) ok = 0;
#ifndef OPENSSL_NO_PSK
/* with PSK there must be server callback set */
if ((alg_k & SSL_PSK) && s->psk_server_callback == NULL)