root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix SSL_IS_TLS13(s) 

The SSL_IS_TLS13() macro wasn't quite right. It would come back with true
in the case where we haven't yet negotiated TLSv1.3, but it could be
negotiated.

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Matt Caswell 2016-11-21 13:24:50 +00:00
parent cc24a22b83
commit c805f6189e
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ssl/ssl_locl.h
View File

@ -352,7 +352,9 @@
# define SSL_IS_DTLS(s) (s->method->ssl3_enc->enc_flags & SSL_ENC_FLAG_DTLS) # define SSL_IS_DTLS(s) (s->method->ssl3_enc->enc_flags & SSL_ENC_FLAG_DTLS)
/* Check if we are using TLSv1.3 */ /* Check if we are using TLSv1.3 */
# define SSL_IS_TLS13(s) (!SSL_IS_DTLS(s) && (s)->version >= TLS1_3_VERSION) # define SSL_IS_TLS13(s) (!SSL_IS_DTLS(s) \
&& (s)->method->version >= TLS1_3_VERSION \
&& (s)->method->version != TLS_ANY_VERSION)
/* See if we need explicit IV */ /* See if we need explicit IV */
# define SSL_USE_EXPLICIT_IV(s) \ # define SSL_USE_EXPLICIT_IV(s) \

28
ssl/t1_lib.c
View File

@ -1029,9 +1029,10 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
const unsigned char *pcurves = NULL; const unsigned char *pcurves = NULL;
size_t num_curves = 0; size_t num_curves = 0;
int using_ecc = 0; int using_ecc = 0;
int min_version, max_version, reason;
/* See if we support any ECC ciphersuites */ /* See if we support any ECC ciphersuites */
if ((s->version >= TLS1_VERSION && s->version <= TLS1_2_VERSION) if ((s->version >= TLS1_VERSION && s->version <= TLS1_3_VERSION)
|| SSL_IS_DTLS(s)) { || SSL_IS_DTLS(s)) {
int i; int i;
unsigned long alg_k, alg_a; unsigned long alg_k, alg_a;
@ -1043,17 +1044,12 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
alg_k = c->algorithm_mkey; alg_k = c->algorithm_mkey;
alg_a = c->algorithm_auth; alg_a = c->algorithm_auth;
if ((alg_k & (SSL_kECDHE | SSL_kECDHEPSK)) if ((alg_k & (SSL_kECDHE | SSL_kECDHEPSK))
|| (alg_a & SSL_aECDSA)) { || (alg_a & SSL_aECDSA)
|| c->min_tls >= TLS1_3_VERSION) {
using_ecc = 1; using_ecc = 1;
break; break;
} }
} }
} else if (SSL_IS_TLS13(s)) {
/*
* TODO(TLS1.3): We always use ECC for TLSv1.3 at the moment. This will
* change if we implement DH key shares
*/
using_ecc = 1;
} }
#else #else
if (SSL_IS_TLS13(s)) { if (SSL_IS_TLS13(s)) {
@ -1366,9 +1362,15 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
return 0; return 0;
} }
reason = ssl_get_client_min_max_version(s, &min_version, &max_version);
if (reason != 0) {
SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, reason);
return 0;
}
/* TLS1.3 specific extensions */ /* TLS1.3 specific extensions */
if (SSL_IS_TLS13(s)) { if (!SSL_IS_DTLS(s) && max_version >= TLS1_3_VERSION) {
int min_version, max_version, reason, currv; int currv;
size_t i, sharessent = 0; size_t i, sharessent = 0;
/* TODO(TLS1.3): Should we add this extension for versions < TLS1.3? */ /* TODO(TLS1.3): Should we add this extension for versions < TLS1.3? */
@ -1379,11 +1381,7 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al)
SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR); SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
return 0; return 0;
} }
reason = ssl_get_client_min_max_version(s, &min_version, &max_version);
if (reason != 0) {
SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, reason);
return 0;
}
/* /*
* TODO(TLS1.3): There is some discussion on the TLS list as to wheter * TODO(TLS1.3): There is some discussion on the TLS list as to wheter
* we should include versions <TLS1.2. For the moment we do. To be * we should include versions <TLS1.2. For the moment we do. To be