Hakase/openssl-custom
1
0 Fork 0
Code Issues Pull Requests Releases Wiki Activity

Patch TLS 1.2

Browse Source
This commit is contained in:
Hakase
2018-04-07 19:21:54 +09:00
parent bbac8ca55d
commit 1d97942e16
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ssl/s3_lib.c
+4 -3
View File
@@ -4191,6 +4191,9 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
} }
#endif #endif
alg_k = c->algorithm_mkey;
alg_a = c->algorithm_auth;
/* Skip 3DES over TLS v1.0 */ /* Skip 3DES over TLS v1.0 */
if (c->algorithm_enc == SSL_3DES && if (c->algorithm_enc == SSL_3DES &&
(s->version != TLS1_VERSION && (s->version != TLS1_VERSION &&
@@ -4198,9 +4201,7 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
ok = 0; ok = 0;
/* not use ECDSA under TLS v1.2 */ /* not use ECDSA under TLS v1.2 */
// if ((alg_a & SSL_aECDSA) && s->version != TLS1_2_VERSION) ok = 0; // 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;
alg_k = c->algorithm_mkey;
alg_a = c->algorithm_auth;
#ifndef OPENSSL_NO_PSK #ifndef OPENSSL_NO_PSK
/* with PSK there must be server callback set */ /* with PSK there must be server callback set */