diff options
| -rw-r--r-- | ssl/ssl_txt.c | 4 | ||||
| -rw-r--r-- | ssl/t1_lib.c | 14 | ||||
| -rw-r--r-- | ssl/t1_trce.c | 3 | ||||
| -rw-r--r-- | ssl/tls1.h | 6 |
4 files changed, 26 insertions, 1 deletions
diff --git a/ssl/ssl_txt.c b/ssl/ssl_txt.c index 76a7cce786..e5774d2c14 100644 --- a/ssl/ssl_txt.c +++ b/ssl/ssl_txt.c @@ -244,6 +244,10 @@ int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x) X509_verify_cert_error_string(x->verify_result)) <= 0) goto err; + if (BIO_printf(bp, " Extended master secret: %s\n", + x->flags & SSL_SESS_FLAG_EXTMS ? "yes" : "no") <= 0) + goto err; + return (1); err: return (0); diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index 9be7347b56..22f7047916 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -1445,6 +1445,8 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *buf, s2n(TLSEXT_TYPE_encrypt_then_mac, ret); s2n(0, ret); # endif + s2n(TLSEXT_TYPE_extended_master_secret, ret); + s2n(0, ret); /* * Add padding to workaround bugs in F5 terminators. See @@ -1682,6 +1684,10 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *buf, } } # endif + if (!s->hit && s->session->flags & SSL_SESS_FLAG_EXTMS) { + s2n(TLSEXT_TYPE_extended_master_secret, ret); + s2n(0, ret); + } if (s->s3->alpn_selected) { const unsigned char *selected = s->s3->alpn_selected; @@ -2300,6 +2306,10 @@ static int ssl_scan_clienthello_tlsext(SSL *s, unsigned char **p, else if (type == TLSEXT_TYPE_encrypt_then_mac) s->s3->flags |= TLS1_FLAGS_ENCRYPT_THEN_MAC; # endif + else if (type == TLSEXT_TYPE_extended_master_secret) { + if (!s->hit) + s->session->flags |= SSL_SESS_FLAG_EXTMS; + } /* * If this ClientHello extension was unhandled and this is a * nonresumed connection, check whether the extension is a custom @@ -2594,6 +2604,10 @@ static int ssl_scan_serverhello_tlsext(SSL *s, unsigned char **p, s->s3->flags |= TLS1_FLAGS_ENCRYPT_THEN_MAC; } # endif + else if (type == TLSEXT_TYPE_extended_master_secret) { + if (!s->hit) + s->session->flags |= SSL_SESS_FLAG_EXTMS; + } /* * If this extension type was not otherwise handled, but matches a * custom_cli_ext_record, then send it to the c callback diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c index 26160ed09b..4161750b49 100644 --- a/ssl/t1_trce.c +++ b/ssl/t1_trce.c @@ -363,7 +363,8 @@ static ssl_trace_tbl ssl_exts_tbl[] = { {TLSEXT_TYPE_session_ticket, "session_ticket"}, {TLSEXT_TYPE_renegotiate, "renegotiate"}, {TLSEXT_TYPE_next_proto_neg, "next_proto_neg"}, - {TLSEXT_TYPE_padding, "padding"} + {TLSEXT_TYPE_padding, "padding"}, + {TLSEXT_TYPE_extended_master_secret, "extended_master_secret"} }; static ssl_trace_tbl ssl_curve_tbl[] = { diff --git a/ssl/tls1.h b/ssl/tls1.h index 1f756a4513..b33c917e33 100644 --- a/ssl/tls1.h +++ b/ssl/tls1.h @@ -250,6 +250,12 @@ extern "C" { * http://www.ietf.org/id/draft-ietf-tls-encrypt-then-mac-02.txt */ # define TLSEXT_TYPE_encrypt_then_mac 22 +/* + * Extended master secret extension. + * http://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml + * https://tools.ietf.org/id/draft-ietf-tls-session-hash-03.txt + */ +# define TLSEXT_TYPE_extended_master_secret 23 /* ExtensionType value from RFC4507 */ # define TLSEXT_TYPE_session_ticket 35 |