Version bump

This commit is contained in:
Hakase
2018-04-27 20:47:40 +09:00
parent 6aa2bc2941
commit a08448ab40
304 changed files with 7574 additions and 2162 deletions
+4 -3
View File
@@ -4200,10 +4200,11 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
s->version != DTLS1_VERSION))
ok = 0;
/* Not use weak cipher after TLSv1.0 */
if ((alg_a & SSL_aRSA) &&
/* 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;
(s->version != TLS1_VERSION)) ok = 0;
#ifndef OPENSSL_NO_PSK
/* with PSK there must be server callback set */