2016-11-24 16:59:48 +00:00
|
|
|
/*
|
2018-01-09 04:49:01 +00:00
|
|
|
* Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
|
2016-11-24 16:59:48 +00:00
|
|
|
*
|
|
|
|
* Licensed under the OpenSSL license (the "License"). You may not use
|
|
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
|
|
* in the file LICENSE in the source distribution or at
|
|
|
|
* https://www.openssl.org/source/license.html
|
|
|
|
*/
|
|
|
|
|
2017-02-24 12:45:37 +00:00
|
|
|
#include <string.h>
|
2017-08-18 03:52:46 +00:00
|
|
|
#include "internal/nelem.h"
|
2017-11-03 16:38:48 +00:00
|
|
|
#include "internal/cryptlib.h"
|
2016-11-24 16:59:48 +00:00
|
|
|
#include "../ssl_locl.h"
|
|
|
|
#include "statem_locl.h"
|
2017-09-13 13:50:49 +00:00
|
|
|
#include "internal/cryptlib.h"
|
2016-11-24 16:59:48 +00:00
|
|
|
|
2017-11-21 17:18:43 +00:00
|
|
|
static int final_renegotiate(SSL *s, unsigned int context, int sent);
|
2016-12-07 17:04:46 +00:00
|
|
|
static int init_server_name(SSL *s, unsigned int context);
|
2017-11-21 17:18:43 +00:00
|
|
|
static int final_server_name(SSL *s, unsigned int context, int sent);
|
2016-11-28 16:15:51 +00:00
|
|
|
#ifndef OPENSSL_NO_EC
|
2017-11-21 17:18:43 +00:00
|
|
|
static int final_ec_pt_formats(SSL *s, unsigned int context, int sent);
|
2016-11-28 16:15:51 +00:00
|
|
|
#endif
|
2016-12-07 17:04:46 +00:00
|
|
|
static int init_session_ticket(SSL *s, unsigned int context);
|
2017-01-04 08:16:07 +00:00
|
|
|
#ifndef OPENSSL_NO_OCSP
|
2016-12-07 17:04:46 +00:00
|
|
|
static int init_status_request(SSL *s, unsigned int context);
|
2017-01-04 08:16:07 +00:00
|
|
|
#endif
|
2016-11-25 23:19:56 +00:00
|
|
|
#ifndef OPENSSL_NO_NEXTPROTONEG
|
2016-12-07 17:04:46 +00:00
|
|
|
static int init_npn(SSL *s, unsigned int context);
|
2016-11-25 23:19:56 +00:00
|
|
|
#endif
|
2016-12-07 17:04:46 +00:00
|
|
|
static int init_alpn(SSL *s, unsigned int context);
|
2017-11-21 17:18:43 +00:00
|
|
|
static int final_alpn(SSL *s, unsigned int context, int sent);
|
Add support for the TLS 1.3 signature_algorithms_cert extension
The new extension is like signature_algorithms, but only for the
signature *on* the certificate we will present to the peer (the
old signature_algorithms extension is still used for signatures that
we *generate*, i.e., those over TLS data structures).
We do not need to generate this extension, since we are the same
implementation as our X.509 stack and can handle the same types
of signatures, but we need to be prepared to receive it, and use the received
information when selecting what certificate to present.
There is a lot of interplay between signature_algorithms_cert and
signature_algorithms, since both affect what certificate we can
use, and thus the resulting signature algorithm used for TLS messages.
So, apply signature_algorithms_cert (if present) as a filter on what
certificates we can consider when choosing a certificate+sigalg
pair.
As part of this addition, we also remove the fallback code that let
keys of type EVP_PKEY_RSA be used to generate RSA-PSS signatures -- the
new rsa_pss_pss_* and rsa_pss_rsae_* signature schemes have pulled
the key type into what is covered by the signature algorithm, so
we should not apply this sort of compatibility workaround.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5068)
2018-01-11 17:47:12 +00:00
|
|
|
static int init_sig_algs_cert(SSL *s, unsigned int context);
|
2016-12-07 17:04:46 +00:00
|
|
|
static int init_sig_algs(SSL *s, unsigned int context);
|
2017-03-10 16:31:20 +00:00
|
|
|
static int init_certificate_authorities(SSL *s, unsigned int context);
|
2017-05-09 12:44:25 +00:00
|
|
|
static EXT_RETURN tls_construct_certificate_authorities(SSL *s, WPACKET *pkt,
|
|
|
|
unsigned int context,
|
|
|
|
X509 *x,
|
2017-11-21 17:18:43 +00:00
|
|
|
size_t chainidx);
|
2017-03-10 16:31:20 +00:00
|
|
|
static int tls_parse_certificate_authorities(SSL *s, PACKET *pkt,
|
|
|
|
unsigned int context, X509 *x,
|
2017-11-21 17:18:43 +00:00
|
|
|
size_t chainidx);
|
2016-11-25 23:19:56 +00:00
|
|
|
#ifndef OPENSSL_NO_SRP
|
2016-12-07 17:04:46 +00:00
|
|
|
static int init_srp(SSL *s, unsigned int context);
|
2016-11-25 23:19:56 +00:00
|
|
|
#endif
|
2016-12-07 17:04:46 +00:00
|
|
|
static int init_etm(SSL *s, unsigned int context);
|
|
|
|
static int init_ems(SSL *s, unsigned int context);
|
2017-11-21 17:18:43 +00:00
|
|
|
static int final_ems(SSL *s, unsigned int context, int sent);
|
2017-01-12 15:28:48 +00:00
|
|
|
static int init_psk_kex_modes(SSL *s, unsigned int context);
|
2017-02-14 15:57:50 +00:00
|
|
|
#ifndef OPENSSL_NO_EC
|
2017-11-21 17:18:43 +00:00
|
|
|
static int final_key_share(SSL *s, unsigned int context, int sent);
|
2017-02-14 15:57:50 +00:00
|
|
|
#endif
|
2016-11-25 23:19:56 +00:00
|
|
|
#ifndef OPENSSL_NO_SRTP
|
2016-12-07 17:04:46 +00:00
|
|
|
static int init_srtp(SSL *s, unsigned int context);
|
2016-11-25 23:19:56 +00:00
|
|
|
#endif
|
2017-11-21 17:18:43 +00:00
|
|
|
static int final_sig_algs(SSL *s, unsigned int context, int sent);
|
|
|
|
static int final_early_data(SSL *s, unsigned int context, int sent);
|
|
|
|
static int final_maxfragmentlen(SSL *s, unsigned int context, int sent);
|
Add TLSv1.3 post-handshake authentication (PHA)
Add SSL_verify_client_post_handshake() for servers to initiate PHA
Add SSL_force_post_handshake_auth() for clients that don't have certificates
initially configured, but use a certificate callback.
Update SSL_CTX_set_verify()/SSL_set_verify() mode:
* Add SSL_VERIFY_POST_HANDSHAKE to postpone client authentication until after
the initial handshake.
* Update SSL_VERIFY_CLIENT_ONCE now only sends out one CertRequest regardless
of when the certificate authentication takes place; either initial handshake,
re-negotiation, or post-handshake authentication.
Add 'RequestPostHandshake' and 'RequirePostHandshake' SSL_CONF options that
add the SSL_VERIFY_POST_HANDSHAKE to the 'Request' and 'Require' options
Add support to s_client:
* Enabled automatically when cert is configured
* Can be forced enabled via -force_pha
Add support to s_server:
* Use 'c' to invoke PHA in s_server
* Remove some dead code
Update documentation
Update unit tests:
* Illegal use of PHA extension
* TLSv1.3 certificate tests
DTLS and TLS behave ever-so-slightly differently. So, when DTLS1.3 is
implemented, it's PHA support state machine may need to be different.
Add a TODO and a #error
Update handshake context to deal with PHA.
The handshake context for TLSv1.3 post-handshake auth is up through the
ClientFinish message, plus the CertificateRequest message. Subsequent
Certificate, CertificateVerify, and Finish messages are based on this
handshake context (not the Certificate message per se, but it's included
after the hash). KeyUpdate, NewSessionTicket, and prior Certificate
Request messages are not included in post-handshake authentication.
After the ClientFinished message is processed, save off the digest state
for future post-handshake authentication. When post-handshake auth occurs,
copy over the saved handshake context into the "main" handshake digest.
This effectively discards the any KeyUpdate or NewSessionTicket messages
and any prior post-handshake authentication.
This, of course, assumes that the ID-22 did not mean to include any
previous post-handshake authentication into the new handshake transcript.
This is implied by section 4.4.1 that lists messages only up to the
first ClientFinished.
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4964)
2017-12-18 21:52:28 +00:00
|
|
|
static int init_post_handshake_auth(SSL *s, unsigned int context);
|
|
|
|
|
2016-11-28 09:31:59 +00:00
|
|
|
/* Structure to define a built-in extension */
|
2016-12-07 17:04:46 +00:00
|
|
|
typedef struct extensions_definition_st {
|
|
|
|
/* The defined type for the extension */
|
2016-11-24 16:59:48 +00:00
|
|
|
unsigned int type;
|
2016-12-07 17:04:46 +00:00
|
|
|
/*
|
|
|
|
* The context that this extension applies to, e.g. what messages and
|
|
|
|
* protocol versions
|
|
|
|
*/
|
|
|
|
unsigned int context;
|
2016-11-25 17:52:35 +00:00
|
|
|
/*
|
2016-11-25 23:19:56 +00:00
|
|
|
* Initialise extension before parsing. Always called for relevant contexts
|
|
|
|
* even if extension not present
|
2016-11-25 17:52:35 +00:00
|
|
|
*/
|
2016-12-07 17:04:46 +00:00
|
|
|
int (*init)(SSL *s, unsigned int context);
|
|
|
|
/* Parse extension sent from client to server */
|
2017-01-31 17:00:12 +00:00
|
|
|
int (*parse_ctos)(SSL *s, PACKET *pkt, unsigned int context, X509 *x,
|
2017-11-21 17:18:43 +00:00
|
|
|
size_t chainidx);
|
2016-12-07 17:04:46 +00:00
|
|
|
/* Parse extension send from server to client */
|
2017-01-31 17:00:12 +00:00
|
|
|
int (*parse_stoc)(SSL *s, PACKET *pkt, unsigned int context, X509 *x,
|
2017-11-21 17:18:43 +00:00
|
|
|
size_t chainidx);
|
2016-12-07 17:04:46 +00:00
|
|
|
/* Construct extension sent from server to client */
|
2017-05-09 12:44:25 +00:00
|
|
|
EXT_RETURN (*construct_stoc)(SSL *s, WPACKET *pkt, unsigned int context,
|
2017-11-21 17:18:43 +00:00
|
|
|
X509 *x, size_t chainidx);
|
2016-12-07 17:04:46 +00:00
|
|
|
/* Construct extension sent from client to server */
|
2017-05-09 12:44:25 +00:00
|
|
|
EXT_RETURN (*construct_ctos)(SSL *s, WPACKET *pkt, unsigned int context,
|
2017-11-21 17:18:43 +00:00
|
|
|
X509 *x, size_t chainidx);
|
2016-11-25 17:52:35 +00:00
|
|
|
/*
|
2016-11-25 23:19:56 +00:00
|
|
|
* Finalise extension after parsing. Always called where an extensions was
|
|
|
|
* initialised even if the extension was not present. |sent| is set to 1 if
|
|
|
|
* the extension was seen, or 0 otherwise.
|
2016-11-25 17:52:35 +00:00
|
|
|
*/
|
2017-11-21 17:18:43 +00:00
|
|
|
int (*final)(SSL *s, unsigned int context, int sent);
|
2016-11-24 16:59:48 +00:00
|
|
|
} EXTENSION_DEFINITION;
|
|
|
|
|
2016-11-24 18:25:10 +00:00
|
|
|
/*
|
2016-11-28 09:31:59 +00:00
|
|
|
* Definitions of all built-in extensions. NOTE: Changes in the number or order
|
2017-06-06 15:35:43 +00:00
|
|
|
* of these extensions should be mirrored with equivalent changes to the
|
2016-12-10 11:44:59 +00:00
|
|
|
* indexes ( TLSEXT_IDX_* ) defined in ssl_locl.h.
|
2016-11-28 09:31:59 +00:00
|
|
|
* Each extension has an initialiser, a client and
|
|
|
|
* server side parser and a finaliser. The initialiser is called (if the
|
|
|
|
* extension is relevant to the given context) even if we did not see the
|
|
|
|
* extension in the message that we received. The parser functions are only
|
|
|
|
* called if we see the extension in the message. The finalisers are always
|
|
|
|
* called if the initialiser was called.
|
|
|
|
* There are also server and client side constructor functions which are always
|
|
|
|
* called during message construction if the extension is relevant for the
|
|
|
|
* given context.
|
|
|
|
* The initialisation, parsing, finalisation and construction functions are
|
|
|
|
* always called in the order defined in this list. Some extensions may depend
|
|
|
|
* on others having been processed first, so the order of this list is
|
|
|
|
* significant.
|
|
|
|
* The extension context is defined by a series of flags which specify which
|
|
|
|
* messages the extension is relevant to. These flags also specify whether the
|
2016-12-10 11:44:59 +00:00
|
|
|
* extension is relevant to a particular protocol or protocol version.
|
2016-11-30 13:46:11 +00:00
|
|
|
*
|
2016-11-28 09:31:59 +00:00
|
|
|
* TODO(TLS1.3): Make sure we have a test to check the consistency of these
|
2017-08-18 13:32:29 +00:00
|
|
|
*
|
|
|
|
* NOTE: WebSphere Application Server 7+ cannot handle empty extensions at
|
|
|
|
* the end, keep these extensions before signature_algorithm.
|
2016-11-24 18:25:10 +00:00
|
|
|
*/
|
2016-12-28 17:30:51 +00:00
|
|
|
#define INVALID_EXTENSION { 0x10000, 0, NULL, NULL, NULL, NULL, NULL, NULL }
|
2016-11-24 16:59:48 +00:00
|
|
|
static const EXTENSION_DEFINITION ext_defs[] = {
|
|
|
|
{
|
|
|
|
TLSEXT_TYPE_renegotiate,
|
2017-04-04 10:40:02 +00:00
|
|
|
SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO
|
|
|
|
| SSL_EXT_SSL3_ALLOWED | SSL_EXT_TLS1_2_AND_BELOW_ONLY,
|
2016-12-07 17:04:46 +00:00
|
|
|
NULL, tls_parse_ctos_renegotiate, tls_parse_stoc_renegotiate,
|
|
|
|
tls_construct_stoc_renegotiate, tls_construct_ctos_renegotiate,
|
|
|
|
final_renegotiate
|
2016-11-24 16:59:48 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
TLSEXT_TYPE_server_name,
|
2017-04-04 10:40:02 +00:00
|
|
|
SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO
|
|
|
|
| SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS,
|
2016-12-07 17:04:46 +00:00
|
|
|
init_server_name,
|
|
|
|
tls_parse_ctos_server_name, tls_parse_stoc_server_name,
|
|
|
|
tls_construct_stoc_server_name, tls_construct_ctos_server_name,
|
|
|
|
final_server_name
|
2016-11-24 16:59:48 +00:00
|
|
|
},
|
2017-11-05 16:46:48 +00:00
|
|
|
{
|
|
|
|
TLSEXT_TYPE_max_fragment_length,
|
|
|
|
SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO
|
|
|
|
| SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS,
|
|
|
|
NULL, tls_parse_ctos_maxfragmentlen, tls_parse_stoc_maxfragmentlen,
|
|
|
|
tls_construct_stoc_maxfragmentlen, tls_construct_ctos_maxfragmentlen,
|
|
|
|
final_maxfragmentlen
|
|
|
|
},
|
2016-11-24 16:59:48 +00:00
|
|
|
#ifndef OPENSSL_NO_SRP
|
|
|
|
{
|
|
|
|
TLSEXT_TYPE_srp,
|
2017-04-04 10:40:02 +00:00
|
|
|
SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_AND_BELOW_ONLY,
|
2016-12-07 17:04:46 +00:00
|
|
|
init_srp, tls_parse_ctos_srp, NULL, NULL, tls_construct_ctos_srp, NULL
|
2016-11-24 16:59:48 +00:00
|
|
|
},
|
2016-12-28 17:30:51 +00:00
|
|
|
#else
|
|
|
|
INVALID_EXTENSION,
|
2016-11-24 16:59:48 +00:00
|
|
|
#endif
|
|
|
|
#ifndef OPENSSL_NO_EC
|
|
|
|
{
|
|
|
|
TLSEXT_TYPE_ec_point_formats,
|
2017-04-04 10:40:02 +00:00
|
|
|
SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO
|
|
|
|
| SSL_EXT_TLS1_2_AND_BELOW_ONLY,
|
2016-12-07 17:04:46 +00:00
|
|
|
NULL, tls_parse_ctos_ec_pt_formats, tls_parse_stoc_ec_pt_formats,
|
|
|
|
tls_construct_stoc_ec_pt_formats, tls_construct_ctos_ec_pt_formats,
|
|
|
|
final_ec_pt_formats
|
2016-11-24 16:59:48 +00:00
|
|
|
},
|
|
|
|
{
|
2017-10-04 16:02:23 +00:00
|
|
|
/*
|
|
|
|
* "supported_groups" is spread across several specifications.
|
|
|
|
* It was originally specified as "elliptic_curves" in RFC 4492,
|
|
|
|
* and broadened to include named FFDH groups by RFC 7919.
|
|
|
|
* Both RFCs 4492 and 7919 do not include a provision for the server
|
|
|
|
* to indicate to the client the complete list of groups supported
|
|
|
|
* by the server, with the server instead just indicating the
|
|
|
|
* selected group for this connection in the ServerKeyExchange
|
|
|
|
* message. TLS 1.3 adds a scheme for the server to indicate
|
|
|
|
* to the client its list of supported groups in the
|
|
|
|
* EncryptedExtensions message, but none of the relevant
|
|
|
|
* specifications permit sending supported_groups in the ServerHello.
|
|
|
|
* Nonetheless (possibly due to the close proximity to the
|
|
|
|
* "ec_point_formats" extension, which is allowed in the ServerHello),
|
|
|
|
* there are several servers that send this extension in the
|
|
|
|
* ServerHello anyway. Up to and including the 1.1.0 release,
|
|
|
|
* we did not check for the presence of nonpermitted extensions,
|
|
|
|
* so to avoid a regression, we must permit this extension in the
|
|
|
|
* TLS 1.2 ServerHello as well.
|
|
|
|
*
|
|
|
|
* Note that there is no tls_parse_stoc_supported_groups function,
|
|
|
|
* so we do not perform any additional parsing, validation, or
|
|
|
|
* processing on the server's group list -- this is just a minimal
|
|
|
|
* change to preserve compatibility with these misbehaving servers.
|
|
|
|
*/
|
2016-11-24 16:59:48 +00:00
|
|
|
TLSEXT_TYPE_supported_groups,
|
2017-10-04 16:02:23 +00:00
|
|
|
SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS
|
|
|
|
| SSL_EXT_TLS1_2_SERVER_HELLO,
|
2016-12-07 17:04:46 +00:00
|
|
|
NULL, tls_parse_ctos_supported_groups, NULL,
|
2017-05-05 09:27:14 +00:00
|
|
|
tls_construct_stoc_supported_groups,
|
2016-12-07 17:04:46 +00:00
|
|
|
tls_construct_ctos_supported_groups, NULL
|
2016-11-24 16:59:48 +00:00
|
|
|
},
|
2016-12-28 17:30:51 +00:00
|
|
|
#else
|
|
|
|
INVALID_EXTENSION,
|
|
|
|
INVALID_EXTENSION,
|
2016-11-24 16:59:48 +00:00
|
|
|
#endif
|
|
|
|
{
|
|
|
|
TLSEXT_TYPE_session_ticket,
|
2017-04-04 10:40:02 +00:00
|
|
|
SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO
|
|
|
|
| SSL_EXT_TLS1_2_AND_BELOW_ONLY,
|
2016-12-07 17:04:46 +00:00
|
|
|
init_session_ticket, tls_parse_ctos_session_ticket,
|
|
|
|
tls_parse_stoc_session_ticket, tls_construct_stoc_session_ticket,
|
|
|
|
tls_construct_ctos_session_ticket, NULL
|
2016-11-24 16:59:48 +00:00
|
|
|
},
|
2016-11-25 16:28:02 +00:00
|
|
|
#ifndef OPENSSL_NO_OCSP
|
2016-11-24 16:59:48 +00:00
|
|
|
{
|
|
|
|
TLSEXT_TYPE_status_request,
|
2017-04-04 10:40:02 +00:00
|
|
|
SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO
|
2018-03-02 15:02:11 +00:00
|
|
|
| SSL_EXT_TLS1_3_CERTIFICATE | SSL_EXT_TLS1_3_CERTIFICATE_REQUEST,
|
2016-12-07 17:04:46 +00:00
|
|
|
init_status_request, tls_parse_ctos_status_request,
|
|
|
|
tls_parse_stoc_status_request, tls_construct_stoc_status_request,
|
2016-12-02 14:46:54 +00:00
|
|
|
tls_construct_ctos_status_request, NULL
|
2016-11-24 16:59:48 +00:00
|
|
|
},
|
2016-12-28 17:30:51 +00:00
|
|
|
#else
|
|
|
|
INVALID_EXTENSION,
|
2016-11-25 16:28:02 +00:00
|
|
|
#endif
|
2016-11-24 16:59:48 +00:00
|
|
|
#ifndef OPENSSL_NO_NEXTPROTONEG
|
|
|
|
{
|
|
|
|
TLSEXT_TYPE_next_proto_neg,
|
2017-04-04 10:40:02 +00:00
|
|
|
SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO
|
|
|
|
| SSL_EXT_TLS1_2_AND_BELOW_ONLY,
|
2016-12-07 17:04:46 +00:00
|
|
|
init_npn, tls_parse_ctos_npn, tls_parse_stoc_npn,
|
|
|
|
tls_construct_stoc_next_proto_neg, tls_construct_ctos_npn, NULL
|
2016-11-24 16:59:48 +00:00
|
|
|
},
|
2016-12-28 17:30:51 +00:00
|
|
|
#else
|
|
|
|
INVALID_EXTENSION,
|
2016-11-24 16:59:48 +00:00
|
|
|
#endif
|
|
|
|
{
|
2016-11-26 11:22:50 +00:00
|
|
|
/*
|
|
|
|
* Must appear in this list after server_name so that finalisation
|
|
|
|
* happens after server_name callbacks
|
|
|
|
*/
|
2016-11-24 16:59:48 +00:00
|
|
|
TLSEXT_TYPE_application_layer_protocol_negotiation,
|
2017-04-04 10:40:02 +00:00
|
|
|
SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO
|
|
|
|
| SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS,
|
2016-12-07 17:04:46 +00:00
|
|
|
init_alpn, tls_parse_ctos_alpn, tls_parse_stoc_alpn,
|
2017-08-01 14:45:29 +00:00
|
|
|
tls_construct_stoc_alpn, tls_construct_ctos_alpn, final_alpn
|
2016-11-24 16:59:48 +00:00
|
|
|
},
|
2016-11-25 10:22:02 +00:00
|
|
|
#ifndef OPENSSL_NO_SRTP
|
2016-11-24 16:59:48 +00:00
|
|
|
{
|
|
|
|
TLSEXT_TYPE_use_srtp,
|
2017-04-04 10:40:02 +00:00
|
|
|
SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO
|
|
|
|
| SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS | SSL_EXT_DTLS_ONLY,
|
2016-12-07 17:04:46 +00:00
|
|
|
init_srtp, tls_parse_ctos_use_srtp, tls_parse_stoc_use_srtp,
|
|
|
|
tls_construct_stoc_use_srtp, tls_construct_ctos_use_srtp, NULL
|
2016-11-24 16:59:48 +00:00
|
|
|
},
|
2016-12-28 17:30:51 +00:00
|
|
|
#else
|
|
|
|
INVALID_EXTENSION,
|
2016-11-25 10:22:02 +00:00
|
|
|
#endif
|
2016-11-24 16:59:48 +00:00
|
|
|
{
|
|
|
|
TLSEXT_TYPE_encrypt_then_mac,
|
2017-04-04 10:40:02 +00:00
|
|
|
SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO
|
|
|
|
| SSL_EXT_TLS1_2_AND_BELOW_ONLY,
|
2016-12-07 17:04:46 +00:00
|
|
|
init_etm, tls_parse_ctos_etm, tls_parse_stoc_etm,
|
|
|
|
tls_construct_stoc_etm, tls_construct_ctos_etm, NULL
|
2016-11-24 16:59:48 +00:00
|
|
|
},
|
2016-11-25 12:34:29 +00:00
|
|
|
#ifndef OPENSSL_NO_CT
|
2016-11-24 16:59:48 +00:00
|
|
|
{
|
|
|
|
TLSEXT_TYPE_signed_certificate_timestamp,
|
2017-04-04 10:40:02 +00:00
|
|
|
SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO
|
2018-03-02 15:02:11 +00:00
|
|
|
| SSL_EXT_TLS1_3_CERTIFICATE | SSL_EXT_TLS1_3_CERTIFICATE_REQUEST,
|
2016-11-25 17:52:35 +00:00
|
|
|
NULL,
|
2016-11-24 16:59:48 +00:00
|
|
|
/*
|
|
|
|
* No server side support for this, but can be provided by a custom
|
|
|
|
* extension. This is an exception to the rule that custom extensions
|
|
|
|
* cannot override built in ones.
|
|
|
|
*/
|
2016-12-07 17:04:46 +00:00
|
|
|
NULL, tls_parse_stoc_sct, NULL, tls_construct_ctos_sct, NULL
|
2016-11-24 16:59:48 +00:00
|
|
|
},
|
2016-12-28 17:30:51 +00:00
|
|
|
#else
|
|
|
|
INVALID_EXTENSION,
|
2016-11-25 12:34:29 +00:00
|
|
|
#endif
|
2016-11-24 16:59:48 +00:00
|
|
|
{
|
|
|
|
TLSEXT_TYPE_extended_master_secret,
|
2017-04-04 10:40:02 +00:00
|
|
|
SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO
|
|
|
|
| SSL_EXT_TLS1_2_AND_BELOW_ONLY,
|
2016-12-07 17:04:46 +00:00
|
|
|
init_ems, tls_parse_ctos_ems, tls_parse_stoc_ems,
|
|
|
|
tls_construct_stoc_ems, tls_construct_ctos_ems, final_ems
|
2016-11-24 16:59:48 +00:00
|
|
|
},
|
Add support for the TLS 1.3 signature_algorithms_cert extension
The new extension is like signature_algorithms, but only for the
signature *on* the certificate we will present to the peer (the
old signature_algorithms extension is still used for signatures that
we *generate*, i.e., those over TLS data structures).
We do not need to generate this extension, since we are the same
implementation as our X.509 stack and can handle the same types
of signatures, but we need to be prepared to receive it, and use the received
information when selecting what certificate to present.
There is a lot of interplay between signature_algorithms_cert and
signature_algorithms, since both affect what certificate we can
use, and thus the resulting signature algorithm used for TLS messages.
So, apply signature_algorithms_cert (if present) as a filter on what
certificates we can consider when choosing a certificate+sigalg
pair.
As part of this addition, we also remove the fallback code that let
keys of type EVP_PKEY_RSA be used to generate RSA-PSS signatures -- the
new rsa_pss_pss_* and rsa_pss_rsae_* signature schemes have pulled
the key type into what is covered by the signature algorithm, so
we should not apply this sort of compatibility workaround.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5068)
2018-01-11 17:47:12 +00:00
|
|
|
{
|
|
|
|
TLSEXT_TYPE_signature_algorithms_cert,
|
|
|
|
SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_3_CERTIFICATE_REQUEST,
|
|
|
|
init_sig_algs_cert, tls_parse_ctos_sig_algs_cert,
|
|
|
|
tls_parse_ctos_sig_algs_cert,
|
|
|
|
/* We do not generate signature_algorithms_cert at present. */
|
|
|
|
NULL, NULL, NULL
|
|
|
|
},
|
Add TLSv1.3 post-handshake authentication (PHA)
Add SSL_verify_client_post_handshake() for servers to initiate PHA
Add SSL_force_post_handshake_auth() for clients that don't have certificates
initially configured, but use a certificate callback.
Update SSL_CTX_set_verify()/SSL_set_verify() mode:
* Add SSL_VERIFY_POST_HANDSHAKE to postpone client authentication until after
the initial handshake.
* Update SSL_VERIFY_CLIENT_ONCE now only sends out one CertRequest regardless
of when the certificate authentication takes place; either initial handshake,
re-negotiation, or post-handshake authentication.
Add 'RequestPostHandshake' and 'RequirePostHandshake' SSL_CONF options that
add the SSL_VERIFY_POST_HANDSHAKE to the 'Request' and 'Require' options
Add support to s_client:
* Enabled automatically when cert is configured
* Can be forced enabled via -force_pha
Add support to s_server:
* Use 'c' to invoke PHA in s_server
* Remove some dead code
Update documentation
Update unit tests:
* Illegal use of PHA extension
* TLSv1.3 certificate tests
DTLS and TLS behave ever-so-slightly differently. So, when DTLS1.3 is
implemented, it's PHA support state machine may need to be different.
Add a TODO and a #error
Update handshake context to deal with PHA.
The handshake context for TLSv1.3 post-handshake auth is up through the
ClientFinish message, plus the CertificateRequest message. Subsequent
Certificate, CertificateVerify, and Finish messages are based on this
handshake context (not the Certificate message per se, but it's included
after the hash). KeyUpdate, NewSessionTicket, and prior Certificate
Request messages are not included in post-handshake authentication.
After the ClientFinished message is processed, save off the digest state
for future post-handshake authentication. When post-handshake auth occurs,
copy over the saved handshake context into the "main" handshake digest.
This effectively discards the any KeyUpdate or NewSessionTicket messages
and any prior post-handshake authentication.
This, of course, assumes that the ID-22 did not mean to include any
previous post-handshake authentication into the new handshake transcript.
This is implied by section 4.4.1 that lists messages only up to the
first ClientFinished.
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4964)
2017-12-18 21:52:28 +00:00
|
|
|
{
|
|
|
|
TLSEXT_TYPE_post_handshake_auth,
|
|
|
|
SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_3_ONLY,
|
|
|
|
init_post_handshake_auth,
|
|
|
|
tls_parse_ctos_post_handshake_auth, NULL,
|
|
|
|
NULL, tls_construct_ctos_post_handshake_auth,
|
|
|
|
NULL,
|
|
|
|
},
|
2017-08-18 13:32:29 +00:00
|
|
|
{
|
|
|
|
TLSEXT_TYPE_signature_algorithms,
|
|
|
|
SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_3_CERTIFICATE_REQUEST,
|
|
|
|
init_sig_algs, tls_parse_ctos_sig_algs,
|
|
|
|
tls_parse_ctos_sig_algs, tls_construct_ctos_sig_algs,
|
|
|
|
tls_construct_ctos_sig_algs, final_sig_algs
|
|
|
|
},
|
2016-11-24 16:59:48 +00:00
|
|
|
{
|
|
|
|
TLSEXT_TYPE_supported_versions,
|
2018-03-13 10:36:03 +00:00
|
|
|
SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_3_SERVER_HELLO
|
|
|
|
| SSL_EXT_TLS1_3_HELLO_RETRY_REQUEST | SSL_EXT_TLS_IMPLEMENTATION_ONLY,
|
2016-11-25 17:52:35 +00:00
|
|
|
NULL,
|
2016-11-24 16:59:48 +00:00
|
|
|
/* Processed inline as part of version selection */
|
2017-11-03 16:38:48 +00:00
|
|
|
NULL, tls_parse_stoc_supported_versions,
|
|
|
|
tls_construct_stoc_supported_versions,
|
|
|
|
tls_construct_ctos_supported_versions, NULL
|
2016-11-24 16:59:48 +00:00
|
|
|
},
|
2017-01-12 15:28:48 +00:00
|
|
|
{
|
|
|
|
TLSEXT_TYPE_psk_kex_modes,
|
2017-04-04 10:40:02 +00:00
|
|
|
SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS_IMPLEMENTATION_ONLY
|
|
|
|
| SSL_EXT_TLS1_3_ONLY,
|
2017-01-12 15:28:48 +00:00
|
|
|
init_psk_kex_modes, tls_parse_ctos_psk_kex_modes, NULL, NULL,
|
|
|
|
tls_construct_ctos_psk_kex_modes, NULL
|
|
|
|
},
|
2017-02-14 15:57:50 +00:00
|
|
|
#ifndef OPENSSL_NO_EC
|
2016-11-24 16:59:48 +00:00
|
|
|
{
|
2016-11-28 09:31:59 +00:00
|
|
|
/*
|
|
|
|
* Must be in this list after supported_groups. We need that to have
|
|
|
|
* been parsed before we do this one.
|
|
|
|
*/
|
2016-11-24 16:59:48 +00:00
|
|
|
TLSEXT_TYPE_key_share,
|
2017-04-04 10:40:02 +00:00
|
|
|
SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_3_SERVER_HELLO
|
|
|
|
| SSL_EXT_TLS1_3_HELLO_RETRY_REQUEST | SSL_EXT_TLS_IMPLEMENTATION_ONLY
|
|
|
|
| SSL_EXT_TLS1_3_ONLY,
|
2016-12-07 17:04:46 +00:00
|
|
|
NULL, tls_parse_ctos_key_share, tls_parse_stoc_key_share,
|
2017-01-18 11:31:37 +00:00
|
|
|
tls_construct_stoc_key_share, tls_construct_ctos_key_share,
|
|
|
|
final_key_share
|
2016-11-25 10:22:02 +00:00
|
|
|
},
|
2017-02-14 15:57:50 +00:00
|
|
|
#endif
|
2017-03-02 17:37:03 +00:00
|
|
|
{
|
2018-01-23 12:23:23 +00:00
|
|
|
/* Must be after key_share */
|
2017-03-02 17:37:03 +00:00
|
|
|
TLSEXT_TYPE_cookie,
|
2017-04-04 10:40:02 +00:00
|
|
|
SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_3_HELLO_RETRY_REQUEST
|
|
|
|
| SSL_EXT_TLS_IMPLEMENTATION_ONLY | SSL_EXT_TLS1_3_ONLY,
|
2017-09-11 14:43:56 +00:00
|
|
|
NULL, tls_parse_ctos_cookie, tls_parse_stoc_cookie,
|
|
|
|
tls_construct_stoc_cookie, tls_construct_ctos_cookie, NULL
|
2017-03-02 17:37:03 +00:00
|
|
|
},
|
2016-11-25 10:22:02 +00:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Special unsolicited ServerHello extension only used when
|
|
|
|
* SSL_OP_CRYPTOPRO_TLSEXT_BUG is set
|
|
|
|
*/
|
|
|
|
TLSEXT_TYPE_cryptopro_bug,
|
2017-04-04 10:40:02 +00:00
|
|
|
SSL_EXT_TLS1_2_SERVER_HELLO | SSL_EXT_TLS1_2_AND_BELOW_ONLY,
|
2016-12-07 17:04:46 +00:00
|
|
|
NULL, NULL, NULL, tls_construct_stoc_cryptopro_bug, NULL, NULL
|
2016-11-25 16:28:02 +00:00
|
|
|
},
|
2017-02-24 11:13:25 +00:00
|
|
|
{
|
|
|
|
TLSEXT_TYPE_early_data,
|
2017-04-04 10:40:02 +00:00
|
|
|
SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS
|
2018-01-30 15:41:56 +00:00
|
|
|
| SSL_EXT_TLS1_3_NEW_SESSION_TICKET | SSL_EXT_TLS1_3_ONLY,
|
2017-02-24 11:13:25 +00:00
|
|
|
NULL, tls_parse_ctos_early_data, tls_parse_stoc_early_data,
|
|
|
|
tls_construct_stoc_early_data, tls_construct_ctos_early_data,
|
|
|
|
final_early_data
|
|
|
|
},
|
2017-03-10 16:31:20 +00:00
|
|
|
{
|
|
|
|
TLSEXT_TYPE_certificate_authorities,
|
2017-04-04 10:40:02 +00:00
|
|
|
SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_3_CERTIFICATE_REQUEST
|
|
|
|
| SSL_EXT_TLS1_3_ONLY,
|
2017-03-10 16:31:20 +00:00
|
|
|
init_certificate_authorities,
|
|
|
|
tls_parse_certificate_authorities, tls_parse_certificate_authorities,
|
|
|
|
tls_construct_certificate_authorities,
|
|
|
|
tls_construct_certificate_authorities, NULL,
|
|
|
|
},
|
2016-11-25 16:28:02 +00:00
|
|
|
{
|
2017-01-13 17:00:49 +00:00
|
|
|
/* Must be immediately before pre_shared_key */
|
2016-11-25 16:28:02 +00:00
|
|
|
TLSEXT_TYPE_padding,
|
2017-04-04 10:40:02 +00:00
|
|
|
SSL_EXT_CLIENT_HELLO,
|
2016-11-25 17:52:35 +00:00
|
|
|
NULL,
|
2016-11-25 16:28:02 +00:00
|
|
|
/* We send this, but don't read it */
|
2016-12-07 17:04:46 +00:00
|
|
|
NULL, NULL, NULL, tls_construct_ctos_padding, NULL
|
2017-01-13 17:00:49 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
/* Required by the TLSv1.3 spec to always be the last extension */
|
|
|
|
TLSEXT_TYPE_psk,
|
2017-04-04 10:40:02 +00:00
|
|
|
SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_3_SERVER_HELLO
|
|
|
|
| SSL_EXT_TLS_IMPLEMENTATION_ONLY | SSL_EXT_TLS1_3_ONLY,
|
2017-01-18 17:22:18 +00:00
|
|
|
NULL, tls_parse_ctos_psk, tls_parse_stoc_psk, tls_construct_stoc_psk,
|
2017-01-18 16:28:23 +00:00
|
|
|
tls_construct_ctos_psk, NULL
|
2016-11-24 16:59:48 +00:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2017-04-05 10:59:23 +00:00
|
|
|
/* Check whether an extension's context matches the current context */
|
|
|
|
static int validate_context(SSL *s, unsigned int extctx, unsigned int thisctx)
|
|
|
|
{
|
|
|
|
/* Check we're allowed to use this extension in this context */
|
|
|
|
if ((thisctx & extctx) == 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (SSL_IS_DTLS(s)) {
|
|
|
|
if ((extctx & SSL_EXT_TLS_ONLY) != 0)
|
|
|
|
return 0;
|
|
|
|
} else if ((extctx & SSL_EXT_DTLS_ONLY) != 0) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2017-11-03 16:38:48 +00:00
|
|
|
int tls_validate_all_contexts(SSL *s, unsigned int thisctx, RAW_EXTENSION *exts)
|
|
|
|
{
|
|
|
|
size_t i, num_exts, builtin_num = OSSL_NELEM(ext_defs), offset;
|
|
|
|
RAW_EXTENSION *thisext;
|
|
|
|
unsigned int context;
|
|
|
|
ENDPOINT role = ENDPOINT_BOTH;
|
|
|
|
|
|
|
|
if ((thisctx & SSL_EXT_CLIENT_HELLO) != 0)
|
|
|
|
role = ENDPOINT_SERVER;
|
|
|
|
else if ((thisctx & SSL_EXT_TLS1_2_SERVER_HELLO) != 0)
|
|
|
|
role = ENDPOINT_CLIENT;
|
|
|
|
|
|
|
|
/* Calculate the number of extensions in the extensions list */
|
|
|
|
num_exts = builtin_num + s->cert->custext.meths_count;
|
|
|
|
|
|
|
|
for (thisext = exts, i = 0; i < num_exts; i++, thisext++) {
|
|
|
|
if (!thisext->present)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (i < builtin_num) {
|
|
|
|
context = ext_defs[i].context;
|
|
|
|
} else {
|
|
|
|
custom_ext_method *meth = NULL;
|
|
|
|
|
|
|
|
meth = custom_ext_find(&s->cert->custext, role, thisext->type,
|
|
|
|
&offset);
|
|
|
|
if (!ossl_assert(meth != NULL))
|
|
|
|
return 0;
|
|
|
|
context = meth->context;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!validate_context(s, context, thisctx))
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2016-11-24 16:59:48 +00:00
|
|
|
/*
|
|
|
|
* Verify whether we are allowed to use the extension |type| in the current
|
|
|
|
* |context|. Returns 1 to indicate the extension is allowed or unknown or 0 to
|
2016-11-28 09:31:59 +00:00
|
|
|
* indicate the extension is not allowed. If returning 1 then |*found| is set to
|
2017-03-28 21:57:28 +00:00
|
|
|
* the definition for the extension we found.
|
2016-11-24 16:59:48 +00:00
|
|
|
*/
|
2016-11-28 09:31:59 +00:00
|
|
|
static int verify_extension(SSL *s, unsigned int context, unsigned int type,
|
2016-12-07 17:04:46 +00:00
|
|
|
custom_ext_methods *meths, RAW_EXTENSION *rawexlist,
|
|
|
|
RAW_EXTENSION **found)
|
2016-11-24 16:59:48 +00:00
|
|
|
{
|
|
|
|
size_t i;
|
2016-11-28 09:31:59 +00:00
|
|
|
size_t builtin_num = OSSL_NELEM(ext_defs);
|
2016-12-07 17:21:48 +00:00
|
|
|
const EXTENSION_DEFINITION *thisext;
|
2016-11-24 16:59:48 +00:00
|
|
|
|
2016-12-07 17:04:46 +00:00
|
|
|
for (i = 0, thisext = ext_defs; i < builtin_num; i++, thisext++) {
|
|
|
|
if (type == thisext->type) {
|
2017-04-05 10:59:23 +00:00
|
|
|
if (!validate_context(s, thisext->context, context))
|
2016-11-24 16:59:48 +00:00
|
|
|
return 0;
|
|
|
|
|
2016-12-07 17:04:46 +00:00
|
|
|
*found = &rawexlist[i];
|
2016-11-24 16:59:48 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-11-28 09:31:59 +00:00
|
|
|
/* Check the custom extensions */
|
|
|
|
if (meths != NULL) {
|
2017-04-05 10:59:23 +00:00
|
|
|
size_t offset = 0;
|
2017-04-07 10:20:00 +00:00
|
|
|
ENDPOINT role = ENDPOINT_BOTH;
|
2017-04-05 10:59:23 +00:00
|
|
|
custom_ext_method *meth = NULL;
|
|
|
|
|
|
|
|
if ((context & SSL_EXT_CLIENT_HELLO) != 0)
|
2017-04-07 10:20:00 +00:00
|
|
|
role = ENDPOINT_SERVER;
|
2017-04-05 10:59:23 +00:00
|
|
|
else if ((context & SSL_EXT_TLS1_2_SERVER_HELLO) != 0)
|
2017-04-07 10:20:00 +00:00
|
|
|
role = ENDPOINT_CLIENT;
|
2017-04-05 10:59:23 +00:00
|
|
|
|
2017-04-07 10:20:00 +00:00
|
|
|
meth = custom_ext_find(meths, role, type, &offset);
|
2017-04-05 10:59:23 +00:00
|
|
|
if (meth != NULL) {
|
|
|
|
if (!validate_context(s, meth->context, context))
|
|
|
|
return 0;
|
|
|
|
*found = &rawexlist[offset + builtin_num];
|
|
|
|
return 1;
|
2016-11-24 16:59:48 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-11-28 09:31:59 +00:00
|
|
|
/* Unknown extension. We allow it */
|
2016-12-07 17:04:46 +00:00
|
|
|
*found = NULL;
|
2016-11-28 09:31:59 +00:00
|
|
|
return 1;
|
2016-11-24 16:59:48 +00:00
|
|
|
}
|
|
|
|
|
2016-11-28 09:31:59 +00:00
|
|
|
/*
|
|
|
|
* Check whether the context defined for an extension |extctx| means whether
|
|
|
|
* the extension is relevant for the current context |thisctx| or not. Returns
|
|
|
|
* 1 if the extension is relevant for this context, and 0 otherwise
|
|
|
|
*/
|
2017-04-05 10:59:23 +00:00
|
|
|
int extension_is_relevant(SSL *s, unsigned int extctx, unsigned int thisctx)
|
2016-11-25 23:19:56 +00:00
|
|
|
{
|
2017-10-13 10:41:50 +00:00
|
|
|
int is_tls13;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* For HRR we haven't selected the version yet but we know it will be
|
|
|
|
* TLSv1.3
|
|
|
|
*/
|
|
|
|
if ((thisctx & SSL_EXT_TLS1_3_HELLO_RETRY_REQUEST) != 0)
|
|
|
|
is_tls13 = 1;
|
|
|
|
else
|
|
|
|
is_tls13 = SSL_IS_TLS13(s);
|
|
|
|
|
2016-11-25 23:19:56 +00:00
|
|
|
if ((SSL_IS_DTLS(s)
|
2017-04-04 10:40:02 +00:00
|
|
|
&& (extctx & SSL_EXT_TLS_IMPLEMENTATION_ONLY) != 0)
|
2016-11-25 23:19:56 +00:00
|
|
|
|| (s->version == SSL3_VERSION
|
2017-04-04 10:40:02 +00:00
|
|
|
&& (extctx & SSL_EXT_SSL3_ALLOWED) == 0)
|
2017-03-14 19:41:08 +00:00
|
|
|
/*
|
|
|
|
* Note that SSL_IS_TLS13() means "TLS 1.3 has been negotiated",
|
|
|
|
* which is never true when generating the ClientHello.
|
|
|
|
* However, version negotiation *has* occurred by the time the
|
|
|
|
* ClientHello extensions are being parsed.
|
|
|
|
* Be careful to allow TLS 1.3-only extensions when generating
|
|
|
|
* the ClientHello.
|
|
|
|
*/
|
2017-10-13 10:41:50 +00:00
|
|
|
|| (is_tls13 && (extctx & SSL_EXT_TLS1_2_AND_BELOW_ONLY) != 0)
|
2017-03-14 19:41:08 +00:00
|
|
|
|| (!is_tls13 && (extctx & SSL_EXT_TLS1_3_ONLY) != 0
|
|
|
|
&& (thisctx & SSL_EXT_CLIENT_HELLO) == 0)
|
|
|
|
|| (s->server && !is_tls13 && (extctx & SSL_EXT_TLS1_3_ONLY) != 0)
|
2017-04-05 10:59:23 +00:00
|
|
|
|| (s->hit && (extctx & SSL_EXT_IGNORE_ON_RESUMPTION) != 0))
|
2016-11-25 23:19:56 +00:00
|
|
|
return 0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2016-11-24 16:59:48 +00:00
|
|
|
/*
|
|
|
|
* Gather a list of all the extensions from the data in |packet]. |context|
|
2016-11-28 09:31:59 +00:00
|
|
|
* tells us which message this extension is for. The raw extension data is
|
2017-11-23 13:11:42 +00:00
|
|
|
* stored in |*res| on success. We don't actually process the content of the
|
|
|
|
* extensions yet, except to check their types. This function also runs the
|
|
|
|
* initialiser functions for all known extensions if |init| is nonzero (whether
|
|
|
|
* we have collected them or not). If successful the caller is responsible for
|
|
|
|
* freeing the contents of |*res|.
|
2016-11-24 16:59:48 +00:00
|
|
|
*
|
|
|
|
* Per http://tools.ietf.org/html/rfc5246#section-7.4.1.4, there may not be
|
|
|
|
* more than one extension of the same type in a ClientHello or ServerHello.
|
|
|
|
* This function returns 1 if all extensions are unique and we have parsed their
|
|
|
|
* types, and 0 if the extensions contain duplicates, could not be successfully
|
2016-12-07 17:04:46 +00:00
|
|
|
* found, or an internal error occurred. We only check duplicates for
|
2016-11-28 09:31:59 +00:00
|
|
|
* extensions that we know about. We ignore others.
|
2016-11-24 16:59:48 +00:00
|
|
|
*/
|
|
|
|
int tls_collect_extensions(SSL *s, PACKET *packet, unsigned int context,
|
2017-11-21 17:18:43 +00:00
|
|
|
RAW_EXTENSION **res, size_t *len, int init)
|
2016-11-24 16:59:48 +00:00
|
|
|
{
|
|
|
|
PACKET extensions = *packet;
|
2016-12-07 17:21:48 +00:00
|
|
|
size_t i = 0;
|
2017-01-23 22:56:43 +00:00
|
|
|
size_t num_exts;
|
2017-04-05 10:59:23 +00:00
|
|
|
custom_ext_methods *exts = &s->cert->custext;
|
2016-11-24 16:59:48 +00:00
|
|
|
RAW_EXTENSION *raw_extensions = NULL;
|
2016-12-07 17:21:48 +00:00
|
|
|
const EXTENSION_DEFINITION *thisexd;
|
2016-11-24 16:59:48 +00:00
|
|
|
|
2016-12-07 23:19:45 +00:00
|
|
|
*res = NULL;
|
|
|
|
|
2016-11-28 09:31:59 +00:00
|
|
|
/*
|
|
|
|
* Initialise server side custom extensions. Client side is done during
|
|
|
|
* construction of extensions for the ClientHello.
|
|
|
|
*/
|
2017-04-05 10:59:23 +00:00
|
|
|
if ((context & SSL_EXT_CLIENT_HELLO) != 0)
|
|
|
|
custom_ext_init(&s->cert->custext);
|
2016-11-28 09:31:59 +00:00
|
|
|
|
2017-01-23 22:56:43 +00:00
|
|
|
num_exts = OSSL_NELEM(ext_defs) + (exts != NULL ? exts->meths_count : 0);
|
|
|
|
raw_extensions = OPENSSL_zalloc(num_exts * sizeof(*raw_extensions));
|
2016-11-28 09:31:59 +00:00
|
|
|
if (raw_extensions == NULL) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_COLLECT_EXTENSIONS,
|
|
|
|
ERR_R_MALLOC_FAILURE);
|
2016-11-28 09:31:59 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-03-16 22:17:16 +00:00
|
|
|
i = 0;
|
2016-11-24 16:59:48 +00:00
|
|
|
while (PACKET_remaining(&extensions) > 0) {
|
2017-05-09 12:44:25 +00:00
|
|
|
unsigned int type, idx;
|
2016-11-24 16:59:48 +00:00
|
|
|
PACKET extension;
|
2016-12-07 17:04:46 +00:00
|
|
|
RAW_EXTENSION *thisex;
|
2016-11-24 16:59:48 +00:00
|
|
|
|
|
|
|
if (!PACKET_get_net_2(&extensions, &type) ||
|
|
|
|
!PACKET_get_length_prefixed_2(&extensions, &extension)) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_F_TLS_COLLECT_EXTENSIONS,
|
|
|
|
SSL_R_BAD_EXTENSION);
|
2016-11-24 16:59:48 +00:00
|
|
|
goto err;
|
|
|
|
}
|
2016-11-28 09:31:59 +00:00
|
|
|
/*
|
|
|
|
* Verify this extension is allowed. We only check duplicates for
|
2017-03-10 13:53:53 +00:00
|
|
|
* extensions that we recognise. We also have a special case for the
|
|
|
|
* PSK extension, which must be the last one in the ClientHello.
|
2016-11-28 09:31:59 +00:00
|
|
|
*/
|
2016-12-07 17:04:46 +00:00
|
|
|
if (!verify_extension(s, context, type, exts, raw_extensions, &thisex)
|
2017-03-10 13:53:53 +00:00
|
|
|
|| (thisex != NULL && thisex->present == 1)
|
|
|
|
|| (type == TLSEXT_TYPE_psk
|
2017-04-04 10:40:02 +00:00
|
|
|
&& (context & SSL_EXT_CLIENT_HELLO) != 0
|
2017-03-10 13:53:53 +00:00
|
|
|
&& PACKET_remaining(&extensions) != 0)) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_F_TLS_COLLECT_EXTENSIONS,
|
|
|
|
SSL_R_BAD_EXTENSION);
|
2016-11-24 16:59:48 +00:00
|
|
|
goto err;
|
|
|
|
}
|
2017-05-09 12:44:25 +00:00
|
|
|
idx = thisex - raw_extensions;
|
|
|
|
/*-
|
|
|
|
* Check that we requested this extension (if appropriate). Requests can
|
|
|
|
* be sent in the ClientHello and CertificateRequest. Unsolicited
|
|
|
|
* extensions can be sent in the NewSessionTicket. We only do this for
|
|
|
|
* the built-in extensions. Custom extensions have a different but
|
|
|
|
* similar check elsewhere.
|
|
|
|
* Special cases:
|
|
|
|
* - The HRR cookie extension is unsolicited
|
|
|
|
* - The renegotiate extension is unsolicited (the client signals
|
|
|
|
* support via an SCSV)
|
|
|
|
* - The signed_certificate_timestamp extension can be provided by a
|
|
|
|
* custom extension or by the built-in version. We let the extension
|
|
|
|
* itself handle unsolicited response checks.
|
|
|
|
*/
|
|
|
|
if (idx < OSSL_NELEM(ext_defs)
|
|
|
|
&& (context & (SSL_EXT_CLIENT_HELLO
|
|
|
|
| SSL_EXT_TLS1_3_CERTIFICATE_REQUEST
|
|
|
|
| SSL_EXT_TLS1_3_NEW_SESSION_TICKET)) == 0
|
|
|
|
&& type != TLSEXT_TYPE_cookie
|
|
|
|
&& type != TLSEXT_TYPE_renegotiate
|
|
|
|
&& type != TLSEXT_TYPE_signed_certificate_timestamp
|
|
|
|
&& (s->ext.extflags[idx] & SSL_EXT_FLAG_SENT) == 0) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_UNSUPPORTED_EXTENSION,
|
|
|
|
SSL_F_TLS_COLLECT_EXTENSIONS, SSL_R_UNSOLICITED_EXTENSION);
|
2017-05-09 12:44:25 +00:00
|
|
|
goto err;
|
|
|
|
}
|
2016-12-07 17:04:46 +00:00
|
|
|
if (thisex != NULL) {
|
|
|
|
thisex->data = extension;
|
|
|
|
thisex->present = 1;
|
|
|
|
thisex->type = type;
|
2017-03-16 22:17:16 +00:00
|
|
|
thisex->received_order = i++;
|
2017-07-11 19:32:10 +00:00
|
|
|
if (s->ext.debug_cb)
|
|
|
|
s->ext.debug_cb(s, !s->server, thisex->type,
|
|
|
|
PACKET_data(&thisex->data),
|
|
|
|
PACKET_remaining(&thisex->data),
|
|
|
|
s->ext.debug_arg);
|
2016-11-24 16:59:48 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-04-18 14:59:39 +00:00
|
|
|
if (init) {
|
|
|
|
/*
|
|
|
|
* Initialise all known extensions relevant to this context,
|
|
|
|
* whether we have found them or not
|
|
|
|
*/
|
|
|
|
for (thisexd = ext_defs, i = 0; i < OSSL_NELEM(ext_defs);
|
|
|
|
i++, thisexd++) {
|
2017-04-19 12:12:34 +00:00
|
|
|
if (thisexd->init != NULL && (thisexd->context & context) != 0
|
|
|
|
&& extension_is_relevant(s, thisexd->context, context)
|
|
|
|
&& !thisexd->init(s, context)) {
|
2017-11-21 17:18:43 +00:00
|
|
|
/* SSLfatal() already called */
|
2017-04-18 14:59:39 +00:00
|
|
|
goto err;
|
|
|
|
}
|
2016-11-25 17:52:35 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-11-24 16:59:48 +00:00
|
|
|
*res = raw_extensions;
|
2017-01-23 22:56:43 +00:00
|
|
|
if (len != NULL)
|
|
|
|
*len = num_exts;
|
2016-11-24 16:59:48 +00:00
|
|
|
return 1;
|
|
|
|
|
|
|
|
err:
|
|
|
|
OPENSSL_free(raw_extensions);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-11-25 17:52:35 +00:00
|
|
|
/*
|
2016-11-28 09:31:59 +00:00
|
|
|
* Runs the parser for a given extension with index |idx|. |exts| contains the
|
|
|
|
* list of all parsed extensions previously collected by
|
|
|
|
* tls_collect_extensions(). The parser is only run if it is applicable for the
|
2016-12-01 15:21:08 +00:00
|
|
|
* given |context| and the parser has not already been run. If this is for a
|
|
|
|
* Certificate message, then we also provide the parser with the relevant
|
2017-01-05 16:12:56 +00:00
|
|
|
* Certificate |x| and its position in the |chainidx| with 0 being the first
|
2017-11-23 13:11:42 +00:00
|
|
|
* Certificate. Returns 1 on success or 0 on failure. If an extension is not
|
|
|
|
* present this counted as success.
|
2016-11-25 17:52:35 +00:00
|
|
|
*/
|
2016-12-07 17:21:48 +00:00
|
|
|
int tls_parse_extension(SSL *s, TLSEXT_INDEX idx, int context,
|
2017-11-21 17:18:43 +00:00
|
|
|
RAW_EXTENSION *exts, X509 *x, size_t chainidx)
|
2016-11-24 16:59:48 +00:00
|
|
|
{
|
2016-11-28 09:31:59 +00:00
|
|
|
RAW_EXTENSION *currext = &exts[idx];
|
2017-01-31 17:00:12 +00:00
|
|
|
int (*parser)(SSL *s, PACKET *pkt, unsigned int context, X509 *x,
|
2017-11-21 17:18:43 +00:00
|
|
|
size_t chainidx) = NULL;
|
2016-11-24 16:59:48 +00:00
|
|
|
|
2016-11-28 09:31:59 +00:00
|
|
|
/* Skip if the extension is not present */
|
|
|
|
if (!currext->present)
|
|
|
|
return 1;
|
2016-11-24 16:59:48 +00:00
|
|
|
|
2016-11-28 09:31:59 +00:00
|
|
|
/* Skip if we've already parsed this extension */
|
|
|
|
if (currext->parsed)
|
|
|
|
return 1;
|
2016-11-24 16:59:48 +00:00
|
|
|
|
2016-11-28 09:31:59 +00:00
|
|
|
currext->parsed = 1;
|
|
|
|
|
|
|
|
if (idx < OSSL_NELEM(ext_defs)) {
|
|
|
|
/* We are handling a built-in extension */
|
|
|
|
const EXTENSION_DEFINITION *extdef = &ext_defs[idx];
|
|
|
|
|
|
|
|
/* Check if extension is defined for our protocol. If not, skip */
|
|
|
|
if (!extension_is_relevant(s, extdef->context, context))
|
|
|
|
return 1;
|
|
|
|
|
2016-12-07 17:04:46 +00:00
|
|
|
parser = s->server ? extdef->parse_ctos : extdef->parse_stoc;
|
2016-11-24 18:02:12 +00:00
|
|
|
|
2016-12-07 17:04:46 +00:00
|
|
|
if (parser != NULL)
|
2017-11-21 17:18:43 +00:00
|
|
|
return parser(s, &currext->data, context, x, chainidx);
|
2016-11-24 16:59:48 +00:00
|
|
|
|
2016-11-28 09:31:59 +00:00
|
|
|
/*
|
|
|
|
* If the parser is NULL we fall through to the custom extension
|
|
|
|
* processing
|
|
|
|
*/
|
2016-11-24 16:59:48 +00:00
|
|
|
}
|
|
|
|
|
2017-04-05 10:59:23 +00:00
|
|
|
/* Parse custom extensions */
|
2017-11-21 17:18:43 +00:00
|
|
|
return custom_ext_parse(s, context, currext->type,
|
|
|
|
PACKET_data(&currext->data),
|
|
|
|
PACKET_remaining(&currext->data),
|
|
|
|
x, chainidx);
|
2016-11-25 23:19:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Parse all remaining extensions that have not yet been parsed. Also calls the
|
2017-04-18 14:59:39 +00:00
|
|
|
* finalisation for all extensions at the end if |fin| is nonzero, whether we
|
|
|
|
* collected them or not. Returns 1 for success or 0 for failure. If we are
|
|
|
|
* working on a Certificate message then we also pass the Certificate |x| and
|
2017-11-23 13:11:42 +00:00
|
|
|
* its position in the |chainidx|, with 0 being the first certificate.
|
2016-11-25 23:19:56 +00:00
|
|
|
*/
|
2016-12-01 15:21:08 +00:00
|
|
|
int tls_parse_all_extensions(SSL *s, int context, RAW_EXTENSION *exts, X509 *x,
|
2017-11-21 17:18:43 +00:00
|
|
|
size_t chainidx, int fin)
|
2016-11-25 23:19:56 +00:00
|
|
|
{
|
2016-12-07 17:04:46 +00:00
|
|
|
size_t i, numexts = OSSL_NELEM(ext_defs);
|
2016-12-07 17:21:48 +00:00
|
|
|
const EXTENSION_DEFINITION *thisexd;
|
2016-11-25 23:19:56 +00:00
|
|
|
|
2016-11-28 09:31:59 +00:00
|
|
|
/* Calculate the number of extensions in the extensions list */
|
2017-04-05 10:59:23 +00:00
|
|
|
numexts += s->cert->custext.meths_count;
|
2016-11-28 09:31:59 +00:00
|
|
|
|
|
|
|
/* Parse each extension in turn */
|
2016-12-07 17:04:46 +00:00
|
|
|
for (i = 0; i < numexts; i++) {
|
2017-11-21 17:18:43 +00:00
|
|
|
if (!tls_parse_extension(s, i, context, exts, x, chainidx)) {
|
|
|
|
/* SSLfatal() already called */
|
2016-11-28 09:31:59 +00:00
|
|
|
return 0;
|
2017-11-21 17:18:43 +00:00
|
|
|
}
|
2016-11-28 09:31:59 +00:00
|
|
|
}
|
2016-11-25 23:19:56 +00:00
|
|
|
|
2017-04-18 14:59:39 +00:00
|
|
|
if (fin) {
|
|
|
|
/*
|
|
|
|
* Finalise all known extensions relevant to this context,
|
|
|
|
* whether we have found them or not
|
|
|
|
*/
|
|
|
|
for (i = 0, thisexd = ext_defs; i < OSSL_NELEM(ext_defs);
|
|
|
|
i++, thisexd++) {
|
2017-04-19 12:12:34 +00:00
|
|
|
if (thisexd->final != NULL && (thisexd->context & context) != 0
|
2017-11-21 17:18:43 +00:00
|
|
|
&& !thisexd->final(s, context, exts[i].present)) {
|
|
|
|
/* SSLfatal() already called */
|
2017-04-18 14:59:39 +00:00
|
|
|
return 0;
|
2017-11-21 17:18:43 +00:00
|
|
|
}
|
2017-04-18 14:59:39 +00:00
|
|
|
}
|
2016-11-25 17:52:35 +00:00
|
|
|
}
|
|
|
|
|
2016-11-24 16:59:48 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2017-04-05 10:59:23 +00:00
|
|
|
int should_add_extension(SSL *s, unsigned int extctx, unsigned int thisctx,
|
|
|
|
int max_version)
|
|
|
|
{
|
|
|
|
/* Skip if not relevant for our context */
|
|
|
|
if ((extctx & thisctx) == 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* Check if this extension is defined for our protocol. If not, skip */
|
2017-03-14 19:41:08 +00:00
|
|
|
if (!extension_is_relevant(s, extctx, thisctx)
|
2017-04-05 10:59:23 +00:00
|
|
|
|| ((extctx & SSL_EXT_TLS1_3_ONLY) != 0
|
|
|
|
&& (thisctx & SSL_EXT_CLIENT_HELLO) != 0
|
|
|
|
&& (SSL_IS_DTLS(s) || max_version < TLS1_3_VERSION)))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2016-11-24 16:59:48 +00:00
|
|
|
/*
|
2016-11-28 09:31:59 +00:00
|
|
|
* Construct all the extensions relevant to the current |context| and write
|
2016-12-01 15:00:37 +00:00
|
|
|
* them to |pkt|. If this is an extension for a Certificate in a Certificate
|
2017-01-05 16:12:56 +00:00
|
|
|
* message, then |x| will be set to the Certificate we are handling, and
|
|
|
|
* |chainidx| will indicate the position in the chainidx we are processing (with
|
2017-11-21 17:18:43 +00:00
|
|
|
* 0 being the first in the chain). Returns 1 on success or 0 on failure. On a
|
2017-01-05 16:12:56 +00:00
|
|
|
* failure construction stops at the first extension to fail to construct.
|
2016-11-24 16:59:48 +00:00
|
|
|
*/
|
2016-11-24 18:02:12 +00:00
|
|
|
int tls_construct_extensions(SSL *s, WPACKET *pkt, unsigned int context,
|
2017-11-21 17:18:43 +00:00
|
|
|
X509 *x, size_t chainidx)
|
2016-11-24 18:02:12 +00:00
|
|
|
{
|
2016-12-07 17:04:46 +00:00
|
|
|
size_t i;
|
2017-11-21 17:18:43 +00:00
|
|
|
int min_version, max_version = 0, reason;
|
2016-12-07 17:21:48 +00:00
|
|
|
const EXTENSION_DEFINITION *thisexd;
|
2016-11-24 18:02:12 +00:00
|
|
|
|
|
|
|
if (!WPACKET_start_sub_packet_u16(pkt)
|
|
|
|
/*
|
|
|
|
* If extensions are of zero length then we don't even add the
|
Restore historical behavior for absent ServerHello extensions
In OpenSSL 1.1.0, when there were no extensions added to the ServerHello,
we did not write the extension data length bytes to the end of the
ServerHello; this is needed for compatibility with old client implementations
that do not support TLS extensions (such as the default configuration of
OpenSSL 0.9.8). When ServerHello extension construction was converted
to the new extensions framework in commit
7da160b0f46d832dbf285cb0b48ae56d4a8b884d, this behavior was inadvertently
limited to cases when SSLv3 was negotiated (and similarly for ClientHellos),
presumably since extensions are not defined at all for SSLv3. However,
extensions for TLS prior to TLS 1.3 have been defined in separate
RFCs (6066, 4366, and 3546) from the TLS protocol specifications, and as such
should be considered an optional protocol feature in those cases.
Accordingly, be conservative in what we send, and skip the extensions block
when there are no extensions to be sent, regardless of the TLS/SSL version.
(TLS 1.3 requires extensions and can safely be treated differently.)
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/4296)
2017-08-30 19:57:27 +00:00
|
|
|
* extensions length bytes to a ClientHello/ServerHello
|
|
|
|
* (for non-TLSv1.3).
|
2016-11-24 18:02:12 +00:00
|
|
|
*/
|
2017-04-04 10:40:02 +00:00
|
|
|
|| ((context &
|
|
|
|
(SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO)) != 0
|
|
|
|
&& !WPACKET_set_flags(pkt,
|
2016-11-24 18:02:12 +00:00
|
|
|
WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH))) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_CONSTRUCT_EXTENSIONS,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
|
|
|
return 0;
|
2016-11-24 18:02:12 +00:00
|
|
|
}
|
|
|
|
|
2017-04-04 10:40:02 +00:00
|
|
|
if ((context & SSL_EXT_CLIENT_HELLO) != 0) {
|
2017-04-26 10:28:20 +00:00
|
|
|
reason = ssl_get_min_max_version(s, &min_version, &max_version);
|
2016-11-25 16:28:02 +00:00
|
|
|
if (reason != 0) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_CONSTRUCT_EXTENSIONS,
|
|
|
|
reason);
|
|
|
|
return 0;
|
2016-11-25 16:28:02 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Add custom extensions first */
|
2017-04-04 10:40:02 +00:00
|
|
|
if ((context & SSL_EXT_CLIENT_HELLO) != 0) {
|
2017-08-11 14:15:22 +00:00
|
|
|
/* On the server side with initialise during ClientHello parsing */
|
2017-04-05 10:59:23 +00:00
|
|
|
custom_ext_init(&s->cert->custext);
|
2016-11-25 16:28:02 +00:00
|
|
|
}
|
2017-11-21 17:18:43 +00:00
|
|
|
if (!custom_ext_add(s, context, pkt, x, chainidx, max_version)) {
|
|
|
|
/* SSLfatal() already called */
|
|
|
|
return 0;
|
2016-11-25 16:28:02 +00:00
|
|
|
}
|
|
|
|
|
2016-12-07 17:04:46 +00:00
|
|
|
for (i = 0, thisexd = ext_defs; i < OSSL_NELEM(ext_defs); i++, thisexd++) {
|
2017-05-09 12:44:25 +00:00
|
|
|
EXT_RETURN (*construct)(SSL *s, WPACKET *pkt, unsigned int context,
|
2017-11-21 17:18:43 +00:00
|
|
|
X509 *x, size_t chainidx);
|
2017-05-09 12:44:25 +00:00
|
|
|
EXT_RETURN ret;
|
2016-11-24 18:25:10 +00:00
|
|
|
|
2016-11-24 18:02:12 +00:00
|
|
|
/* Skip if not relevant for our context */
|
2017-04-05 10:59:23 +00:00
|
|
|
if (!should_add_extension(s, thisexd->context, context, max_version))
|
2016-11-24 18:02:12 +00:00
|
|
|
continue;
|
|
|
|
|
2016-12-07 17:04:46 +00:00
|
|
|
construct = s->server ? thisexd->construct_stoc
|
|
|
|
: thisexd->construct_ctos;
|
2016-11-24 18:02:12 +00:00
|
|
|
|
2017-04-05 10:59:23 +00:00
|
|
|
if (construct == NULL)
|
2016-11-24 18:02:12 +00:00
|
|
|
continue;
|
|
|
|
|
2017-11-21 17:18:43 +00:00
|
|
|
ret = construct(s, pkt, context, x, chainidx);
|
|
|
|
if (ret == EXT_RETURN_FAIL) {
|
|
|
|
/* SSLfatal() already called */
|
|
|
|
return 0;
|
|
|
|
}
|
2017-05-09 12:44:25 +00:00
|
|
|
if (ret == EXT_RETURN_SENT
|
|
|
|
&& (context & (SSL_EXT_CLIENT_HELLO
|
|
|
|
| SSL_EXT_TLS1_3_CERTIFICATE_REQUEST
|
|
|
|
| SSL_EXT_TLS1_3_NEW_SESSION_TICKET)) != 0)
|
|
|
|
s->ext.extflags[i] |= SSL_EXT_FLAG_SENT;
|
2016-11-24 18:02:12 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!WPACKET_close(pkt)) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_CONSTRUCT_EXTENSIONS,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
|
|
|
return 0;
|
2016-11-24 18:02:12 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
2016-11-25 23:19:56 +00:00
|
|
|
|
2016-11-28 09:31:59 +00:00
|
|
|
/*
|
|
|
|
* Built in extension finalisation and initialisation functions. All initialise
|
|
|
|
* or finalise the associated extension type for the given |context|. For
|
|
|
|
* finalisers |sent| is set to 1 if we saw the extension during parsing, and 0
|
2017-11-23 13:11:42 +00:00
|
|
|
* otherwise. These functions return 1 on success or 0 on failure.
|
2016-11-28 09:31:59 +00:00
|
|
|
*/
|
|
|
|
|
2017-11-21 17:18:43 +00:00
|
|
|
static int final_renegotiate(SSL *s, unsigned int context, int sent)
|
2016-11-25 23:19:56 +00:00
|
|
|
{
|
2016-11-28 16:15:51 +00:00
|
|
|
if (!s->server) {
|
|
|
|
/*
|
|
|
|
* Check if we can connect to a server that doesn't support safe
|
|
|
|
* renegotiation
|
|
|
|
*/
|
|
|
|
if (!(s->options & SSL_OP_LEGACY_SERVER_CONNECT)
|
|
|
|
&& !(s->options & SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION)
|
|
|
|
&& !sent) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, SSL_F_FINAL_RENEGOTIATE,
|
|
|
|
SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED);
|
2016-11-28 16:15:51 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-11-25 23:19:56 +00:00
|
|
|
return 1;
|
2016-11-28 16:15:51 +00:00
|
|
|
}
|
2016-11-25 23:19:56 +00:00
|
|
|
|
|
|
|
/* Need RI if renegotiating */
|
|
|
|
if (s->renegotiate
|
|
|
|
&& !(s->options & SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION)
|
|
|
|
&& !sent) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, SSL_F_FINAL_RENEGOTIATE,
|
|
|
|
SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED);
|
2016-11-25 23:19:56 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-11-28 16:15:51 +00:00
|
|
|
|
2016-11-25 23:19:56 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2016-12-07 17:04:46 +00:00
|
|
|
static int init_server_name(SSL *s, unsigned int context)
|
2016-11-25 23:19:56 +00:00
|
|
|
{
|
|
|
|
if (s->server)
|
|
|
|
s->servername_done = 0;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2017-11-21 17:18:43 +00:00
|
|
|
static int final_server_name(SSL *s, unsigned int context, int sent)
|
2016-11-25 23:19:56 +00:00
|
|
|
{
|
2017-10-18 13:05:57 +00:00
|
|
|
int ret = SSL_TLSEXT_ERR_NOACK, discard;
|
2016-11-25 23:19:56 +00:00
|
|
|
int altmp = SSL_AD_UNRECOGNIZED_NAME;
|
Session resume broken switching contexts
When an SSL's context is swtiched from a ticket-enabled context to
a ticket-disabled context in the servername callback, no session-id
is generated, so the session can't be resumed.
If a servername callback changes the SSL_OP_NO_TICKET option, check
to see if it's changed to disable, and whether a session ticket is
expected (i.e. the client indicated ticket support and the SSL had
tickets enabled at the time), and whether we already have a previous
session (i.e. s->hit is set).
In this case, clear the ticket-expected flag, remove any ticket data
and generate a session-id in the session.
If the SSL hit (resumed) and switched to a ticket-disabled context,
assume that the resumption was via session-id, and don't bother to
update the session.
Before this fix, the updated unit-tests in 06-sni-ticket.conf would
fail test #4 (server1 = SNI, server2 = no SNI).
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/1529)
2016-09-01 12:40:54 +00:00
|
|
|
int was_ticket = (SSL_get_options(s) & SSL_OP_NO_TICKET) == 0;
|
2016-11-25 23:19:56 +00:00
|
|
|
|
2018-02-12 16:24:59 +00:00
|
|
|
if (!ossl_assert(s->ctx != NULL) || !ossl_assert(s->session_ctx != NULL)) {
|
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_FINAL_SERVER_NAME,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (s->ctx->ext.servername_cb != NULL)
|
2016-12-08 19:18:40 +00:00
|
|
|
ret = s->ctx->ext.servername_cb(s, &altmp,
|
|
|
|
s->ctx->ext.servername_arg);
|
2018-02-12 16:24:59 +00:00
|
|
|
else if (s->session_ctx->ext.servername_cb != NULL)
|
2017-01-31 20:32:50 +00:00
|
|
|
ret = s->session_ctx->ext.servername_cb(s, &altmp,
|
|
|
|
s->session_ctx->ext.servername_arg);
|
2016-11-25 23:19:56 +00:00
|
|
|
|
2017-10-10 08:50:56 +00:00
|
|
|
if (!sent) {
|
|
|
|
OPENSSL_free(s->session->ext.hostname);
|
|
|
|
s->session->ext.hostname = NULL;
|
|
|
|
}
|
|
|
|
|
2017-10-18 13:05:57 +00:00
|
|
|
/*
|
|
|
|
* If we switched contexts (whether here or in the client_hello callback),
|
|
|
|
* move the sess_accept increment from the session_ctx to the new
|
|
|
|
* context, to avoid the confusing situation of having sess_accept_good
|
|
|
|
* exceed sess_accept (zero) for the new context.
|
|
|
|
*/
|
|
|
|
if (SSL_IS_FIRST_HANDSHAKE(s) && s->ctx != s->session_ctx) {
|
|
|
|
CRYPTO_atomic_add(&s->ctx->stats.sess_accept, 1, &discard,
|
|
|
|
s->ctx->lock);
|
|
|
|
CRYPTO_atomic_add(&s->session_ctx->stats.sess_accept, -1, &discard,
|
|
|
|
s->session_ctx->lock);
|
|
|
|
}
|
|
|
|
|
Session resume broken switching contexts
When an SSL's context is swtiched from a ticket-enabled context to
a ticket-disabled context in the servername callback, no session-id
is generated, so the session can't be resumed.
If a servername callback changes the SSL_OP_NO_TICKET option, check
to see if it's changed to disable, and whether a session ticket is
expected (i.e. the client indicated ticket support and the SSL had
tickets enabled at the time), and whether we already have a previous
session (i.e. s->hit is set).
In this case, clear the ticket-expected flag, remove any ticket data
and generate a session-id in the session.
If the SSL hit (resumed) and switched to a ticket-disabled context,
assume that the resumption was via session-id, and don't bother to
update the session.
Before this fix, the updated unit-tests in 06-sni-ticket.conf would
fail test #4 (server1 = SNI, server2 = no SNI).
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/1529)
2016-09-01 12:40:54 +00:00
|
|
|
/*
|
|
|
|
* If we're expecting to send a ticket, and tickets were previously enabled,
|
|
|
|
* and now tickets are disabled, then turn off expected ticket.
|
|
|
|
* Also, if this is not a resumption, create a new session ID
|
|
|
|
*/
|
|
|
|
if (ret == SSL_TLSEXT_ERR_OK && s->ext.ticket_expected
|
|
|
|
&& was_ticket && (SSL_get_options(s) & SSL_OP_NO_TICKET) != 0) {
|
|
|
|
s->ext.ticket_expected = 0;
|
|
|
|
if (!s->hit) {
|
|
|
|
SSL_SESSION* ss = SSL_get_session(s);
|
|
|
|
|
|
|
|
if (ss != NULL) {
|
|
|
|
OPENSSL_free(ss->ext.tick);
|
|
|
|
ss->ext.tick = NULL;
|
|
|
|
ss->ext.ticklen = 0;
|
|
|
|
ss->ext.tick_lifetime_hint = 0;
|
|
|
|
ss->ext.tick_age_add = 0;
|
|
|
|
ss->ext.tick_identity = 0;
|
|
|
|
if (!ssl_generate_session_id(s, ss)) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_FINAL_SERVER_NAME,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
|
|
|
return 0;
|
Session resume broken switching contexts
When an SSL's context is swtiched from a ticket-enabled context to
a ticket-disabled context in the servername callback, no session-id
is generated, so the session can't be resumed.
If a servername callback changes the SSL_OP_NO_TICKET option, check
to see if it's changed to disable, and whether a session ticket is
expected (i.e. the client indicated ticket support and the SSL had
tickets enabled at the time), and whether we already have a previous
session (i.e. s->hit is set).
In this case, clear the ticket-expected flag, remove any ticket data
and generate a session-id in the session.
If the SSL hit (resumed) and switched to a ticket-disabled context,
assume that the resumption was via session-id, and don't bother to
update the session.
Before this fix, the updated unit-tests in 06-sni-ticket.conf would
fail test #4 (server1 = SNI, server2 = no SNI).
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/1529)
2016-09-01 12:40:54 +00:00
|
|
|
}
|
|
|
|
} else {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_FINAL_SERVER_NAME,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
|
|
|
return 0;
|
Session resume broken switching contexts
When an SSL's context is swtiched from a ticket-enabled context to
a ticket-disabled context in the servername callback, no session-id
is generated, so the session can't be resumed.
If a servername callback changes the SSL_OP_NO_TICKET option, check
to see if it's changed to disable, and whether a session ticket is
expected (i.e. the client indicated ticket support and the SSL had
tickets enabled at the time), and whether we already have a previous
session (i.e. s->hit is set).
In this case, clear the ticket-expected flag, remove any ticket data
and generate a session-id in the session.
If the SSL hit (resumed) and switched to a ticket-disabled context,
assume that the resumption was via session-id, and don't bother to
update the session.
Before this fix, the updated unit-tests in 06-sni-ticket.conf would
fail test #4 (server1 = SNI, server2 = no SNI).
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/1529)
2016-09-01 12:40:54 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-11-25 23:19:56 +00:00
|
|
|
switch (ret) {
|
|
|
|
case SSL_TLSEXT_ERR_ALERT_FATAL:
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, altmp, SSL_F_FINAL_SERVER_NAME, SSL_R_CALLBACK_FAILED);
|
2016-11-25 23:19:56 +00:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
case SSL_TLSEXT_ERR_ALERT_WARNING:
|
2017-11-21 17:18:43 +00:00
|
|
|
ssl3_send_alert(s, SSL3_AL_WARNING, altmp);
|
2016-11-25 23:19:56 +00:00
|
|
|
return 1;
|
|
|
|
|
|
|
|
case SSL_TLSEXT_ERR_NOACK:
|
|
|
|
s->servername_done = 0;
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
default:
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-11-28 16:15:51 +00:00
|
|
|
#ifndef OPENSSL_NO_EC
|
2017-11-21 17:18:43 +00:00
|
|
|
static int final_ec_pt_formats(SSL *s, unsigned int context, int sent)
|
2016-11-28 16:15:51 +00:00
|
|
|
{
|
|
|
|
unsigned long alg_k, alg_a;
|
|
|
|
|
|
|
|
if (s->server)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
alg_k = s->s3->tmp.new_cipher->algorithm_mkey;
|
|
|
|
alg_a = s->s3->tmp.new_cipher->algorithm_auth;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If we are client and using an elliptic curve cryptography cipher
|
|
|
|
* suite, then if server returns an EC point formats lists extension it
|
|
|
|
* must contain uncompressed.
|
|
|
|
*/
|
2016-12-08 19:18:40 +00:00
|
|
|
if (s->ext.ecpointformats != NULL
|
|
|
|
&& s->ext.ecpointformats_len > 0
|
|
|
|
&& s->session->ext.ecpointformats != NULL
|
|
|
|
&& s->session->ext.ecpointformats_len > 0
|
2016-12-07 17:04:46 +00:00
|
|
|
&& ((alg_k & SSL_kECDHE) || (alg_a & SSL_aECDSA))) {
|
2016-11-28 16:15:51 +00:00
|
|
|
/* we are using an ECC cipher */
|
|
|
|
size_t i;
|
2016-12-08 19:18:40 +00:00
|
|
|
unsigned char *list = s->session->ext.ecpointformats;
|
2016-12-07 17:04:46 +00:00
|
|
|
|
2016-12-08 19:18:40 +00:00
|
|
|
for (i = 0; i < s->session->ext.ecpointformats_len; i++) {
|
2016-12-07 17:04:46 +00:00
|
|
|
if (*list++ == TLSEXT_ECPOINTFORMAT_uncompressed)
|
2016-11-28 16:15:51 +00:00
|
|
|
break;
|
|
|
|
}
|
2016-12-08 19:18:40 +00:00
|
|
|
if (i == s->session->ext.ecpointformats_len) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_F_FINAL_EC_PT_FORMATS,
|
|
|
|
SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST);
|
2016-11-28 16:15:51 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2016-12-07 17:04:46 +00:00
|
|
|
static int init_session_ticket(SSL *s, unsigned int context)
|
2016-11-28 16:15:51 +00:00
|
|
|
{
|
|
|
|
if (!s->server)
|
2016-12-08 19:18:40 +00:00
|
|
|
s->ext.ticket_expected = 0;
|
2016-11-28 16:15:51 +00:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2017-01-04 08:16:07 +00:00
|
|
|
#ifndef OPENSSL_NO_OCSP
|
2016-12-07 17:04:46 +00:00
|
|
|
static int init_status_request(SSL *s, unsigned int context)
|
2016-11-25 23:19:56 +00:00
|
|
|
{
|
2016-12-02 14:46:54 +00:00
|
|
|
if (s->server) {
|
2016-12-08 19:18:40 +00:00
|
|
|
s->ext.status_type = TLSEXT_STATUSTYPE_nothing;
|
2016-12-02 14:46:54 +00:00
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* Ensure we get sensible values passed to tlsext_status_cb in the event
|
|
|
|
* that we don't receive a status message
|
|
|
|
*/
|
2016-12-11 20:01:28 +00:00
|
|
|
OPENSSL_free(s->ext.ocsp.resp);
|
|
|
|
s->ext.ocsp.resp = NULL;
|
|
|
|
s->ext.ocsp.resp_len = 0;
|
2016-12-02 14:46:54 +00:00
|
|
|
}
|
2016-11-28 16:15:51 +00:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
2017-01-04 08:16:07 +00:00
|
|
|
#endif
|
2016-11-28 16:15:51 +00:00
|
|
|
|
2016-11-25 23:19:56 +00:00
|
|
|
#ifndef OPENSSL_NO_NEXTPROTONEG
|
2016-12-07 17:04:46 +00:00
|
|
|
static int init_npn(SSL *s, unsigned int context)
|
2016-11-25 23:19:56 +00:00
|
|
|
{
|
2016-12-08 19:18:40 +00:00
|
|
|
s->s3->npn_seen = 0;
|
2016-11-25 23:19:56 +00:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2016-12-07 17:04:46 +00:00
|
|
|
static int init_alpn(SSL *s, unsigned int context)
|
2016-11-25 23:19:56 +00:00
|
|
|
{
|
2016-11-28 16:15:51 +00:00
|
|
|
OPENSSL_free(s->s3->alpn_selected);
|
|
|
|
s->s3->alpn_selected = NULL;
|
2017-03-15 00:17:15 +00:00
|
|
|
s->s3->alpn_selected_len = 0;
|
2016-11-25 23:19:56 +00:00
|
|
|
if (s->server) {
|
|
|
|
OPENSSL_free(s->s3->alpn_proposed);
|
|
|
|
s->s3->alpn_proposed = NULL;
|
|
|
|
s->s3->alpn_proposed_len = 0;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2017-11-21 17:18:43 +00:00
|
|
|
static int final_alpn(SSL *s, unsigned int context, int sent)
|
2017-08-01 14:45:29 +00:00
|
|
|
{
|
2017-08-16 11:50:32 +00:00
|
|
|
if (!s->server && !sent && s->session->ext.alpn_selected != NULL)
|
|
|
|
s->ext.early_data_ok = 0;
|
|
|
|
|
2017-08-01 14:45:29 +00:00
|
|
|
if (!s->server || !SSL_IS_TLS13(s))
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Call alpn_select callback if needed. Has to be done after SNI and
|
|
|
|
* cipher negotiation (HTTP/2 restricts permitted ciphers). In TLSv1.3
|
|
|
|
* we also have to do this before we decide whether to accept early_data.
|
|
|
|
* In TLSv1.3 we've already negotiated our cipher so we do this call now.
|
|
|
|
* For < TLSv1.3 we defer it until after cipher negotiation.
|
2017-12-15 07:01:20 +00:00
|
|
|
*
|
2017-11-21 17:18:43 +00:00
|
|
|
* On failure SSLfatal() already called.
|
2017-08-01 14:45:29 +00:00
|
|
|
*/
|
2017-11-21 17:18:43 +00:00
|
|
|
return tls_handle_alpn(s);
|
2017-08-01 14:45:29 +00:00
|
|
|
}
|
|
|
|
|
2016-12-07 17:04:46 +00:00
|
|
|
static int init_sig_algs(SSL *s, unsigned int context)
|
2016-11-25 23:19:56 +00:00
|
|
|
{
|
|
|
|
/* Clear any signature algorithms extension received */
|
|
|
|
OPENSSL_free(s->s3->tmp.peer_sigalgs);
|
|
|
|
s->s3->tmp.peer_sigalgs = NULL;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
Add support for the TLS 1.3 signature_algorithms_cert extension
The new extension is like signature_algorithms, but only for the
signature *on* the certificate we will present to the peer (the
old signature_algorithms extension is still used for signatures that
we *generate*, i.e., those over TLS data structures).
We do not need to generate this extension, since we are the same
implementation as our X.509 stack and can handle the same types
of signatures, but we need to be prepared to receive it, and use the received
information when selecting what certificate to present.
There is a lot of interplay between signature_algorithms_cert and
signature_algorithms, since both affect what certificate we can
use, and thus the resulting signature algorithm used for TLS messages.
So, apply signature_algorithms_cert (if present) as a filter on what
certificates we can consider when choosing a certificate+sigalg
pair.
As part of this addition, we also remove the fallback code that let
keys of type EVP_PKEY_RSA be used to generate RSA-PSS signatures -- the
new rsa_pss_pss_* and rsa_pss_rsae_* signature schemes have pulled
the key type into what is covered by the signature algorithm, so
we should not apply this sort of compatibility workaround.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5068)
2018-01-11 17:47:12 +00:00
|
|
|
static int init_sig_algs_cert(SSL *s, unsigned int context)
|
|
|
|
{
|
|
|
|
/* Clear any signature algorithms extension received */
|
|
|
|
OPENSSL_free(s->s3->tmp.peer_cert_sigalgs);
|
|
|
|
s->s3->tmp.peer_cert_sigalgs = NULL;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2016-11-25 23:19:56 +00:00
|
|
|
#ifndef OPENSSL_NO_SRP
|
2016-12-07 17:04:46 +00:00
|
|
|
static int init_srp(SSL *s, unsigned int context)
|
2016-11-25 23:19:56 +00:00
|
|
|
{
|
|
|
|
OPENSSL_free(s->srp_ctx.login);
|
|
|
|
s->srp_ctx.login = NULL;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2016-12-07 17:04:46 +00:00
|
|
|
static int init_etm(SSL *s, unsigned int context)
|
2016-11-25 23:19:56 +00:00
|
|
|
{
|
2017-02-03 14:06:20 +00:00
|
|
|
s->ext.use_etm = 0;
|
2016-11-28 16:15:51 +00:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2016-12-07 17:04:46 +00:00
|
|
|
static int init_ems(SSL *s, unsigned int context)
|
2016-11-28 16:15:51 +00:00
|
|
|
{
|
|
|
|
if (!s->server)
|
|
|
|
s->s3->flags &= ~TLS1_FLAGS_RECEIVED_EXTMS;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2017-11-21 17:18:43 +00:00
|
|
|
static int final_ems(SSL *s, unsigned int context, int sent)
|
2016-11-28 16:15:51 +00:00
|
|
|
{
|
|
|
|
if (!s->server && s->hit) {
|
|
|
|
/*
|
|
|
|
* Check extended master secret extension is consistent with
|
|
|
|
* original session.
|
|
|
|
*/
|
|
|
|
if (!(s->s3->flags & TLS1_FLAGS_RECEIVED_EXTMS) !=
|
|
|
|
!(s->session->flags & SSL_SESS_FLAG_EXTMS)) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, SSL_F_FINAL_EMS,
|
|
|
|
SSL_R_INCONSISTENT_EXTMS);
|
2016-11-28 16:15:51 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
2016-11-25 23:19:56 +00:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2017-03-10 16:31:20 +00:00
|
|
|
static int init_certificate_authorities(SSL *s, unsigned int context)
|
|
|
|
{
|
2017-03-13 15:00:36 +00:00
|
|
|
sk_X509_NAME_pop_free(s->s3->tmp.peer_ca_names, X509_NAME_free);
|
|
|
|
s->s3->tmp.peer_ca_names = NULL;
|
2017-03-10 16:31:20 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2017-05-09 12:44:25 +00:00
|
|
|
static EXT_RETURN tls_construct_certificate_authorities(SSL *s, WPACKET *pkt,
|
|
|
|
unsigned int context,
|
|
|
|
X509 *x,
|
2017-11-21 17:18:43 +00:00
|
|
|
size_t chainidx)
|
2017-03-10 16:31:20 +00:00
|
|
|
{
|
2017-03-20 18:33:54 +00:00
|
|
|
const STACK_OF(X509_NAME) *ca_sk = SSL_get0_CA_list(s);
|
2017-03-10 16:31:20 +00:00
|
|
|
|
|
|
|
if (ca_sk == NULL || sk_X509_NAME_num(ca_sk) == 0)
|
2017-05-09 12:44:25 +00:00
|
|
|
return EXT_RETURN_NOT_SENT;
|
2017-03-10 16:31:20 +00:00
|
|
|
|
|
|
|
if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_certificate_authorities)
|
2017-11-21 17:18:43 +00:00
|
|
|
|| !WPACKET_start_sub_packet_u16(pkt)) {
|
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR,
|
|
|
|
SSL_F_TLS_CONSTRUCT_CERTIFICATE_AUTHORITIES,
|
2017-03-10 16:31:20 +00:00
|
|
|
ERR_R_INTERNAL_ERROR);
|
2017-05-09 12:44:25 +00:00
|
|
|
return EXT_RETURN_FAIL;
|
2017-03-10 16:31:20 +00:00
|
|
|
}
|
|
|
|
|
2017-11-21 17:18:43 +00:00
|
|
|
if (!construct_ca_names(s, pkt)) {
|
|
|
|
/* SSLfatal() already called */
|
|
|
|
return EXT_RETURN_FAIL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!WPACKET_close(pkt)) {
|
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR,
|
|
|
|
SSL_F_TLS_CONSTRUCT_CERTIFICATE_AUTHORITIES,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
|
|
|
return EXT_RETURN_FAIL;
|
|
|
|
}
|
|
|
|
|
2017-05-09 12:44:25 +00:00
|
|
|
return EXT_RETURN_SENT;
|
2017-03-10 16:31:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int tls_parse_certificate_authorities(SSL *s, PACKET *pkt,
|
|
|
|
unsigned int context, X509 *x,
|
2017-11-21 17:18:43 +00:00
|
|
|
size_t chainidx)
|
2017-03-10 16:31:20 +00:00
|
|
|
{
|
2017-11-21 17:18:43 +00:00
|
|
|
if (!parse_ca_names(s, pkt))
|
2017-03-10 16:31:20 +00:00
|
|
|
return 0;
|
|
|
|
if (PACKET_remaining(pkt) != 0) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_DECODE_ERROR,
|
|
|
|
SSL_F_TLS_PARSE_CERTIFICATE_AUTHORITIES, SSL_R_BAD_EXTENSION);
|
2017-03-10 16:31:20 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2016-11-25 23:19:56 +00:00
|
|
|
#ifndef OPENSSL_NO_SRTP
|
2016-12-07 17:04:46 +00:00
|
|
|
static int init_srtp(SSL *s, unsigned int context)
|
2016-11-25 23:19:56 +00:00
|
|
|
{
|
|
|
|
if (s->server)
|
|
|
|
s->srtp_profile = NULL;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
#endif
|
2016-12-30 11:26:39 +00:00
|
|
|
|
2017-11-21 17:18:43 +00:00
|
|
|
static int final_sig_algs(SSL *s, unsigned int context, int sent)
|
2016-12-30 11:26:39 +00:00
|
|
|
{
|
2017-05-16 11:04:00 +00:00
|
|
|
if (!sent && SSL_IS_TLS13(s) && !s->hit) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, TLS13_AD_MISSING_EXTENSION, SSL_F_FINAL_SIG_ALGS,
|
|
|
|
SSL_R_MISSING_SIGALGS_EXTENSION);
|
2016-12-30 11:26:39 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
2017-01-12 15:28:48 +00:00
|
|
|
|
2017-02-14 15:57:50 +00:00
|
|
|
#ifndef OPENSSL_NO_EC
|
2017-11-21 17:18:43 +00:00
|
|
|
static int final_key_share(SSL *s, unsigned int context, int sent)
|
2017-01-18 11:31:37 +00:00
|
|
|
{
|
|
|
|
if (!SSL_IS_TLS13(s))
|
|
|
|
return 1;
|
|
|
|
|
2017-05-08 15:51:47 +00:00
|
|
|
/* Nothing to do for key_share in an HRR */
|
|
|
|
if ((context & SSL_EXT_TLS1_3_HELLO_RETRY_REQUEST) != 0)
|
|
|
|
return 1;
|
|
|
|
|
2017-01-18 11:31:37 +00:00
|
|
|
/*
|
|
|
|
* If
|
2017-02-01 17:10:45 +00:00
|
|
|
* we are a client
|
|
|
|
* AND
|
2017-01-18 11:31:37 +00:00
|
|
|
* we have no key_share
|
|
|
|
* AND
|
|
|
|
* (we are not resuming
|
|
|
|
* OR the kex_mode doesn't allow non key_share resumes)
|
|
|
|
* THEN
|
2017-02-01 17:10:45 +00:00
|
|
|
* fail;
|
2017-01-18 11:31:37 +00:00
|
|
|
*/
|
2017-02-01 17:10:45 +00:00
|
|
|
if (!s->server
|
|
|
|
&& !sent
|
2017-01-18 11:31:37 +00:00
|
|
|
&& (!s->hit
|
|
|
|
|| (s->ext.psk_kex_mode & TLSEXT_KEX_MODE_FLAG_KE) == 0)) {
|
2017-01-30 16:16:28 +00:00
|
|
|
/* Nothing left we can do - just fail */
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_MISSING_EXTENSION, SSL_F_FINAL_KEY_SHARE,
|
|
|
|
SSL_R_NO_SUITABLE_KEY_SHARE);
|
2017-01-18 11:31:37 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2017-02-01 17:10:45 +00:00
|
|
|
/*
|
2017-09-13 13:50:49 +00:00
|
|
|
* IF
|
2017-02-01 17:10:45 +00:00
|
|
|
* we are a server
|
|
|
|
* THEN
|
2017-09-13 13:50:49 +00:00
|
|
|
* IF
|
|
|
|
* we have a suitable key_share
|
2017-02-01 17:10:45 +00:00
|
|
|
* THEN
|
2017-09-13 13:50:49 +00:00
|
|
|
* IF
|
|
|
|
* we are stateless AND we have no cookie
|
|
|
|
* THEN
|
|
|
|
* send a HelloRetryRequest
|
|
|
|
* ELSE
|
|
|
|
* IF
|
|
|
|
* we didn't already send a HelloRetryRequest
|
|
|
|
* AND
|
|
|
|
* the client sent a key_share extension
|
|
|
|
* AND
|
|
|
|
* (we are not resuming
|
|
|
|
* OR the kex_mode allows key_share resumes)
|
|
|
|
* AND
|
|
|
|
* a shared group exists
|
|
|
|
* THEN
|
|
|
|
* send a HelloRetryRequest
|
|
|
|
* ELSE IF
|
|
|
|
* we are not resuming
|
|
|
|
* OR
|
|
|
|
* the kex_mode doesn't allow non key_share resumes
|
|
|
|
* THEN
|
|
|
|
* fail
|
|
|
|
* ELSE IF
|
|
|
|
* we are stateless AND we have no cookie
|
|
|
|
* THEN
|
|
|
|
* send a HelloRetryRequest
|
2017-02-01 17:10:45 +00:00
|
|
|
*/
|
2017-09-13 13:50:49 +00:00
|
|
|
if (s->server) {
|
|
|
|
if (s->s3->peer_tmp != NULL) {
|
|
|
|
/* We have a suitable key_share */
|
|
|
|
if ((s->s3->flags & TLS1_FLAGS_STATELESS) != 0
|
|
|
|
&& !s->ext.cookieok) {
|
|
|
|
if (!ossl_assert(s->hello_retry_request == SSL_HRR_NONE)) {
|
|
|
|
/*
|
|
|
|
* If we are stateless then we wouldn't know about any
|
|
|
|
* previously sent HRR - so how can this be anything other
|
|
|
|
* than 0?
|
|
|
|
*/
|
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_FINAL_KEY_SHARE,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
s->hello_retry_request = SSL_HRR_PENDING;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* No suitable key_share */
|
|
|
|
if (s->hello_retry_request == SSL_HRR_NONE && sent
|
|
|
|
&& (!s->hit
|
|
|
|
|| (s->ext.psk_kex_mode & TLSEXT_KEX_MODE_FLAG_KE_DHE)
|
|
|
|
!= 0)) {
|
|
|
|
const uint16_t *pgroups, *clntgroups;
|
|
|
|
size_t num_groups, clnt_num_groups, i;
|
|
|
|
unsigned int group_id = 0;
|
|
|
|
|
|
|
|
/* Check if a shared group exists */
|
|
|
|
|
|
|
|
/* Get the clients list of supported groups. */
|
|
|
|
tls1_get_peer_groups(s, &clntgroups, &clnt_num_groups);
|
|
|
|
tls1_get_supported_groups(s, &pgroups, &num_groups);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Find the first group we allow that is also in client's list
|
|
|
|
*/
|
|
|
|
for (i = 0; i < num_groups; i++) {
|
|
|
|
group_id = pgroups[i];
|
|
|
|
|
|
|
|
if (check_in_list(s, group_id, clntgroups, clnt_num_groups,
|
|
|
|
1))
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (i < num_groups) {
|
|
|
|
/* A shared group exists so send a HelloRetryRequest */
|
|
|
|
s->s3->group_id = group_id;
|
|
|
|
s->hello_retry_request = SSL_HRR_PENDING;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!s->hit
|
|
|
|
|| (s->ext.psk_kex_mode & TLSEXT_KEX_MODE_FLAG_KE) == 0) {
|
|
|
|
/* Nothing left we can do - just fail */
|
|
|
|
SSLfatal(s, sent ? SSL_AD_HANDSHAKE_FAILURE
|
|
|
|
: SSL_AD_MISSING_EXTENSION,
|
|
|
|
SSL_F_FINAL_KEY_SHARE, SSL_R_NO_SUITABLE_KEY_SHARE);
|
|
|
|
return 0;
|
2017-02-01 17:10:45 +00:00
|
|
|
}
|
|
|
|
|
2017-09-13 13:50:49 +00:00
|
|
|
if ((s->s3->flags & TLS1_FLAGS_STATELESS) != 0
|
|
|
|
&& !s->ext.cookieok) {
|
|
|
|
if (!ossl_assert(s->hello_retry_request == SSL_HRR_NONE)) {
|
|
|
|
/*
|
|
|
|
* If we are stateless then we wouldn't know about any
|
|
|
|
* previously sent HRR - so how can this be anything other
|
|
|
|
* than 0?
|
|
|
|
*/
|
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_FINAL_KEY_SHARE,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
|
|
|
return 0;
|
|
|
|
}
|
2017-11-13 11:24:51 +00:00
|
|
|
s->hello_retry_request = SSL_HRR_PENDING;
|
2017-02-01 17:10:45 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
2017-09-13 13:50:49 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* We have a key_share so don't send any more HelloRetryRequest
|
|
|
|
* messages
|
|
|
|
*/
|
|
|
|
if (s->hello_retry_request == SSL_HRR_PENDING)
|
|
|
|
s->hello_retry_request = SSL_HRR_COMPLETE;
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* For a client side resumption with no key_share we need to generate
|
|
|
|
* the handshake secret (otherwise this is done during key_share
|
|
|
|
* processing).
|
|
|
|
*/
|
|
|
|
if (!sent && !tls13_generate_handshake_secret(s, NULL, 0)) {
|
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_FINAL_KEY_SHARE,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
2017-02-01 17:10:45 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-01-18 11:31:37 +00:00
|
|
|
return 1;
|
|
|
|
}
|
2017-02-14 15:57:50 +00:00
|
|
|
#endif
|
2017-01-18 11:31:37 +00:00
|
|
|
|
2017-01-12 15:28:48 +00:00
|
|
|
static int init_psk_kex_modes(SSL *s, unsigned int context)
|
|
|
|
{
|
|
|
|
s->ext.psk_kex_mode = TLSEXT_KEX_MODE_FLAG_NONE;
|
|
|
|
return 1;
|
|
|
|
}
|
2017-01-18 16:28:23 +00:00
|
|
|
|
|
|
|
int tls_psk_do_binder(SSL *s, const EVP_MD *md, const unsigned char *msgstart,
|
|
|
|
size_t binderoffset, const unsigned char *binderin,
|
2017-06-12 08:18:24 +00:00
|
|
|
unsigned char *binderout, SSL_SESSION *sess, int sign,
|
|
|
|
int external)
|
2017-01-18 16:28:23 +00:00
|
|
|
{
|
|
|
|
EVP_PKEY *mackey = NULL;
|
|
|
|
EVP_MD_CTX *mctx = NULL;
|
|
|
|
unsigned char hash[EVP_MAX_MD_SIZE], binderkey[EVP_MAX_MD_SIZE];
|
|
|
|
unsigned char finishedkey[EVP_MAX_MD_SIZE], tmpbinder[EVP_MAX_MD_SIZE];
|
2017-07-05 10:26:10 +00:00
|
|
|
unsigned char tmppsk[EVP_MAX_MD_SIZE];
|
|
|
|
unsigned char *early_secret, *psk;
|
2017-05-03 11:11:41 +00:00
|
|
|
const char resumption_label[] = "res binder";
|
2017-06-12 08:18:24 +00:00
|
|
|
const char external_label[] = "ext binder";
|
2017-07-05 10:26:10 +00:00
|
|
|
const char nonce_label[] = "resumption";
|
2017-06-12 08:18:24 +00:00
|
|
|
const char *label;
|
2018-03-06 14:12:10 +00:00
|
|
|
size_t bindersize, labelsize, psklen, hashsize = EVP_MD_size(md);
|
2017-01-18 16:28:23 +00:00
|
|
|
int ret = -1;
|
2017-07-05 19:53:03 +00:00
|
|
|
int usepskfored = 0;
|
|
|
|
|
|
|
|
if (external
|
|
|
|
&& s->early_data_state == SSL_EARLY_DATA_CONNECTING
|
|
|
|
&& s->session->ext.max_early_data == 0
|
|
|
|
&& sess->ext.max_early_data > 0)
|
|
|
|
usepskfored = 1;
|
2017-01-18 16:28:23 +00:00
|
|
|
|
2017-06-12 08:18:24 +00:00
|
|
|
if (external) {
|
|
|
|
label = external_label;
|
|
|
|
labelsize = sizeof(external_label) - 1;
|
|
|
|
} else {
|
|
|
|
label = resumption_label;
|
|
|
|
labelsize = sizeof(resumption_label) - 1;
|
|
|
|
}
|
|
|
|
|
2017-07-05 10:26:10 +00:00
|
|
|
if (external) {
|
|
|
|
psk = sess->master_key;
|
2018-03-06 14:12:10 +00:00
|
|
|
psklen = sess->master_key_length;
|
2017-07-05 10:26:10 +00:00
|
|
|
} else {
|
|
|
|
psk = tmppsk;
|
2018-03-06 14:12:10 +00:00
|
|
|
psklen = hashsize;
|
2017-07-05 10:26:10 +00:00
|
|
|
if (!tls13_hkdf_expand(s, md, sess->master_key,
|
|
|
|
(const unsigned char *)nonce_label,
|
|
|
|
sizeof(nonce_label) - 1, sess->ext.tick_nonce,
|
|
|
|
sess->ext.tick_nonce_len, psk, hashsize)) {
|
2017-11-23 11:41:40 +00:00
|
|
|
/* SSLfatal() already called */
|
2017-07-05 10:26:10 +00:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-06-12 12:30:21 +00:00
|
|
|
/*
|
|
|
|
* Generate the early_secret. On the server side we've selected a PSK to
|
|
|
|
* resume with (internal or external) so we always do this. On the client
|
2017-07-05 19:53:03 +00:00
|
|
|
* side we do this for a non-external (i.e. resumption) PSK or external PSK
|
|
|
|
* that will be used for early_data so that it is in place for sending early
|
|
|
|
* data. For client side external PSK not being used for early_data we
|
2017-06-12 12:30:21 +00:00
|
|
|
* generate it but store it away for later use.
|
|
|
|
*/
|
2017-07-05 19:53:03 +00:00
|
|
|
if (s->server || !external || usepskfored)
|
2017-06-12 12:30:21 +00:00
|
|
|
early_secret = (unsigned char *)s->early_secret;
|
|
|
|
else
|
|
|
|
early_secret = (unsigned char *)sess->early_secret;
|
2018-03-06 14:12:10 +00:00
|
|
|
if (!tls13_generate_secret(s, md, NULL, psk, psklen, early_secret)) {
|
2017-11-23 11:41:40 +00:00
|
|
|
/* SSLfatal() already called */
|
2017-01-18 16:28:23 +00:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Create the handshake hash for the binder key...the messages so far are
|
|
|
|
* empty!
|
|
|
|
*/
|
|
|
|
mctx = EVP_MD_CTX_new();
|
|
|
|
if (mctx == NULL
|
|
|
|
|| EVP_DigestInit_ex(mctx, md, NULL) <= 0
|
|
|
|
|| EVP_DigestFinal_ex(mctx, hash, NULL) <= 0) {
|
2017-11-23 11:41:40 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PSK_DO_BINDER,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
2017-01-18 16:28:23 +00:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Generate the binder key */
|
2017-06-12 12:30:21 +00:00
|
|
|
if (!tls13_hkdf_expand(s, md, early_secret, (unsigned char *)label,
|
2017-07-05 10:23:16 +00:00
|
|
|
labelsize, hash, hashsize, binderkey, hashsize)) {
|
2017-11-23 11:41:40 +00:00
|
|
|
/* SSLfatal() already called */
|
2017-01-18 16:28:23 +00:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Generate the finished key */
|
|
|
|
if (!tls13_derive_finishedkey(s, md, binderkey, finishedkey, hashsize)) {
|
2017-11-23 11:41:40 +00:00
|
|
|
/* SSLfatal() already called */
|
2017-01-18 16:28:23 +00:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2017-02-01 17:10:45 +00:00
|
|
|
if (EVP_DigestInit_ex(mctx, md, NULL) <= 0) {
|
2017-11-23 11:41:40 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PSK_DO_BINDER,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
2017-02-01 17:10:45 +00:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2017-01-18 16:28:23 +00:00
|
|
|
/*
|
2017-02-01 17:10:45 +00:00
|
|
|
* Get a hash of the ClientHello up to the start of the binders. If we are
|
|
|
|
* following a HelloRetryRequest then this includes the hash of the first
|
|
|
|
* ClientHello and the HelloRetryRequest itself.
|
2017-01-18 16:28:23 +00:00
|
|
|
*/
|
2017-11-13 11:24:51 +00:00
|
|
|
if (s->hello_retry_request == SSL_HRR_PENDING) {
|
2017-02-01 17:10:45 +00:00
|
|
|
size_t hdatalen;
|
|
|
|
void *hdata;
|
|
|
|
|
|
|
|
hdatalen = BIO_get_mem_data(s->s3->handshake_buffer, &hdata);
|
|
|
|
if (hdatalen <= 0) {
|
2017-11-23 11:41:40 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PSK_DO_BINDER,
|
|
|
|
SSL_R_BAD_HANDSHAKE_LENGTH);
|
2017-02-01 17:10:45 +00:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* For servers the handshake buffer data will include the second
|
|
|
|
* ClientHello - which we don't want - so we need to take that bit off.
|
|
|
|
*/
|
|
|
|
if (s->server) {
|
2017-03-20 18:03:34 +00:00
|
|
|
PACKET hashprefix, msg;
|
|
|
|
|
|
|
|
/* Find how many bytes are left after the first two messages */
|
|
|
|
if (!PACKET_buf_init(&hashprefix, hdata, hdatalen)
|
|
|
|
|| !PACKET_forward(&hashprefix, 1)
|
|
|
|
|| !PACKET_get_length_prefixed_3(&hashprefix, &msg)
|
|
|
|
|| !PACKET_forward(&hashprefix, 1)
|
|
|
|
|| !PACKET_get_length_prefixed_3(&hashprefix, &msg)) {
|
2017-11-23 11:41:40 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PSK_DO_BINDER,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
2017-02-01 17:10:45 +00:00
|
|
|
goto err;
|
|
|
|
}
|
2017-03-20 18:03:34 +00:00
|
|
|
hdatalen -= PACKET_remaining(&hashprefix);
|
2017-02-01 17:10:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (EVP_DigestUpdate(mctx, hdata, hdatalen) <= 0) {
|
2017-11-23 11:41:40 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PSK_DO_BINDER,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
2017-02-01 17:10:45 +00:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (EVP_DigestUpdate(mctx, msgstart, binderoffset) <= 0
|
2017-01-18 16:28:23 +00:00
|
|
|
|| EVP_DigestFinal_ex(mctx, hash, NULL) <= 0) {
|
2017-11-23 11:41:40 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PSK_DO_BINDER,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
2017-01-18 16:28:23 +00:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2018-03-15 12:19:16 +00:00
|
|
|
mackey = EVP_PKEY_new_raw_private_key(EVP_PKEY_HMAC, NULL, finishedkey,
|
|
|
|
hashsize);
|
2017-01-18 16:28:23 +00:00
|
|
|
if (mackey == NULL) {
|
2017-11-23 11:41:40 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PSK_DO_BINDER,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
2017-01-18 16:28:23 +00:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!sign)
|
|
|
|
binderout = tmpbinder;
|
|
|
|
|
|
|
|
bindersize = hashsize;
|
|
|
|
if (EVP_DigestSignInit(mctx, NULL, md, NULL, mackey) <= 0
|
|
|
|
|| EVP_DigestSignUpdate(mctx, hash, hashsize) <= 0
|
|
|
|
|| EVP_DigestSignFinal(mctx, binderout, &bindersize) <= 0
|
|
|
|
|| bindersize != hashsize) {
|
2017-11-23 11:41:40 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PSK_DO_BINDER,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
2017-01-18 16:28:23 +00:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (sign) {
|
|
|
|
ret = 1;
|
|
|
|
} else {
|
|
|
|
/* HMAC keys can't do EVP_DigestVerify* - use CRYPTO_memcmp instead */
|
|
|
|
ret = (CRYPTO_memcmp(binderin, binderout, hashsize) == 0);
|
2017-11-23 11:41:40 +00:00
|
|
|
if (!ret)
|
|
|
|
SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_F_TLS_PSK_DO_BINDER,
|
|
|
|
SSL_R_BINDER_DOES_NOT_VERIFY);
|
2017-01-18 16:28:23 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
err:
|
|
|
|
OPENSSL_cleanse(binderkey, sizeof(binderkey));
|
|
|
|
OPENSSL_cleanse(finishedkey, sizeof(finishedkey));
|
|
|
|
EVP_PKEY_free(mackey);
|
|
|
|
EVP_MD_CTX_free(mctx);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
2017-02-24 11:13:25 +00:00
|
|
|
|
2017-11-21 17:18:43 +00:00
|
|
|
static int final_early_data(SSL *s, unsigned int context, int sent)
|
2017-02-24 11:13:25 +00:00
|
|
|
{
|
2017-08-16 11:50:32 +00:00
|
|
|
if (!sent)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
if (!s->server) {
|
|
|
|
if (context == SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS
|
|
|
|
&& sent
|
|
|
|
&& !s->ext.early_data_ok) {
|
|
|
|
/*
|
|
|
|
* If we get here then the server accepted our early_data but we
|
|
|
|
* later realised that it shouldn't have done (e.g. inconsistent
|
|
|
|
* ALPN)
|
|
|
|
*/
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_F_FINAL_EARLY_DATA,
|
|
|
|
SSL_R_BAD_EARLY_DATA);
|
2017-08-16 11:50:32 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-02-24 11:13:25 +00:00
|
|
|
return 1;
|
2017-08-16 11:50:32 +00:00
|
|
|
}
|
2017-02-24 11:13:25 +00:00
|
|
|
|
|
|
|
if (s->max_early_data == 0
|
|
|
|
|| !s->hit
|
|
|
|
|| s->session->ext.tick_identity != 0
|
|
|
|
|| s->early_data_state != SSL_EARLY_DATA_ACCEPTING
|
|
|
|
|| !s->ext.early_data_ok
|
2017-11-13 11:24:51 +00:00
|
|
|
|| s->hello_retry_request != SSL_HRR_NONE) {
|
2017-02-24 11:13:25 +00:00
|
|
|
s->ext.early_data = SSL_EARLY_DATA_REJECTED;
|
|
|
|
} else {
|
|
|
|
s->ext.early_data = SSL_EARLY_DATA_ACCEPTED;
|
|
|
|
|
|
|
|
if (!tls13_change_cipher_state(s,
|
|
|
|
SSL3_CC_EARLY | SSL3_CHANGE_CIPHER_SERVER_READ)) {
|
2017-11-21 17:18:43 +00:00
|
|
|
/* SSLfatal() already called */
|
2017-02-24 11:13:25 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
2017-11-05 16:46:48 +00:00
|
|
|
|
2017-11-21 17:18:43 +00:00
|
|
|
static int final_maxfragmentlen(SSL *s, unsigned int context, int sent)
|
2017-11-05 16:46:48 +00:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Session resumption on server-side with MFL extension active
|
|
|
|
* BUT MFL extension packet was not resent (i.e. sent == 0)
|
|
|
|
*/
|
2017-11-21 17:18:43 +00:00
|
|
|
if (s->server && s->hit && USE_MAX_FRAGMENT_LENGTH_EXT(s->session)
|
2017-11-05 16:46:48 +00:00
|
|
|
&& !sent ) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_MISSING_EXTENSION, SSL_F_FINAL_MAXFRAGMENTLEN,
|
|
|
|
SSL_R_BAD_EXTENSION);
|
2017-11-05 16:46:48 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Current SSL buffer is lower than requested MFL */
|
2017-11-21 17:18:43 +00:00
|
|
|
if (s->session && USE_MAX_FRAGMENT_LENGTH_EXT(s->session)
|
|
|
|
&& s->max_send_fragment < GET_MAX_FRAGMENT_LENGTH(s->session))
|
2017-11-05 16:46:48 +00:00
|
|
|
/* trigger a larger buffer reallocation */
|
2017-11-21 17:18:43 +00:00
|
|
|
if (!ssl3_setup_buffers(s)) {
|
|
|
|
/* SSLfatal() already called */
|
2017-11-05 16:46:48 +00:00
|
|
|
return 0;
|
2017-11-21 17:18:43 +00:00
|
|
|
}
|
2017-11-05 16:46:48 +00:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
Add TLSv1.3 post-handshake authentication (PHA)
Add SSL_verify_client_post_handshake() for servers to initiate PHA
Add SSL_force_post_handshake_auth() for clients that don't have certificates
initially configured, but use a certificate callback.
Update SSL_CTX_set_verify()/SSL_set_verify() mode:
* Add SSL_VERIFY_POST_HANDSHAKE to postpone client authentication until after
the initial handshake.
* Update SSL_VERIFY_CLIENT_ONCE now only sends out one CertRequest regardless
of when the certificate authentication takes place; either initial handshake,
re-negotiation, or post-handshake authentication.
Add 'RequestPostHandshake' and 'RequirePostHandshake' SSL_CONF options that
add the SSL_VERIFY_POST_HANDSHAKE to the 'Request' and 'Require' options
Add support to s_client:
* Enabled automatically when cert is configured
* Can be forced enabled via -force_pha
Add support to s_server:
* Use 'c' to invoke PHA in s_server
* Remove some dead code
Update documentation
Update unit tests:
* Illegal use of PHA extension
* TLSv1.3 certificate tests
DTLS and TLS behave ever-so-slightly differently. So, when DTLS1.3 is
implemented, it's PHA support state machine may need to be different.
Add a TODO and a #error
Update handshake context to deal with PHA.
The handshake context for TLSv1.3 post-handshake auth is up through the
ClientFinish message, plus the CertificateRequest message. Subsequent
Certificate, CertificateVerify, and Finish messages are based on this
handshake context (not the Certificate message per se, but it's included
after the hash). KeyUpdate, NewSessionTicket, and prior Certificate
Request messages are not included in post-handshake authentication.
After the ClientFinished message is processed, save off the digest state
for future post-handshake authentication. When post-handshake auth occurs,
copy over the saved handshake context into the "main" handshake digest.
This effectively discards the any KeyUpdate or NewSessionTicket messages
and any prior post-handshake authentication.
This, of course, assumes that the ID-22 did not mean to include any
previous post-handshake authentication into the new handshake transcript.
This is implied by section 4.4.1 that lists messages only up to the
first ClientFinished.
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4964)
2017-12-18 21:52:28 +00:00
|
|
|
|
|
|
|
static int init_post_handshake_auth(SSL *s, unsigned int context)
|
|
|
|
{
|
|
|
|
s->post_handshake_auth = SSL_PHA_NONE;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|