2016-05-17 18:18:30 +00:00
|
|
|
/*
|
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
|
|
|
* Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
|
2017-06-15 14:16:46 +00:00
|
|
|
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
|
2000-02-25 14:47:38 +00:00
|
|
|
*
|
2016-05-17 18:18:30 +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
|
2000-02-25 14:47:38 +00:00
|
|
|
*/
|
2016-05-17 18:18:30 +00:00
|
|
|
|
2001-10-15 19:49:25 +00:00
|
|
|
#include <limits.h>
|
2000-01-06 00:24:24 +00:00
|
|
|
#include <string.h>
|
1998-12-21 10:52:47 +00:00
|
|
|
#include <stdio.h>
|
2015-09-11 09:48:59 +00:00
|
|
|
#include "../ssl_locl.h"
|
2015-09-11 10:23:20 +00:00
|
|
|
#include "statem_locl.h"
|
2017-08-02 13:46:31 +00:00
|
|
|
#include "internal/cryptlib.h"
|
1999-04-23 22:13:45 +00:00
|
|
|
#include <openssl/buffer.h>
|
|
|
|
#include <openssl/objects.h>
|
|
|
|
#include <openssl/evp.h>
|
|
|
|
#include <openssl/x509.h>
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2018-03-28 19:34:16 +00:00
|
|
|
/*
|
|
|
|
* Map error codes to TLS/SSL alart types.
|
|
|
|
*/
|
|
|
|
typedef struct x509err2alert_st {
|
|
|
|
int x509err;
|
|
|
|
int alert;
|
|
|
|
} X509ERR2ALERT;
|
|
|
|
|
2017-12-05 10:14:35 +00:00
|
|
|
/* Fixed value used in the ServerHello random field to identify an HRR */
|
|
|
|
const unsigned char hrrrandom[] = {
|
|
|
|
0xcf, 0x21, 0xad, 0x74, 0xe5, 0x9a, 0x61, 0x11, 0xbe, 0x1d, 0x8c, 0x02,
|
|
|
|
0x1e, 0x65, 0xb8, 0x91, 0xc2, 0xa2, 0x11, 0x16, 0x7a, 0xbb, 0x8c, 0x5e,
|
|
|
|
0x07, 0x9e, 0x09, 0xe2, 0xc8, 0xa8, 0x33, 0x9c
|
|
|
|
};
|
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
/*
|
|
|
|
* send s->init_buf in records of type 'type' (SSL3_RT_HANDSHAKE or
|
|
|
|
* SSL3_RT_CHANGE_CIPHER_SPEC)
|
|
|
|
*/
|
2000-02-21 11:14:40 +00:00
|
|
|
int ssl3_do_write(SSL *s, int type)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
int ret;
|
2016-09-07 10:34:39 +00:00
|
|
|
size_t written = 0;
|
2015-01-22 03:40:55 +00:00
|
|
|
|
|
|
|
ret = ssl3_write_bytes(s, type, &s->init_buf->data[s->init_off],
|
2016-09-07 10:34:39 +00:00
|
|
|
s->init_num, &written);
|
2015-01-22 03:40:55 +00:00
|
|
|
if (ret < 0)
|
2017-10-17 14:04:09 +00:00
|
|
|
return -1;
|
2015-01-22 03:40:55 +00:00
|
|
|
if (type == SSL3_RT_HANDSHAKE)
|
|
|
|
/*
|
|
|
|
* should not be done for 'Hello Request's, but in that case we'll
|
|
|
|
* ignore the result anyway
|
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
|
|
|
* TLS1.3 KeyUpdate and NewSessionTicket do not need to be added
|
2015-01-22 03:40:55 +00:00
|
|
|
*/
|
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
|
|
|
if (!SSL_IS_TLS13(s) || (s->statem.hand_state != TLS_ST_SW_SESSION_TICKET
|
|
|
|
&& s->statem.hand_state != TLS_ST_CW_KEY_UPDATE
|
|
|
|
&& s->statem.hand_state != TLS_ST_SW_KEY_UPDATE))
|
|
|
|
if (!ssl3_finish_mac(s,
|
|
|
|
(unsigned char *)&s->init_buf->data[s->init_off],
|
|
|
|
written))
|
|
|
|
return -1;
|
2016-09-07 10:34:39 +00:00
|
|
|
if (written == s->init_num) {
|
2015-01-22 03:40:55 +00:00
|
|
|
if (s->msg_callback)
|
|
|
|
s->msg_callback(1, s->version, type, s->init_buf->data,
|
|
|
|
(size_t)(s->init_off + s->init_num), s,
|
|
|
|
s->msg_callback_arg);
|
2017-10-09 11:05:58 +00:00
|
|
|
return 1;
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
2016-09-07 10:34:39 +00:00
|
|
|
s->init_off += written;
|
|
|
|
s->init_num -= written;
|
2017-10-17 14:04:09 +00:00
|
|
|
return 0;
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
2000-02-21 11:14:40 +00:00
|
|
|
|
2016-09-30 09:38:32 +00:00
|
|
|
int tls_close_construct_packet(SSL *s, WPACKET *pkt, int htype)
|
2016-08-03 19:57:52 +00:00
|
|
|
{
|
|
|
|
size_t msglen;
|
|
|
|
|
2016-09-30 09:38:32 +00:00
|
|
|
if ((htype != SSL3_MT_CHANGE_CIPHER_SPEC && !WPACKET_close(pkt))
|
2016-09-13 10:01:04 +00:00
|
|
|
|| !WPACKET_get_length(pkt, &msglen)
|
2016-09-29 22:28:29 +00:00
|
|
|
|| msglen > INT_MAX)
|
2016-08-03 19:57:52 +00:00
|
|
|
return 0;
|
|
|
|
s->init_num = (int)msglen;
|
|
|
|
s->init_off = 0;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2017-01-20 16:02:07 +00:00
|
|
|
int tls_setup_handshake(SSL *s)
|
|
|
|
{
|
2017-11-21 17:18:43 +00:00
|
|
|
if (!ssl3_init_finished_mac(s)) {
|
|
|
|
/* SSLfatal() already called */
|
2017-01-10 23:02:28 +00:00
|
|
|
return 0;
|
2017-11-21 17:18:43 +00:00
|
|
|
}
|
2017-01-10 23:02:28 +00:00
|
|
|
|
2017-05-09 12:44:25 +00:00
|
|
|
/* Reset any extension flags */
|
|
|
|
memset(s->ext.extflags, 0, sizeof(s->ext.extflags));
|
|
|
|
|
2017-01-10 23:02:28 +00:00
|
|
|
if (s->server) {
|
2017-04-26 10:28:20 +00:00
|
|
|
STACK_OF(SSL_CIPHER) *ciphers = SSL_get_ciphers(s);
|
|
|
|
int i, ver_min, ver_max, ok = 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Sanity check that the maximum version we accept has ciphers
|
|
|
|
* enabled. For clients we do this check during construction of the
|
|
|
|
* ClientHello.
|
|
|
|
*/
|
|
|
|
if (ssl_get_min_max_version(s, &ver_min, &ver_max) != 0) {
|
2017-11-23 16:25:05 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_SETUP_HANDSHAKE,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
2017-04-26 10:28:20 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
for (i = 0; i < sk_SSL_CIPHER_num(ciphers); i++) {
|
|
|
|
const SSL_CIPHER *c = sk_SSL_CIPHER_value(ciphers, i);
|
|
|
|
|
|
|
|
if (SSL_IS_DTLS(s)) {
|
|
|
|
if (DTLS_VERSION_GE(ver_max, c->min_dtls) &&
|
|
|
|
DTLS_VERSION_LE(ver_max, c->max_dtls))
|
|
|
|
ok = 1;
|
|
|
|
} else if (ver_max >= c->min_tls && ver_max <= c->max_tls) {
|
|
|
|
ok = 1;
|
|
|
|
}
|
|
|
|
if (ok)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (!ok) {
|
2017-11-23 16:25:05 +00:00
|
|
|
SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, SSL_F_TLS_SETUP_HANDSHAKE,
|
|
|
|
SSL_R_NO_CIPHERS_AVAILABLE);
|
2017-04-26 10:28:20 +00:00
|
|
|
ERR_add_error_data(1, "No ciphers enabled for max supported "
|
|
|
|
"SSL/TLS version");
|
|
|
|
return 0;
|
|
|
|
}
|
2017-01-10 23:02:28 +00:00
|
|
|
if (SSL_IS_FIRST_HANDSHAKE(s)) {
|
2017-10-17 20:28:42 +00:00
|
|
|
/* N.B. s->session_ctx == s->ctx here */
|
|
|
|
CRYPTO_atomic_add(&s->session_ctx->stats.sess_accept, 1, &i,
|
|
|
|
s->session_ctx->lock);
|
2017-01-10 23:02:28 +00:00
|
|
|
} else {
|
2017-10-17 20:28:42 +00:00
|
|
|
/* N.B. s->ctx may not equal s->session_ctx */
|
2017-10-17 19:46:58 +00:00
|
|
|
CRYPTO_atomic_add(&s->ctx->stats.sess_accept_renegotiate, 1, &i,
|
|
|
|
s->ctx->lock);
|
2017-01-10 23:02:28 +00:00
|
|
|
|
|
|
|
s->s3->tmp.cert_request = 0;
|
|
|
|
}
|
|
|
|
} else {
|
2017-10-17 19:46:58 +00:00
|
|
|
int discard;
|
2017-01-10 23:02:28 +00:00
|
|
|
if (SSL_IS_FIRST_HANDSHAKE(s))
|
2017-10-17 20:28:42 +00:00
|
|
|
CRYPTO_atomic_add(&s->session_ctx->stats.sess_connect, 1, &discard,
|
|
|
|
s->session_ctx->lock);
|
2017-01-10 23:02:28 +00:00
|
|
|
else
|
2017-10-17 20:28:42 +00:00
|
|
|
CRYPTO_atomic_add(&s->session_ctx->stats.sess_connect_renegotiate,
|
|
|
|
1, &discard, s->session_ctx->lock);
|
2017-01-10 23:02:28 +00:00
|
|
|
|
|
|
|
/* mark client_random uninitialized */
|
|
|
|
memset(s->s3->client_random, 0, sizeof(s->s3->client_random));
|
|
|
|
s->hit = 0;
|
|
|
|
|
|
|
|
s->s3->tmp.cert_req = 0;
|
|
|
|
|
2017-01-20 16:02:07 +00:00
|
|
|
if (SSL_IS_DTLS(s))
|
2017-01-10 23:02:28 +00:00
|
|
|
s->statem.use_timer = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2016-12-05 17:04:51 +00:00
|
|
|
/*
|
|
|
|
* Size of the to-be-signed TLS13 data, without the hash size itself:
|
|
|
|
* 64 bytes of value 32, 33 context bytes, 1 byte separator
|
|
|
|
*/
|
|
|
|
#define TLS13_TBS_START_SIZE 64
|
|
|
|
#define TLS13_TBS_PREAMBLE_SIZE (TLS13_TBS_START_SIZE + 33 + 1)
|
|
|
|
|
|
|
|
static int get_cert_verify_tbs_data(SSL *s, unsigned char *tls13tbs,
|
|
|
|
void **hdata, size_t *hdatalen)
|
|
|
|
{
|
|
|
|
static const char *servercontext = "TLS 1.3, server CertificateVerify";
|
|
|
|
static const char *clientcontext = "TLS 1.3, client CertificateVerify";
|
|
|
|
|
|
|
|
if (SSL_IS_TLS13(s)) {
|
|
|
|
size_t hashlen;
|
|
|
|
|
|
|
|
/* Set the first 64 bytes of to-be-signed data to octet 32 */
|
|
|
|
memset(tls13tbs, 32, TLS13_TBS_START_SIZE);
|
|
|
|
/* This copies the 33 bytes of context plus the 0 separator byte */
|
|
|
|
if (s->statem.hand_state == TLS_ST_CR_CERT_VRFY
|
|
|
|
|| s->statem.hand_state == TLS_ST_SW_CERT_VRFY)
|
|
|
|
strcpy((char *)tls13tbs + TLS13_TBS_START_SIZE, servercontext);
|
|
|
|
else
|
|
|
|
strcpy((char *)tls13tbs + TLS13_TBS_START_SIZE, clientcontext);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If we're currently reading then we need to use the saved handshake
|
|
|
|
* hash value. We can't use the current handshake hash state because
|
|
|
|
* that includes the CertVerify itself.
|
|
|
|
*/
|
|
|
|
if (s->statem.hand_state == TLS_ST_CR_CERT_VRFY
|
|
|
|
|| s->statem.hand_state == TLS_ST_SR_CERT_VRFY) {
|
|
|
|
memcpy(tls13tbs + TLS13_TBS_PREAMBLE_SIZE, s->cert_verify_hash,
|
|
|
|
s->cert_verify_hash_len);
|
|
|
|
hashlen = s->cert_verify_hash_len;
|
|
|
|
} else if (!ssl_handshake_hash(s, tls13tbs + TLS13_TBS_PREAMBLE_SIZE,
|
|
|
|
EVP_MAX_MD_SIZE, &hashlen)) {
|
2017-11-21 17:18:43 +00:00
|
|
|
/* SSLfatal() already called */
|
2016-12-05 17:04:51 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
*hdata = tls13tbs;
|
|
|
|
*hdatalen = TLS13_TBS_PREAMBLE_SIZE + hashlen;
|
|
|
|
} else {
|
|
|
|
size_t retlen;
|
|
|
|
|
|
|
|
retlen = BIO_get_mem_data(s->s3->handshake_buffer, hdata);
|
2017-11-21 17:18:43 +00:00
|
|
|
if (retlen <= 0) {
|
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_GET_CERT_VERIFY_TBS_DATA,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
2016-12-05 17:04:51 +00:00
|
|
|
return 0;
|
2017-11-21 17:18:43 +00:00
|
|
|
}
|
2016-12-05 17:04:51 +00:00
|
|
|
*hdatalen = retlen;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2016-12-05 14:59:25 +00:00
|
|
|
int tls_construct_cert_verify(SSL *s, WPACKET *pkt)
|
|
|
|
{
|
2017-02-15 16:23:49 +00:00
|
|
|
EVP_PKEY *pkey = NULL;
|
|
|
|
const EVP_MD *md = NULL;
|
2016-12-05 14:59:25 +00:00
|
|
|
EVP_MD_CTX *mctx = NULL;
|
2016-12-08 16:02:51 +00:00
|
|
|
EVP_PKEY_CTX *pctx = NULL;
|
|
|
|
size_t hdatalen = 0, siglen = 0;
|
2016-12-05 14:59:25 +00:00
|
|
|
void *hdata;
|
|
|
|
unsigned char *sig = NULL;
|
2016-12-05 17:04:51 +00:00
|
|
|
unsigned char tls13tbs[TLS13_TBS_PREAMBLE_SIZE + EVP_MAX_MD_SIZE];
|
2017-02-15 16:23:49 +00:00
|
|
|
const SIGALG_LOOKUP *lu = s->s3->tmp.sigalg;
|
2016-12-05 17:04:51 +00:00
|
|
|
|
2017-02-15 16:23:49 +00:00
|
|
|
if (lu == NULL || s->s3->tmp.cert == NULL) {
|
2017-11-23 10:37:51 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_CONSTRUCT_CERT_VERIFY,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
2017-02-15 16:23:49 +00:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
pkey = s->s3->tmp.cert->privatekey;
|
|
|
|
|
2017-06-14 15:54:08 +00:00
|
|
|
if (pkey == NULL || !tls1_lookup_md(lu, &md)) {
|
2017-11-23 10:37:51 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_CONSTRUCT_CERT_VERIFY,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
2017-02-15 16:23:49 +00:00
|
|
|
goto err;
|
|
|
|
}
|
2016-12-05 14:59:25 +00:00
|
|
|
|
|
|
|
mctx = EVP_MD_CTX_new();
|
|
|
|
if (mctx == NULL) {
|
2017-11-23 10:37:51 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_CONSTRUCT_CERT_VERIFY,
|
|
|
|
ERR_R_MALLOC_FAILURE);
|
2016-12-05 14:59:25 +00:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2016-12-05 17:04:51 +00:00
|
|
|
/* Get the data to be signed */
|
|
|
|
if (!get_cert_verify_tbs_data(s, tls13tbs, &hdata, &hdatalen)) {
|
2017-11-21 17:18:43 +00:00
|
|
|
/* SSLfatal() already called */
|
2016-12-05 14:59:25 +00:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2017-02-15 16:23:49 +00:00
|
|
|
if (SSL_USE_SIGALGS(s) && !WPACKET_put_bytes_u16(pkt, lu->sigalg)) {
|
2017-11-23 10:37:51 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_CONSTRUCT_CERT_VERIFY,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
2016-12-05 14:59:25 +00:00
|
|
|
goto err;
|
|
|
|
}
|
2016-12-08 16:02:51 +00:00
|
|
|
siglen = EVP_PKEY_size(pkey);
|
|
|
|
sig = OPENSSL_malloc(siglen);
|
2016-12-05 14:59:25 +00:00
|
|
|
if (sig == NULL) {
|
2017-11-23 10:37:51 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_CONSTRUCT_CERT_VERIFY,
|
|
|
|
ERR_R_MALLOC_FAILURE);
|
2016-12-05 14:59:25 +00:00
|
|
|
goto err;
|
|
|
|
}
|
2016-12-08 16:02:51 +00:00
|
|
|
|
2017-05-08 11:50:13 +00:00
|
|
|
if (EVP_DigestSignInit(mctx, &pctx, md, NULL, pkey) <= 0) {
|
2017-11-23 10:37:51 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_CONSTRUCT_CERT_VERIFY,
|
|
|
|
ERR_R_EVP_LIB);
|
2016-12-08 16:02:51 +00:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2017-02-15 16:23:49 +00:00
|
|
|
if (lu->sig == EVP_PKEY_RSA_PSS) {
|
2016-12-08 16:02:51 +00:00
|
|
|
if (EVP_PKEY_CTX_set_rsa_padding(pctx, RSA_PKCS1_PSS_PADDING) <= 0
|
2017-01-25 14:02:00 +00:00
|
|
|
|| EVP_PKEY_CTX_set_rsa_pss_saltlen(pctx,
|
|
|
|
RSA_PSS_SALTLEN_DIGEST) <= 0) {
|
2017-11-23 10:37:51 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_CONSTRUCT_CERT_VERIFY,
|
|
|
|
ERR_R_EVP_LIB);
|
2016-12-08 16:02:51 +00:00
|
|
|
goto err;
|
|
|
|
}
|
2017-05-23 11:56:51 +00:00
|
|
|
}
|
|
|
|
if (s->version == SSL3_VERSION) {
|
|
|
|
if (EVP_DigestSignUpdate(mctx, hdata, hdatalen) <= 0
|
|
|
|
|| !EVP_MD_CTX_ctrl(mctx, EVP_CTRL_SSL3_MASTER_SECRET,
|
|
|
|
(int)s->session->master_key_length,
|
|
|
|
s->session->master_key)
|
|
|
|
|| EVP_DigestSignFinal(mctx, sig, &siglen) <= 0) {
|
|
|
|
|
2017-11-23 10:37:51 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_CONSTRUCT_CERT_VERIFY,
|
|
|
|
ERR_R_EVP_LIB);
|
2016-12-08 16:02:51 +00:00
|
|
|
goto err;
|
|
|
|
}
|
2017-05-23 11:56:51 +00:00
|
|
|
} else if (EVP_DigestSign(mctx, sig, &siglen, hdata, hdatalen) <= 0) {
|
2017-11-23 10:37:51 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_CONSTRUCT_CERT_VERIFY,
|
|
|
|
ERR_R_EVP_LIB);
|
2016-12-05 14:59:25 +00:00
|
|
|
goto err;
|
|
|
|
}
|
2016-12-08 16:02:51 +00:00
|
|
|
|
2016-12-05 14:59:25 +00:00
|
|
|
#ifndef OPENSSL_NO_GOST
|
|
|
|
{
|
2017-02-15 16:23:49 +00:00
|
|
|
int pktype = lu->sig;
|
|
|
|
|
2016-12-05 14:59:25 +00:00
|
|
|
if (pktype == NID_id_GostR3410_2001
|
|
|
|
|| pktype == NID_id_GostR3410_2012_256
|
|
|
|
|| pktype == NID_id_GostR3410_2012_512)
|
2016-12-08 16:02:51 +00:00
|
|
|
BUF_reverse(sig, NULL, siglen);
|
2016-12-05 14:59:25 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2016-12-08 16:02:51 +00:00
|
|
|
if (!WPACKET_sub_memcpy_u16(pkt, sig, siglen)) {
|
2017-11-23 10:37:51 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_CONSTRUCT_CERT_VERIFY,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
2016-12-05 14:59:25 +00:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Digest cached records and discard handshake buffer */
|
2017-11-23 10:37:51 +00:00
|
|
|
if (!ssl3_digest_cached_records(s, 0)) {
|
|
|
|
/* SSLfatal() already called */
|
2016-12-05 14:59:25 +00:00
|
|
|
goto err;
|
2017-11-23 10:37:51 +00:00
|
|
|
}
|
2016-12-05 14:59:25 +00:00
|
|
|
|
|
|
|
OPENSSL_free(sig);
|
|
|
|
EVP_MD_CTX_free(mctx);
|
|
|
|
return 1;
|
|
|
|
err:
|
|
|
|
OPENSSL_free(sig);
|
|
|
|
EVP_MD_CTX_free(mctx);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
MSG_PROCESS_RETURN tls_process_cert_verify(SSL *s, PACKET *pkt)
|
|
|
|
{
|
|
|
|
EVP_PKEY *pkey = NULL;
|
2016-12-14 14:31:21 +00:00
|
|
|
const unsigned char *data;
|
2016-12-05 14:59:25 +00:00
|
|
|
#ifndef OPENSSL_NO_GOST
|
|
|
|
unsigned char *gost_data = NULL;
|
|
|
|
#endif
|
2017-08-31 21:23:00 +00:00
|
|
|
MSG_PROCESS_RETURN ret = MSG_PROCESS_ERROR;
|
2017-06-29 15:10:31 +00:00
|
|
|
int j;
|
2016-12-05 14:59:25 +00:00
|
|
|
unsigned int len;
|
|
|
|
X509 *peer;
|
|
|
|
const EVP_MD *md = NULL;
|
2016-12-05 17:04:51 +00:00
|
|
|
size_t hdatalen = 0;
|
2016-12-05 14:59:25 +00:00
|
|
|
void *hdata;
|
2016-12-05 17:04:51 +00:00
|
|
|
unsigned char tls13tbs[TLS13_TBS_PREAMBLE_SIZE + EVP_MAX_MD_SIZE];
|
2016-12-05 14:59:25 +00:00
|
|
|
EVP_MD_CTX *mctx = EVP_MD_CTX_new();
|
2016-12-08 16:02:51 +00:00
|
|
|
EVP_PKEY_CTX *pctx = NULL;
|
2016-12-05 14:59:25 +00:00
|
|
|
|
|
|
|
if (mctx == NULL) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PROCESS_CERT_VERIFY,
|
|
|
|
ERR_R_MALLOC_FAILURE);
|
|
|
|
goto err;
|
2016-12-05 14:59:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
peer = s->session->peer;
|
|
|
|
pkey = X509_get0_pubkey(peer);
|
2017-11-21 17:18:43 +00:00
|
|
|
if (pkey == NULL) {
|
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PROCESS_CERT_VERIFY,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
|
|
|
goto err;
|
|
|
|
}
|
2017-02-01 17:29:47 +00:00
|
|
|
|
2017-06-29 15:10:31 +00:00
|
|
|
if (ssl_cert_lookup_by_pkey(pkey, NULL) == NULL) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_F_TLS_PROCESS_CERT_VERIFY,
|
|
|
|
SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE);
|
|
|
|
goto err;
|
2016-12-05 14:59:25 +00:00
|
|
|
}
|
|
|
|
|
2017-06-09 17:04:00 +00:00
|
|
|
if (SSL_USE_SIGALGS(s)) {
|
|
|
|
unsigned int sigalg;
|
|
|
|
|
|
|
|
if (!PACKET_get_net_2(pkt, &sigalg)) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_F_TLS_PROCESS_CERT_VERIFY,
|
|
|
|
SSL_R_BAD_PACKET);
|
|
|
|
goto err;
|
2017-06-09 17:04:00 +00:00
|
|
|
}
|
2017-11-21 17:18:43 +00:00
|
|
|
if (tls12_check_peer_sigalg(s, sigalg, pkey) <= 0) {
|
|
|
|
/* SSLfatal() already called */
|
|
|
|
goto err;
|
2017-06-09 17:04:00 +00:00
|
|
|
}
|
|
|
|
#ifdef SSL_DEBUG
|
|
|
|
fprintf(stderr, "USING TLSv1.2 HASH %s\n", EVP_MD_name(md));
|
|
|
|
#endif
|
|
|
|
} else if (!tls1_set_peer_legacy_sigalg(s, pkey)) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PROCESS_CERT_VERIFY,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
|
|
|
goto err;
|
2017-06-09 17:04:00 +00:00
|
|
|
}
|
|
|
|
|
2017-06-14 15:54:08 +00:00
|
|
|
if (!tls1_lookup_md(s->s3->tmp.peer_sigalg, &md)) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PROCESS_CERT_VERIFY,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
|
|
|
goto err;
|
2017-06-14 15:54:08 +00:00
|
|
|
}
|
2017-06-09 17:04:00 +00:00
|
|
|
|
2016-12-05 14:59:25 +00:00
|
|
|
/* Check for broken implementations of GOST ciphersuites */
|
|
|
|
/*
|
2017-06-09 17:04:00 +00:00
|
|
|
* If key is GOST and len is exactly 64 or 128, it is signature without
|
|
|
|
* length field (CryptoPro implementations at least till TLS 1.2)
|
2016-12-05 14:59:25 +00:00
|
|
|
*/
|
|
|
|
#ifndef OPENSSL_NO_GOST
|
2017-06-09 17:04:00 +00:00
|
|
|
if (!SSL_USE_SIGALGS(s)
|
|
|
|
&& ((PACKET_remaining(pkt) == 64
|
|
|
|
&& (EVP_PKEY_id(pkey) == NID_id_GostR3410_2001
|
|
|
|
|| EVP_PKEY_id(pkey) == NID_id_GostR3410_2012_256))
|
|
|
|
|| (PACKET_remaining(pkt) == 128
|
|
|
|
&& EVP_PKEY_id(pkey) == NID_id_GostR3410_2012_512))) {
|
|
|
|
len = PACKET_remaining(pkt);
|
2016-12-05 14:59:25 +00:00
|
|
|
} else
|
|
|
|
#endif
|
2017-06-09 17:04:00 +00:00
|
|
|
if (!PACKET_get_net_2(pkt, &len)) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_F_TLS_PROCESS_CERT_VERIFY,
|
|
|
|
SSL_R_LENGTH_MISMATCH);
|
|
|
|
goto err;
|
2016-12-05 14:59:25 +00:00
|
|
|
}
|
2017-06-09 17:04:00 +00:00
|
|
|
|
2016-12-05 14:59:25 +00:00
|
|
|
j = EVP_PKEY_size(pkey);
|
|
|
|
if (((int)len > j) || ((int)PACKET_remaining(pkt) > j)
|
|
|
|
|| (PACKET_remaining(pkt) == 0)) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_F_TLS_PROCESS_CERT_VERIFY,
|
|
|
|
SSL_R_WRONG_SIGNATURE_SIZE);
|
|
|
|
goto err;
|
2016-12-05 14:59:25 +00:00
|
|
|
}
|
|
|
|
if (!PACKET_get_bytes(pkt, &data, len)) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_F_TLS_PROCESS_CERT_VERIFY,
|
|
|
|
SSL_R_LENGTH_MISMATCH);
|
|
|
|
goto err;
|
2016-12-05 14:59:25 +00:00
|
|
|
}
|
|
|
|
|
2016-12-05 17:04:51 +00:00
|
|
|
if (!get_cert_verify_tbs_data(s, tls13tbs, &hdata, &hdatalen)) {
|
2017-11-21 17:18:43 +00:00
|
|
|
/* SSLfatal() already called */
|
|
|
|
goto err;
|
2016-12-05 14:59:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef SSL_DEBUG
|
|
|
|
fprintf(stderr, "Using client verify alg %s\n", EVP_MD_name(md));
|
|
|
|
#endif
|
2017-05-08 11:50:13 +00:00
|
|
|
if (EVP_DigestVerifyInit(mctx, &pctx, md, NULL, pkey) <= 0) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PROCESS_CERT_VERIFY,
|
|
|
|
ERR_R_EVP_LIB);
|
|
|
|
goto err;
|
2016-12-05 14:59:25 +00:00
|
|
|
}
|
|
|
|
#ifndef OPENSSL_NO_GOST
|
|
|
|
{
|
2017-03-15 15:43:20 +00:00
|
|
|
int pktype = EVP_PKEY_id(pkey);
|
2016-12-05 14:59:25 +00:00
|
|
|
if (pktype == NID_id_GostR3410_2001
|
|
|
|
|| pktype == NID_id_GostR3410_2012_256
|
|
|
|
|| pktype == NID_id_GostR3410_2012_512) {
|
|
|
|
if ((gost_data = OPENSSL_malloc(len)) == NULL) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR,
|
|
|
|
SSL_F_TLS_PROCESS_CERT_VERIFY, ERR_R_MALLOC_FAILURE);
|
|
|
|
goto err;
|
2016-12-05 14:59:25 +00:00
|
|
|
}
|
|
|
|
BUF_reverse(gost_data, data, len);
|
|
|
|
data = gost_data;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2017-01-25 16:46:02 +00:00
|
|
|
if (SSL_USE_PSS(s)) {
|
2016-12-08 16:02:51 +00:00
|
|
|
if (EVP_PKEY_CTX_set_rsa_padding(pctx, RSA_PKCS1_PSS_PADDING) <= 0
|
2017-01-25 14:02:00 +00:00
|
|
|
|| EVP_PKEY_CTX_set_rsa_pss_saltlen(pctx,
|
|
|
|
RSA_PSS_SALTLEN_DIGEST) <= 0) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PROCESS_CERT_VERIFY,
|
|
|
|
ERR_R_EVP_LIB);
|
|
|
|
goto err;
|
2016-12-08 16:02:51 +00:00
|
|
|
}
|
2016-12-05 14:59:25 +00:00
|
|
|
}
|
2017-05-23 11:56:51 +00:00
|
|
|
if (s->version == SSL3_VERSION) {
|
|
|
|
if (EVP_DigestVerifyUpdate(mctx, hdata, hdatalen) <= 0
|
|
|
|
|| !EVP_MD_CTX_ctrl(mctx, EVP_CTRL_SSL3_MASTER_SECRET,
|
|
|
|
(int)s->session->master_key_length,
|
|
|
|
s->session->master_key)) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PROCESS_CERT_VERIFY,
|
|
|
|
ERR_R_EVP_LIB);
|
|
|
|
goto err;
|
2017-05-23 11:56:51 +00:00
|
|
|
}
|
|
|
|
if (EVP_DigestVerifyFinal(mctx, data, len) <= 0) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_DECRYPT_ERROR, SSL_F_TLS_PROCESS_CERT_VERIFY,
|
|
|
|
SSL_R_BAD_SIGNATURE);
|
|
|
|
goto err;
|
2017-05-23 11:56:51 +00:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
j = EVP_DigestVerify(mctx, data, len, hdata, hdatalen);
|
2017-06-23 10:40:47 +00:00
|
|
|
if (j <= 0) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_DECRYPT_ERROR, SSL_F_TLS_PROCESS_CERT_VERIFY,
|
|
|
|
SSL_R_BAD_SIGNATURE);
|
|
|
|
goto err;
|
2017-05-23 11:56:51 +00:00
|
|
|
}
|
2016-12-05 14:59:25 +00:00
|
|
|
}
|
|
|
|
|
2017-04-20 14:13:28 +00:00
|
|
|
ret = MSG_PROCESS_CONTINUE_READING;
|
2017-11-21 17:18:43 +00:00
|
|
|
err:
|
2016-12-05 14:59:25 +00:00
|
|
|
BIO_free(s->s3->handshake_buffer);
|
|
|
|
s->s3->handshake_buffer = NULL;
|
|
|
|
EVP_MD_CTX_free(mctx);
|
|
|
|
#ifndef OPENSSL_NO_GOST
|
|
|
|
OPENSSL_free(gost_data);
|
|
|
|
#endif
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2016-09-30 09:50:57 +00:00
|
|
|
int tls_construct_finished(SSL *s, WPACKET *pkt)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
2016-10-04 19:56:11 +00:00
|
|
|
size_t finish_md_len;
|
2016-09-30 09:50:57 +00:00
|
|
|
const char *sender;
|
2016-10-06 18:17:54 +00:00
|
|
|
size_t slen;
|
2016-09-30 09:50:57 +00:00
|
|
|
|
2017-02-27 11:19:57 +00:00
|
|
|
/* This is a real handshake so make sure we clean it up at the end */
|
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
|
|
|
if (!s->server && s->post_handshake_auth != SSL_PHA_REQUESTED)
|
2017-02-27 11:19:57 +00:00
|
|
|
s->statem.cleanuphand = 1;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We only change the keys if we didn't already do this when we sent the
|
|
|
|
* client certificate
|
|
|
|
*/
|
|
|
|
if (SSL_IS_TLS13(s)
|
|
|
|
&& !s->server
|
|
|
|
&& s->s3->tmp.cert_req == 0
|
|
|
|
&& (!s->method->ssl3_enc->change_cipher_state(s,
|
2017-11-23 10:37:51 +00:00
|
|
|
SSL3_CC_HANDSHAKE | SSL3_CHANGE_CIPHER_CLIENT_WRITE))) {;
|
|
|
|
/* SSLfatal() already called */
|
2017-06-14 18:25:52 +00:00
|
|
|
return 0;
|
2017-02-27 11:19:57 +00:00
|
|
|
}
|
|
|
|
|
2016-09-30 09:50:57 +00:00
|
|
|
if (s->server) {
|
|
|
|
sender = s->method->ssl3_enc->server_finished_label;
|
|
|
|
slen = s->method->ssl3_enc->server_finished_label_len;
|
|
|
|
} else {
|
|
|
|
sender = s->method->ssl3_enc->client_finished_label;
|
|
|
|
slen = s->method->ssl3_enc->client_finished_label_len;
|
|
|
|
}
|
2015-01-22 03:40:55 +00:00
|
|
|
|
2016-10-04 19:56:11 +00:00
|
|
|
finish_md_len = s->method->ssl3_enc->final_finish_mac(s,
|
|
|
|
sender, slen,
|
|
|
|
s->s3->tmp.finish_md);
|
|
|
|
if (finish_md_len == 0) {
|
2017-11-23 10:37:51 +00:00
|
|
|
/* SSLfatal() already called */
|
|
|
|
return 0;
|
2016-09-20 11:19:18 +00:00
|
|
|
}
|
|
|
|
|
2016-10-04 19:56:11 +00:00
|
|
|
s->s3->tmp.finish_md_len = finish_md_len;
|
2016-09-20 11:19:18 +00:00
|
|
|
|
2016-10-04 19:56:11 +00:00
|
|
|
if (!WPACKET_memcpy(pkt, s->s3->tmp.finish_md, finish_md_len)) {
|
2017-11-23 10:37:51 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_CONSTRUCT_FINISHED,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
|
|
|
return 0;
|
2016-09-20 11:19:18 +00:00
|
|
|
}
|
2015-01-22 03:40:55 +00:00
|
|
|
|
2017-01-31 14:56:15 +00:00
|
|
|
/*
|
|
|
|
* Log the master secret, if logging is enabled. We don't log it for
|
|
|
|
* TLSv1.3: there's a different key schedule for that.
|
|
|
|
*/
|
|
|
|
if (!SSL_IS_TLS13(s) && !ssl_log_secret(s, MASTER_SECRET_LABEL,
|
|
|
|
s->session->master_key,
|
2017-05-19 08:35:19 +00:00
|
|
|
s->session->master_key_length)) {
|
2017-11-23 10:37:51 +00:00
|
|
|
/* SSLfatal() already called */
|
|
|
|
return 0;
|
2017-05-19 08:35:19 +00:00
|
|
|
}
|
2017-01-20 16:22:30 +00:00
|
|
|
|
2015-07-29 13:08:49 +00:00
|
|
|
/*
|
|
|
|
* Copy the finished so we can use it for renegotiation checks
|
|
|
|
*/
|
2017-05-19 08:35:19 +00:00
|
|
|
if (!ossl_assert(finish_md_len <= EVP_MAX_MD_SIZE)) {
|
2017-11-23 10:37:51 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_CONSTRUCT_FINISHED,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
|
|
|
return 0;
|
2017-05-19 08:35:19 +00:00
|
|
|
}
|
2015-09-10 08:19:53 +00:00
|
|
|
if (!s->server) {
|
2016-10-04 19:56:11 +00:00
|
|
|
memcpy(s->s3->previous_client_finished, s->s3->tmp.finish_md,
|
|
|
|
finish_md_len);
|
|
|
|
s->s3->previous_client_finished_len = finish_md_len;
|
2015-07-29 13:08:49 +00:00
|
|
|
} else {
|
2016-10-04 19:56:11 +00:00
|
|
|
memcpy(s->s3->previous_server_finished, s->s3->tmp.finish_md,
|
|
|
|
finish_md_len);
|
|
|
|
s->s3->previous_server_finished_len = finish_md_len;
|
2015-07-29 13:08:49 +00:00
|
|
|
}
|
2015-01-22 03:40:55 +00:00
|
|
|
|
2015-07-29 13:08:49 +00:00
|
|
|
return 1;
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2017-02-08 09:15:22 +00:00
|
|
|
int tls_construct_key_update(SSL *s, WPACKET *pkt)
|
|
|
|
{
|
|
|
|
if (!WPACKET_put_bytes_u8(pkt, s->key_update)) {
|
2017-11-23 10:37:51 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_CONSTRUCT_KEY_UPDATE,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
|
|
|
return 0;
|
2017-02-08 09:15:22 +00:00
|
|
|
}
|
|
|
|
|
2017-02-09 13:12:00 +00:00
|
|
|
s->key_update = SSL_KEY_UPDATE_NONE;
|
2017-02-08 09:15:22 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2017-02-09 12:07:31 +00:00
|
|
|
MSG_PROCESS_RETURN tls_process_key_update(SSL *s, PACKET *pkt)
|
|
|
|
{
|
|
|
|
unsigned int updatetype;
|
|
|
|
|
2017-02-13 11:55:38 +00:00
|
|
|
s->key_update_count++;
|
|
|
|
if (s->key_update_count > MAX_KEY_UPDATE_MESSAGES) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_F_TLS_PROCESS_KEY_UPDATE,
|
|
|
|
SSL_R_TOO_MANY_KEY_UPDATES);
|
|
|
|
return MSG_PROCESS_ERROR;
|
2017-02-13 11:55:38 +00:00
|
|
|
}
|
|
|
|
|
2017-03-07 10:21:58 +00:00
|
|
|
/*
|
|
|
|
* A KeyUpdate message signals a key change so the end of the message must
|
|
|
|
* be on a record boundary.
|
|
|
|
*/
|
|
|
|
if (RECORD_LAYER_processed_read_pending(&s->rlayer)) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_UNEXPECTED_MESSAGE, SSL_F_TLS_PROCESS_KEY_UPDATE,
|
|
|
|
SSL_R_NOT_ON_RECORD_BOUNDARY);
|
|
|
|
return MSG_PROCESS_ERROR;
|
2017-03-07 10:21:58 +00:00
|
|
|
}
|
|
|
|
|
2017-02-09 12:07:31 +00:00
|
|
|
if (!PACKET_get_1(pkt, &updatetype)
|
2017-05-11 09:14:17 +00:00
|
|
|
|| PACKET_remaining(pkt) != 0) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_F_TLS_PROCESS_KEY_UPDATE,
|
|
|
|
SSL_R_BAD_KEY_UPDATE);
|
|
|
|
return MSG_PROCESS_ERROR;
|
2017-02-09 12:07:31 +00:00
|
|
|
}
|
|
|
|
|
2017-05-11 11:45:16 +00:00
|
|
|
/*
|
|
|
|
* There are only two defined key update types. Fail if we get a value we
|
|
|
|
* didn't recognise.
|
|
|
|
*/
|
2017-05-11 09:14:17 +00:00
|
|
|
if (updatetype != SSL_KEY_UPDATE_NOT_REQUESTED
|
|
|
|
&& updatetype != SSL_KEY_UPDATE_REQUESTED) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_F_TLS_PROCESS_KEY_UPDATE,
|
|
|
|
SSL_R_BAD_KEY_UPDATE);
|
|
|
|
return MSG_PROCESS_ERROR;
|
2017-05-11 09:14:17 +00:00
|
|
|
}
|
|
|
|
|
2017-02-09 16:00:12 +00:00
|
|
|
/*
|
|
|
|
* If we get a request for us to update our sending keys too then, we need
|
|
|
|
* to additionally send a KeyUpdate message. However that message should
|
|
|
|
* not also request an update (otherwise we get into an infinite loop).
|
|
|
|
*/
|
|
|
|
if (updatetype == SSL_KEY_UPDATE_REQUESTED)
|
|
|
|
s->key_update = SSL_KEY_UPDATE_NOT_REQUESTED;
|
|
|
|
|
2017-02-10 17:43:09 +00:00
|
|
|
if (!tls13_update_key(s, 0)) {
|
2017-11-21 17:18:43 +00:00
|
|
|
/* SSLfatal() already called */
|
|
|
|
return MSG_PROCESS_ERROR;
|
2017-02-10 17:43:09 +00:00
|
|
|
}
|
|
|
|
|
2017-02-09 12:07:31 +00:00
|
|
|
return MSG_PROCESS_FINISHED_READING;
|
|
|
|
}
|
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
/*
|
|
|
|
* ssl3_take_mac calculates the Finished MAC for the handshakes messages seen
|
|
|
|
* to far.
|
|
|
|
*/
|
2018-02-08 14:48:51 +00:00
|
|
|
int ssl3_take_mac(SSL *s)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
const char *sender;
|
2016-10-06 18:17:54 +00:00
|
|
|
size_t slen;
|
2018-02-08 14:48:51 +00:00
|
|
|
|
2015-09-08 08:13:50 +00:00
|
|
|
if (!s->server) {
|
2015-01-22 03:40:55 +00:00
|
|
|
sender = s->method->ssl3_enc->server_finished_label;
|
|
|
|
slen = s->method->ssl3_enc->server_finished_label_len;
|
|
|
|
} else {
|
|
|
|
sender = s->method->ssl3_enc->client_finished_label;
|
|
|
|
slen = s->method->ssl3_enc->client_finished_label_len;
|
|
|
|
}
|
|
|
|
|
2018-02-08 14:48:51 +00:00
|
|
|
s->s3->tmp.peer_finish_md_len =
|
|
|
|
s->method->ssl3_enc->final_finish_mac(s, sender, slen,
|
|
|
|
s->s3->tmp.peer_finish_md);
|
|
|
|
|
|
|
|
if (s->s3->tmp.peer_finish_md_len == 0) {
|
|
|
|
/* SSLfatal() already called */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
2010-07-28 10:06:55 +00:00
|
|
|
|
2015-10-26 11:46:33 +00:00
|
|
|
MSG_PROCESS_RETURN tls_process_change_cipher_spec(SSL *s, PACKET *pkt)
|
2015-07-29 13:08:49 +00:00
|
|
|
{
|
2016-10-19 14:11:24 +00:00
|
|
|
size_t remain;
|
2015-12-29 08:24:17 +00:00
|
|
|
|
2015-09-10 09:22:30 +00:00
|
|
|
remain = PACKET_remaining(pkt);
|
2015-05-11 08:35:41 +00:00
|
|
|
/*
|
|
|
|
* 'Change Cipher Spec' is just a single byte, which should already have
|
2015-06-02 10:33:07 +00:00
|
|
|
* been consumed by ssl_get_message() so there should be no bytes left,
|
|
|
|
* unless we're using DTLS1_BAD_VER, which has an extra 2 bytes
|
2015-05-11 08:35:41 +00:00
|
|
|
*/
|
2015-06-02 10:33:07 +00:00
|
|
|
if (SSL_IS_DTLS(s)) {
|
2015-09-10 09:22:30 +00:00
|
|
|
if ((s->version == DTLS1_BAD_VER
|
2016-08-05 17:03:17 +00:00
|
|
|
&& remain != DTLS1_CCS_HEADER_LENGTH + 1)
|
|
|
|
|| (s->version != DTLS1_BAD_VER
|
|
|
|
&& remain != DTLS1_CCS_HEADER_LENGTH - 1)) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_DECODE_ERROR,
|
|
|
|
SSL_F_TLS_PROCESS_CHANGE_CIPHER_SPEC,
|
|
|
|
SSL_R_BAD_CHANGE_CIPHER_SPEC);
|
|
|
|
return MSG_PROCESS_ERROR;
|
2015-06-02 10:33:07 +00:00
|
|
|
}
|
|
|
|
} else {
|
2015-09-10 09:22:30 +00:00
|
|
|
if (remain != 0) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_DECODE_ERROR,
|
|
|
|
SSL_F_TLS_PROCESS_CHANGE_CIPHER_SPEC,
|
|
|
|
SSL_R_BAD_CHANGE_CIPHER_SPEC);
|
|
|
|
return MSG_PROCESS_ERROR;
|
2015-06-02 10:33:07 +00:00
|
|
|
}
|
2015-05-11 08:35:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Check we have a cipher to change to */
|
|
|
|
if (s->s3->tmp.new_cipher == NULL) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_UNEXPECTED_MESSAGE,
|
|
|
|
SSL_F_TLS_PROCESS_CHANGE_CIPHER_SPEC, SSL_R_CCS_RECEIVED_EARLY);
|
|
|
|
return MSG_PROCESS_ERROR;
|
2015-05-11 08:35:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
s->s3->change_cipher_spec = 1;
|
|
|
|
if (!ssl3_do_change_cipher_spec(s)) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PROCESS_CHANGE_CIPHER_SPEC,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
|
|
|
return MSG_PROCESS_ERROR;
|
2015-05-11 08:35:41 +00:00
|
|
|
}
|
|
|
|
|
2015-06-02 10:33:07 +00:00
|
|
|
if (SSL_IS_DTLS(s)) {
|
|
|
|
dtls1_reset_seq_numbers(s, SSL3_CC_READ);
|
|
|
|
|
|
|
|
if (s->version == DTLS1_BAD_VER)
|
|
|
|
s->d1->handshake_read_seq++;
|
|
|
|
|
|
|
|
#ifndef OPENSSL_NO_SCTP
|
|
|
|
/*
|
|
|
|
* Remember that a CCS has been received, so that an old key of
|
|
|
|
* SCTP-Auth can be deleted when a CCS is sent. Will be ignored if no
|
|
|
|
* SCTP is used
|
|
|
|
*/
|
|
|
|
BIO_ctrl(SSL_get_wbio(s), BIO_CTRL_DGRAM_SCTP_AUTH_CCS_RCVD, 1, NULL);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2015-07-29 13:08:49 +00:00
|
|
|
return MSG_PROCESS_CONTINUE_READING;
|
2015-05-11 08:35:41 +00:00
|
|
|
}
|
|
|
|
|
2015-10-26 11:46:33 +00:00
|
|
|
MSG_PROCESS_RETURN tls_process_finished(SSL *s, PACKET *pkt)
|
2015-07-29 13:08:49 +00:00
|
|
|
{
|
2016-10-04 19:56:11 +00:00
|
|
|
size_t md_len;
|
2015-07-29 13:08:49 +00:00
|
|
|
|
2017-02-21 17:14:42 +00:00
|
|
|
|
|
|
|
/* This is a real handshake so make sure we clean it up at the end */
|
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
|
|
|
if (s->server) {
|
|
|
|
if (s->post_handshake_auth != SSL_PHA_REQUESTED)
|
|
|
|
s->statem.cleanuphand = 1;
|
|
|
|
if (SSL_IS_TLS13(s) && !tls13_save_handshake_digest_for_pha(s)) {
|
|
|
|
/* SSLfatal() already called */
|
|
|
|
return MSG_PROCESS_ERROR;
|
|
|
|
}
|
|
|
|
}
|
2017-02-21 17:14:42 +00:00
|
|
|
|
2017-03-07 10:21:58 +00:00
|
|
|
/*
|
|
|
|
* In TLSv1.3 a Finished message signals a key change so the end of the
|
|
|
|
* message must be on a record boundary.
|
|
|
|
*/
|
|
|
|
if (SSL_IS_TLS13(s) && RECORD_LAYER_processed_read_pending(&s->rlayer)) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_UNEXPECTED_MESSAGE, SSL_F_TLS_PROCESS_FINISHED,
|
|
|
|
SSL_R_NOT_ON_RECORD_BOUNDARY);
|
|
|
|
return MSG_PROCESS_ERROR;
|
2017-03-07 10:21:58 +00:00
|
|
|
}
|
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
/* If this occurs, we have missed a message */
|
2016-11-09 14:06:12 +00:00
|
|
|
if (!SSL_IS_TLS13(s) && !s->s3->change_cipher_spec) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_UNEXPECTED_MESSAGE, SSL_F_TLS_PROCESS_FINISHED,
|
|
|
|
SSL_R_GOT_A_FIN_BEFORE_A_CCS);
|
|
|
|
return MSG_PROCESS_ERROR;
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
|
|
|
s->s3->change_cipher_spec = 0;
|
|
|
|
|
2016-10-04 19:56:11 +00:00
|
|
|
md_len = s->s3->tmp.peer_finish_md_len;
|
2015-01-22 03:40:55 +00:00
|
|
|
|
2016-10-04 19:56:11 +00:00
|
|
|
if (md_len != PACKET_remaining(pkt)) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_F_TLS_PROCESS_FINISHED,
|
|
|
|
SSL_R_BAD_DIGEST_LENGTH);
|
|
|
|
return MSG_PROCESS_ERROR;
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
|
|
|
|
2016-10-04 19:56:11 +00:00
|
|
|
if (CRYPTO_memcmp(PACKET_data(pkt), s->s3->tmp.peer_finish_md,
|
|
|
|
md_len) != 0) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_DECRYPT_ERROR, SSL_F_TLS_PROCESS_FINISHED,
|
|
|
|
SSL_R_DIGEST_CHECK_FAILED);
|
|
|
|
return MSG_PROCESS_ERROR;
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Copy the finished so we can use it for renegotiation checks
|
|
|
|
*/
|
2017-05-19 08:35:19 +00:00
|
|
|
if (!ossl_assert(md_len <= EVP_MAX_MD_SIZE)) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_PROCESS_FINISHED,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
|
|
|
return MSG_PROCESS_ERROR;
|
2017-05-19 08:35:19 +00:00
|
|
|
}
|
2015-09-10 08:19:53 +00:00
|
|
|
if (s->server) {
|
2016-10-04 19:56:11 +00:00
|
|
|
memcpy(s->s3->previous_client_finished, s->s3->tmp.peer_finish_md,
|
|
|
|
md_len);
|
|
|
|
s->s3->previous_client_finished_len = md_len;
|
2015-01-22 03:40:55 +00:00
|
|
|
} else {
|
2016-10-04 19:56:11 +00:00
|
|
|
memcpy(s->s3->previous_server_finished, s->s3->tmp.peer_finish_md,
|
|
|
|
md_len);
|
|
|
|
s->s3->previous_server_finished_len = md_len;
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
|
|
|
|
2016-11-15 10:13:09 +00:00
|
|
|
/*
|
|
|
|
* In TLS1.3 we also have to change cipher state and do any final processing
|
|
|
|
* of the initial server flight (if we are a client)
|
|
|
|
*/
|
2016-11-09 14:06:12 +00:00
|
|
|
if (SSL_IS_TLS13(s)) {
|
|
|
|
if (s->server) {
|
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
|
|
|
if (s->post_handshake_auth != SSL_PHA_REQUESTED &&
|
|
|
|
!s->method->ssl3_enc->change_cipher_state(s,
|
2016-11-09 14:06:12 +00:00
|
|
|
SSL3_CC_APPLICATION | SSL3_CHANGE_CIPHER_SERVER_READ)) {
|
2017-11-21 17:18:43 +00:00
|
|
|
/* SSLfatal() already called */
|
|
|
|
return MSG_PROCESS_ERROR;
|
2016-11-09 14:06:12 +00:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (!s->method->ssl3_enc->generate_master_secret(s,
|
2017-01-13 17:00:49 +00:00
|
|
|
s->master_secret, s->handshake_secret, 0,
|
2016-11-09 14:06:12 +00:00
|
|
|
&s->session->master_key_length)) {
|
2017-11-21 17:18:43 +00:00
|
|
|
/* SSLfatal() already called */
|
|
|
|
return MSG_PROCESS_ERROR;
|
2016-11-09 14:06:12 +00:00
|
|
|
}
|
|
|
|
if (!s->method->ssl3_enc->change_cipher_state(s,
|
|
|
|
SSL3_CC_APPLICATION | SSL3_CHANGE_CIPHER_CLIENT_READ)) {
|
2017-11-21 17:18:43 +00:00
|
|
|
/* SSLfatal() already called */
|
|
|
|
return MSG_PROCESS_ERROR;
|
|
|
|
}
|
|
|
|
if (!tls_process_initial_server_flight(s)) {
|
|
|
|
/* SSLfatal() already called */
|
|
|
|
return MSG_PROCESS_ERROR;
|
2016-11-09 14:06:12 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-11-06 09:47:18 +00:00
|
|
|
return MSG_PROCESS_FINISHED_READING;
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2016-09-29 22:28:29 +00:00
|
|
|
int tls_construct_change_cipher_spec(SSL *s, WPACKET *pkt)
|
2015-07-29 13:08:49 +00:00
|
|
|
{
|
2016-09-29 22:28:29 +00:00
|
|
|
if (!WPACKET_put_bytes_u8(pkt, SSL3_MT_CCS)) {
|
2017-11-23 10:37:51 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR,
|
|
|
|
SSL_F_TLS_CONSTRUCT_CHANGE_CIPHER_SPEC, ERR_R_INTERNAL_ERROR);
|
2016-09-20 11:26:46 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2015-07-29 13:08:49 +00:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2016-12-02 09:14:15 +00:00
|
|
|
/* Add a certificate to the WPACKET */
|
2017-11-21 17:18:43 +00:00
|
|
|
static int ssl_add_cert_to_wpacket(SSL *s, WPACKET *pkt, X509 *x, int chain)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
2016-12-02 09:14:15 +00:00
|
|
|
int len;
|
|
|
|
unsigned char *outbytes;
|
|
|
|
|
|
|
|
len = i2d_X509(x, NULL);
|
|
|
|
if (len < 0) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL_ADD_CERT_TO_WPACKET,
|
|
|
|
ERR_R_BUF_LIB);
|
2016-12-02 09:14:15 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (!WPACKET_sub_allocate_bytes_u24(pkt, len, &outbytes)
|
|
|
|
|| i2d_X509(x, &outbytes) != len) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL_ADD_CERT_TO_WPACKET,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
2016-12-02 09:14:15 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (SSL_IS_TLS13(s)
|
2017-04-04 10:40:02 +00:00
|
|
|
&& !tls_construct_extensions(s, pkt, SSL_EXT_TLS1_3_CERTIFICATE, x,
|
2017-11-21 17:18:43 +00:00
|
|
|
chain)) {
|
|
|
|
/* SSLfatal() already called */
|
2016-12-02 09:14:15 +00:00
|
|
|
return 0;
|
2017-11-21 17:18:43 +00:00
|
|
|
}
|
2016-12-02 09:14:15 +00:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Add certificate chain to provided WPACKET */
|
2017-11-21 17:18:43 +00:00
|
|
|
static int ssl_add_cert_chain(SSL *s, WPACKET *pkt, CERT_PKEY *cpk)
|
2016-12-02 09:14:15 +00:00
|
|
|
{
|
|
|
|
int i, chain_count;
|
|
|
|
X509 *x;
|
|
|
|
STACK_OF(X509) *extra_certs;
|
|
|
|
STACK_OF(X509) *chain = NULL;
|
|
|
|
X509_STORE *chain_store;
|
|
|
|
|
|
|
|
if (cpk == NULL || cpk->x509 == NULL)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
x = cpk->x509;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If we have a certificate specific chain use it, else use parent ctx.
|
|
|
|
*/
|
2017-01-06 11:01:14 +00:00
|
|
|
if (cpk->chain != NULL)
|
2016-12-02 09:14:15 +00:00
|
|
|
extra_certs = cpk->chain;
|
|
|
|
else
|
|
|
|
extra_certs = s->ctx->extra_certs;
|
|
|
|
|
|
|
|
if ((s->mode & SSL_MODE_NO_AUTO_CHAIN) || extra_certs)
|
|
|
|
chain_store = NULL;
|
|
|
|
else if (s->cert->chain_store)
|
|
|
|
chain_store = s->cert->chain_store;
|
|
|
|
else
|
|
|
|
chain_store = s->ctx->cert_store;
|
|
|
|
|
2017-01-06 11:01:14 +00:00
|
|
|
if (chain_store != NULL) {
|
2016-12-02 09:14:15 +00:00
|
|
|
X509_STORE_CTX *xs_ctx = X509_STORE_CTX_new();
|
|
|
|
|
|
|
|
if (xs_ctx == NULL) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL_ADD_CERT_CHAIN,
|
|
|
|
ERR_R_MALLOC_FAILURE);
|
|
|
|
return 0;
|
2016-12-02 09:14:15 +00:00
|
|
|
}
|
|
|
|
if (!X509_STORE_CTX_init(xs_ctx, chain_store, x, NULL)) {
|
|
|
|
X509_STORE_CTX_free(xs_ctx);
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL_ADD_CERT_CHAIN,
|
|
|
|
ERR_R_X509_LIB);
|
|
|
|
return 0;
|
2016-12-02 09:14:15 +00:00
|
|
|
}
|
|
|
|
/*
|
|
|
|
* It is valid for the chain not to be complete (because normally we
|
|
|
|
* don't include the root cert in the chain). Therefore we deliberately
|
|
|
|
* ignore the error return from this call. We're not actually verifying
|
|
|
|
* the cert - we're just building as much of the chain as we can
|
|
|
|
*/
|
|
|
|
(void)X509_verify_cert(xs_ctx);
|
|
|
|
/* Don't leave errors in the queue */
|
|
|
|
ERR_clear_error();
|
|
|
|
chain = X509_STORE_CTX_get0_chain(xs_ctx);
|
|
|
|
i = ssl_security_cert_chain(s, chain, NULL, 0);
|
|
|
|
if (i != 1) {
|
|
|
|
#if 0
|
|
|
|
/* Dummy error calls so mkerr generates them */
|
|
|
|
SSLerr(SSL_F_SSL_ADD_CERT_CHAIN, SSL_R_EE_KEY_TOO_SMALL);
|
|
|
|
SSLerr(SSL_F_SSL_ADD_CERT_CHAIN, SSL_R_CA_KEY_TOO_SMALL);
|
|
|
|
SSLerr(SSL_F_SSL_ADD_CERT_CHAIN, SSL_R_CA_MD_TOO_WEAK);
|
|
|
|
#endif
|
|
|
|
X509_STORE_CTX_free(xs_ctx);
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL_ADD_CERT_CHAIN, i);
|
|
|
|
return 0;
|
2016-12-02 09:14:15 +00:00
|
|
|
}
|
|
|
|
chain_count = sk_X509_num(chain);
|
|
|
|
for (i = 0; i < chain_count; i++) {
|
|
|
|
x = sk_X509_value(chain, i);
|
|
|
|
|
2017-11-21 17:18:43 +00:00
|
|
|
if (!ssl_add_cert_to_wpacket(s, pkt, x, i)) {
|
|
|
|
/* SSLfatal() already called */
|
2016-12-02 09:14:15 +00:00
|
|
|
X509_STORE_CTX_free(xs_ctx);
|
2017-11-21 17:18:43 +00:00
|
|
|
return 0;
|
2016-12-02 09:14:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
X509_STORE_CTX_free(xs_ctx);
|
|
|
|
} else {
|
|
|
|
i = ssl_security_cert_chain(s, extra_certs, x, 0);
|
|
|
|
if (i != 1) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL_ADD_CERT_CHAIN, i);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (!ssl_add_cert_to_wpacket(s, pkt, x, 0)) {
|
|
|
|
/* SSLfatal() already called */
|
|
|
|
return 0;
|
2016-12-02 09:14:15 +00:00
|
|
|
}
|
|
|
|
for (i = 0; i < sk_X509_num(extra_certs); i++) {
|
|
|
|
x = sk_X509_value(extra_certs, i);
|
2017-11-21 17:18:43 +00:00
|
|
|
if (!ssl_add_cert_to_wpacket(s, pkt, x, i + 1)) {
|
|
|
|
/* SSLfatal() already called */
|
|
|
|
return 0;
|
|
|
|
}
|
2016-12-02 09:14:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2017-11-21 17:18:43 +00:00
|
|
|
unsigned long ssl3_output_cert_chain(SSL *s, WPACKET *pkt, CERT_PKEY *cpk)
|
2016-12-02 09:14:15 +00:00
|
|
|
{
|
2017-11-21 17:18:43 +00:00
|
|
|
if (!WPACKET_start_sub_packet_u24(pkt)) {
|
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_OUTPUT_CERT_CHAIN,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
|
|
|
return 0;
|
|
|
|
}
|
2016-12-02 09:14:15 +00:00
|
|
|
|
2017-11-21 17:18:43 +00:00
|
|
|
if (!ssl_add_cert_chain(s, pkt, cpk))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (!WPACKET_close(pkt)) {
|
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_OUTPUT_CERT_CHAIN,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
2016-09-29 22:28:29 +00:00
|
|
|
return 0;
|
2015-03-09 15:33:46 +00:00
|
|
|
}
|
2017-11-21 17:18:43 +00:00
|
|
|
|
2016-09-14 10:41:27 +00:00
|
|
|
return 1;
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
|
|
|
|
2017-01-13 09:19:10 +00:00
|
|
|
/*
|
|
|
|
* Tidy up after the end of a handshake. In the case of SCTP this may result
|
|
|
|
* in NBIO events. If |clearbufs| is set then init_buf and the wbio buffer is
|
|
|
|
* freed up as well.
|
|
|
|
*/
|
2017-11-27 15:20:06 +00:00
|
|
|
WORK_STATE tls_finish_handshake(SSL *s, WORK_STATE wst, int clearbufs, int stop)
|
2015-09-07 15:36:53 +00:00
|
|
|
{
|
2017-10-17 19:46:58 +00:00
|
|
|
int discard;
|
2015-09-07 15:36:53 +00:00
|
|
|
void (*cb) (const SSL *ssl, int type, int val) = NULL;
|
|
|
|
|
2017-01-13 09:19:10 +00:00
|
|
|
if (clearbufs) {
|
|
|
|
if (!SSL_IS_DTLS(s)) {
|
|
|
|
/*
|
|
|
|
* We don't do this in DTLS because we may still need the init_buf
|
|
|
|
* in case there are any unexpected retransmits
|
|
|
|
*/
|
|
|
|
BUF_MEM_free(s->init_buf);
|
|
|
|
s->init_buf = NULL;
|
|
|
|
}
|
2017-11-22 17:18:39 +00:00
|
|
|
if (!ssl_free_wbio_buffer(s)) {
|
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS_FINISH_HANDSHAKE,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
2017-05-22 11:33:42 +00:00
|
|
|
return WORK_ERROR;
|
2017-11-22 17:18:39 +00:00
|
|
|
}
|
2017-01-13 09:19:10 +00:00
|
|
|
s->init_num = 0;
|
2015-09-07 21:00:36 +00:00
|
|
|
}
|
2015-09-07 15:36:53 +00:00
|
|
|
|
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
|
|
|
if (SSL_IS_TLS13(s) && !s->server
|
|
|
|
&& s->post_handshake_auth == SSL_PHA_REQUESTED)
|
|
|
|
s->post_handshake_auth = SSL_PHA_EXT_SENT;
|
|
|
|
|
2018-04-04 13:17:10 +00:00
|
|
|
/*
|
|
|
|
* Only set if there was a Finished message and this isn't after a TLSv1.3
|
|
|
|
* post handshake exchange
|
|
|
|
*/
|
2017-01-10 23:02:28 +00:00
|
|
|
if (s->statem.cleanuphand) {
|
2015-09-07 15:36:53 +00:00
|
|
|
/* skipped if we just sent a HelloRequest */
|
|
|
|
s->renegotiate = 0;
|
|
|
|
s->new_session = 0;
|
2017-01-10 23:02:28 +00:00
|
|
|
s->statem.cleanuphand = 0;
|
2018-05-08 13:50:17 +00:00
|
|
|
s->ext.ticket_expected = 0;
|
2015-09-07 15:36:53 +00:00
|
|
|
|
2017-01-13 09:19:10 +00:00
|
|
|
ssl3_cleanup_key_block(s);
|
|
|
|
|
2015-09-07 15:36:53 +00:00
|
|
|
if (s->server) {
|
2018-03-14 17:51:18 +00:00
|
|
|
/*
|
|
|
|
* In TLSv1.3 we update the cache as part of constructing the
|
|
|
|
* NewSessionTicket
|
|
|
|
*/
|
|
|
|
if (!SSL_IS_TLS13(s))
|
|
|
|
ssl_update_cache(s, SSL_SESS_CACHE_SERVER);
|
2015-09-07 15:36:53 +00:00
|
|
|
|
2017-10-17 20:28:42 +00:00
|
|
|
/* N.B. s->ctx may not equal s->session_ctx */
|
2017-10-17 19:46:58 +00:00
|
|
|
CRYPTO_atomic_add(&s->ctx->stats.sess_accept_good, 1, &discard,
|
|
|
|
s->ctx->lock);
|
2015-10-05 09:39:54 +00:00
|
|
|
s->handshake_func = ossl_statem_accept;
|
2018-05-03 15:00:51 +00:00
|
|
|
|
|
|
|
if (SSL_IS_DTLS(s) && !s->hit) {
|
|
|
|
/*
|
|
|
|
* We are finishing after the client. We start the timer going
|
|
|
|
* in case there are any retransmits of our final flight
|
|
|
|
* required.
|
|
|
|
*/
|
|
|
|
dtls1_start_timer(s);
|
|
|
|
}
|
2015-09-07 15:36:53 +00:00
|
|
|
} else {
|
2017-08-01 09:49:47 +00:00
|
|
|
/*
|
|
|
|
* In TLSv1.3 we update the cache as part of processing the
|
|
|
|
* NewSessionTicket
|
|
|
|
*/
|
|
|
|
if (!SSL_IS_TLS13(s))
|
|
|
|
ssl_update_cache(s, SSL_SESS_CACHE_CLIENT);
|
2015-09-07 15:36:53 +00:00
|
|
|
if (s->hit)
|
2017-10-17 20:28:42 +00:00
|
|
|
CRYPTO_atomic_add(&s->session_ctx->stats.sess_hit, 1, &discard,
|
|
|
|
s->session_ctx->lock);
|
2015-09-07 15:36:53 +00:00
|
|
|
|
2015-10-05 09:39:54 +00:00
|
|
|
s->handshake_func = ossl_statem_connect;
|
2017-10-17 20:28:42 +00:00
|
|
|
CRYPTO_atomic_add(&s->session_ctx->stats.sess_connect_good, 1,
|
|
|
|
&discard, s->session_ctx->lock);
|
2018-05-03 15:00:51 +00:00
|
|
|
|
|
|
|
if (SSL_IS_DTLS(s) && s->hit) {
|
|
|
|
/*
|
|
|
|
* We are finishing after the server. We start the timer going
|
|
|
|
* in case there are any retransmits of our final flight
|
|
|
|
* required.
|
|
|
|
*/
|
|
|
|
dtls1_start_timer(s);
|
|
|
|
}
|
2015-09-07 15:36:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (SSL_IS_DTLS(s)) {
|
|
|
|
/* done with handshaking */
|
|
|
|
s->d1->handshake_read_seq = 0;
|
|
|
|
s->d1->handshake_write_seq = 0;
|
|
|
|
s->d1->next_handshake_write_seq = 0;
|
Fix DTLS buffered message DoS attack
DTLS can handle out of order record delivery. Additionally since
handshake messages can be bigger than will fit into a single packet, the
messages can be fragmented across multiple records (as with normal TLS).
That means that the messages can arrive mixed up, and we have to
reassemble them. We keep a queue of buffered messages that are "from the
future", i.e. messages we're not ready to deal with yet but have arrived
early. The messages held there may not be full yet - they could be one
or more fragments that are still in the process of being reassembled.
The code assumes that we will eventually complete the reassembly and
when that occurs the complete message is removed from the queue at the
point that we need to use it.
However, DTLS is also tolerant of packet loss. To get around that DTLS
messages can be retransmitted. If we receive a full (non-fragmented)
message from the peer after previously having received a fragment of
that message, then we ignore the message in the queue and just use the
non-fragmented version. At that point the queued message will never get
removed.
Additionally the peer could send "future" messages that we never get to
in order to complete the handshake. Each message has a sequence number
(starting from 0). We will accept a message fragment for the current
message sequence number, or for any sequence up to 10 into the future.
However if the Finished message has a sequence number of 2, anything
greater than that in the queue is just left there.
So, in those two ways we can end up with "orphaned" data in the queue
that will never get removed - except when the connection is closed. At
that point all the queues are flushed.
An attacker could seek to exploit this by filling up the queues with
lots of large messages that are never going to be used in order to
attempt a DoS by memory exhaustion.
I will assume that we are only concerned with servers here. It does not
seem reasonable to be concerned about a memory exhaustion attack on a
client. They are unlikely to process enough connections for this to be
an issue.
A "long" handshake with many messages might be 5 messages long (in the
incoming direction), e.g. ClientHello, Certificate, ClientKeyExchange,
CertificateVerify, Finished. So this would be message sequence numbers 0
to 4. Additionally we can buffer up to 10 messages in the future.
Therefore the maximum number of messages that an attacker could send
that could get orphaned would typically be 15.
The maximum size that a DTLS message is allowed to be is defined by
max_cert_list, which by default is 100k. Therefore the maximum amount of
"orphaned" memory per connection is 1500k.
Message sequence numbers get reset after the Finished message, so
renegotiation will not extend the maximum number of messages that can be
orphaned per connection.
As noted above, the queues do get cleared when the connection is closed.
Therefore in order to mount an effective attack, an attacker would have
to open many simultaneous connections.
Issue reported by Quan Luo.
CVE-2016-2179
Reviewed-by: Richard Levitte <levitte@openssl.org>
2016-06-30 12:17:08 +00:00
|
|
|
dtls1_clear_received_buffer(s);
|
2015-09-07 15:36:53 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-04-04 13:17:10 +00:00
|
|
|
if (s->info_callback != NULL)
|
|
|
|
cb = s->info_callback;
|
|
|
|
else if (s->ctx->info_callback != NULL)
|
|
|
|
cb = s->ctx->info_callback;
|
|
|
|
|
2018-04-19 14:26:28 +00:00
|
|
|
/* The callback may expect us to not be in init at handshake done */
|
|
|
|
ossl_statem_set_in_init(s, 0);
|
|
|
|
|
2018-04-04 13:17:10 +00:00
|
|
|
if (cb != NULL)
|
|
|
|
cb(s, SSL_CB_HANDSHAKE_DONE, 1);
|
|
|
|
|
2018-04-19 14:26:28 +00:00
|
|
|
if (!stop) {
|
|
|
|
/* If we've got more work to do we go back into init */
|
|
|
|
ossl_statem_set_in_init(s, 1);
|
2017-01-13 09:19:10 +00:00
|
|
|
return WORK_FINISHED_CONTINUE;
|
2018-04-19 14:26:28 +00:00
|
|
|
}
|
2017-01-13 09:19:10 +00:00
|
|
|
|
2015-09-07 15:36:53 +00:00
|
|
|
return WORK_FINISHED_STOP;
|
|
|
|
}
|
|
|
|
|
2015-07-29 13:20:05 +00:00
|
|
|
int tls_get_message_header(SSL *s, int *mt)
|
|
|
|
{
|
|
|
|
/* s->init_num < SSL3_HM_HEADER_LENGTH */
|
2017-11-23 10:37:51 +00:00
|
|
|
int skip_message, i, recvd_type;
|
2015-07-29 13:20:05 +00:00
|
|
|
unsigned char *p;
|
2016-10-26 09:43:34 +00:00
|
|
|
size_t l, readbytes;
|
2015-07-29 13:20:05 +00:00
|
|
|
|
|
|
|
p = (unsigned char *)s->init_buf->data;
|
|
|
|
|
|
|
|
do {
|
|
|
|
while (s->init_num < SSL3_HM_HEADER_LENGTH) {
|
|
|
|
i = s->method->ssl_read_bytes(s, SSL3_RT_HANDSHAKE, &recvd_type,
|
2016-08-05 17:03:17 +00:00
|
|
|
&p[s->init_num],
|
|
|
|
SSL3_HM_HEADER_LENGTH - s->init_num,
|
2016-10-26 09:43:34 +00:00
|
|
|
0, &readbytes);
|
2015-07-29 13:20:05 +00:00
|
|
|
if (i <= 0) {
|
|
|
|
s->rwstate = SSL_READING;
|
|
|
|
return 0;
|
2015-03-27 23:01:51 +00:00
|
|
|
}
|
2015-07-29 13:20:05 +00:00
|
|
|
if (recvd_type == SSL3_RT_CHANGE_CIPHER_SPEC) {
|
2016-03-06 03:50:44 +00:00
|
|
|
/*
|
2016-08-05 17:03:17 +00:00
|
|
|
* A ChangeCipherSpec must be a single byte and may not occur
|
|
|
|
* in the middle of a handshake message.
|
|
|
|
*/
|
2016-10-26 09:43:34 +00:00
|
|
|
if (s->init_num != 0 || readbytes != 1 || p[0] != SSL3_MT_CCS) {
|
2017-11-23 10:37:51 +00:00
|
|
|
SSLfatal(s, SSL_AD_UNEXPECTED_MESSAGE,
|
|
|
|
SSL_F_TLS_GET_MESSAGE_HEADER,
|
|
|
|
SSL_R_BAD_CHANGE_CIPHER_SPEC);
|
|
|
|
return 0;
|
2016-03-06 03:50:44 +00:00
|
|
|
}
|
2017-12-29 17:36:28 +00:00
|
|
|
if (s->statem.hand_state == TLS_ST_BEFORE
|
|
|
|
&& (s->s3->flags & TLS1_FLAGS_STATELESS) != 0) {
|
|
|
|
/*
|
|
|
|
* We are stateless and we received a CCS. Probably this is
|
|
|
|
* from a client between the first and second ClientHellos.
|
|
|
|
* We should ignore this, but return an error because we do
|
|
|
|
* not return success until we see the second ClientHello
|
|
|
|
* with a valid cookie.
|
|
|
|
*/
|
|
|
|
return 0;
|
|
|
|
}
|
2015-07-29 13:20:05 +00:00
|
|
|
s->s3->tmp.message_type = *mt = SSL3_MT_CHANGE_CIPHER_SPEC;
|
2016-10-26 09:43:34 +00:00
|
|
|
s->init_num = readbytes - 1;
|
2016-11-03 13:21:28 +00:00
|
|
|
s->init_msg = s->init_buf->data;
|
2016-10-26 09:43:34 +00:00
|
|
|
s->s3->tmp.message_size = readbytes;
|
2015-07-29 13:20:05 +00:00
|
|
|
return 1;
|
|
|
|
} else if (recvd_type != SSL3_RT_HANDSHAKE) {
|
2017-11-23 10:37:51 +00:00
|
|
|
SSLfatal(s, SSL_AD_UNEXPECTED_MESSAGE,
|
|
|
|
SSL_F_TLS_GET_MESSAGE_HEADER,
|
|
|
|
SSL_R_CCS_RECEIVED_EARLY);
|
|
|
|
return 0;
|
2015-03-27 23:01:51 +00:00
|
|
|
}
|
2016-10-26 09:43:34 +00:00
|
|
|
s->init_num += readbytes;
|
2015-07-29 13:20:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
skip_message = 0;
|
|
|
|
if (!s->server)
|
2017-01-10 23:02:28 +00:00
|
|
|
if (s->statem.hand_state != TLS_ST_OK
|
|
|
|
&& p[0] == SSL3_MT_HELLO_REQUEST)
|
2015-07-29 13:20:05 +00:00
|
|
|
/*
|
|
|
|
* The server may always send 'Hello Request' messages --
|
|
|
|
* we are doing a handshake anyway now, so ignore them if
|
|
|
|
* their format is correct. Does not count for 'Finished'
|
|
|
|
* MAC.
|
|
|
|
*/
|
|
|
|
if (p[1] == 0 && p[2] == 0 && p[3] == 0) {
|
|
|
|
s->init_num = 0;
|
|
|
|
skip_message = 1;
|
|
|
|
|
|
|
|
if (s->msg_callback)
|
|
|
|
s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE,
|
|
|
|
p, SSL3_HM_HEADER_LENGTH, s,
|
|
|
|
s->msg_callback_arg);
|
|
|
|
}
|
|
|
|
} while (skip_message);
|
|
|
|
/* s->init_num == SSL3_HM_HEADER_LENGTH */
|
|
|
|
|
|
|
|
*mt = *p;
|
|
|
|
s->s3->tmp.message_type = *(p++);
|
2015-03-27 23:01:51 +00:00
|
|
|
|
2016-06-28 22:18:50 +00:00
|
|
|
if (RECORD_LAYER_is_sslv2_record(&s->rlayer)) {
|
2015-07-29 13:20:05 +00:00
|
|
|
/*
|
|
|
|
* Only happens with SSLv3+ in an SSLv2 backward compatible
|
|
|
|
* ClientHello
|
2016-06-28 22:18:50 +00:00
|
|
|
*
|
|
|
|
* Total message size is the remaining record bytes to read
|
|
|
|
* plus the SSL3_HM_HEADER_LENGTH bytes that we already read
|
2015-07-29 13:20:05 +00:00
|
|
|
*/
|
|
|
|
l = RECORD_LAYER_get_rrec_length(&s->rlayer)
|
|
|
|
+ SSL3_HM_HEADER_LENGTH;
|
|
|
|
s->s3->tmp.message_size = l;
|
|
|
|
|
|
|
|
s->init_msg = s->init_buf->data;
|
|
|
|
s->init_num = SSL3_HM_HEADER_LENGTH;
|
|
|
|
} else {
|
|
|
|
n2l3(p, l);
|
|
|
|
/* BUF_MEM_grow takes an 'int' parameter */
|
|
|
|
if (l > (INT_MAX - SSL3_HM_HEADER_LENGTH)) {
|
2017-11-23 10:37:51 +00:00
|
|
|
SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_F_TLS_GET_MESSAGE_HEADER,
|
|
|
|
SSL_R_EXCESSIVE_MESSAGE_SIZE);
|
|
|
|
return 0;
|
2015-03-27 23:01:51 +00:00
|
|
|
}
|
2015-07-29 13:20:05 +00:00
|
|
|
s->s3->tmp.message_size = l;
|
|
|
|
|
|
|
|
s->init_msg = s->init_buf->data + SSL3_HM_HEADER_LENGTH;
|
|
|
|
s->init_num = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2016-09-06 11:05:25 +00:00
|
|
|
int tls_get_message_body(SSL *s, size_t *len)
|
2015-07-29 13:20:05 +00:00
|
|
|
{
|
2016-10-26 09:43:34 +00:00
|
|
|
size_t n, readbytes;
|
2015-07-29 13:20:05 +00:00
|
|
|
unsigned char *p;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (s->s3->tmp.message_type == SSL3_MT_CHANGE_CIPHER_SPEC) {
|
|
|
|
/* We've already read everything in */
|
|
|
|
*len = (unsigned long)s->init_num;
|
|
|
|
return 1;
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
p = s->init_msg;
|
|
|
|
n = s->s3->tmp.message_size - s->init_num;
|
|
|
|
while (n > 0) {
|
2015-05-11 08:35:41 +00:00
|
|
|
i = s->method->ssl_read_bytes(s, SSL3_RT_HANDSHAKE, NULL,
|
2016-10-26 09:43:34 +00:00
|
|
|
&p[s->init_num], n, 0, &readbytes);
|
2015-01-22 03:40:55 +00:00
|
|
|
if (i <= 0) {
|
|
|
|
s->rwstate = SSL_READING;
|
2015-07-29 13:20:05 +00:00
|
|
|
*len = 0;
|
|
|
|
return 0;
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
2016-10-26 09:43:34 +00:00
|
|
|
s->init_num += readbytes;
|
|
|
|
n -= readbytes;
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
2010-07-28 10:06:55 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
/*
|
|
|
|
* If receiving Finished, record MAC of prior handshake messages for
|
|
|
|
* Finished verification.
|
|
|
|
*/
|
2018-02-08 14:48:51 +00:00
|
|
|
if (*(s->init_buf->data) == SSL3_MT_FINISHED && !ssl3_take_mac(s)) {
|
|
|
|
/* SSLfatal() already called */
|
|
|
|
*len = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
2010-07-28 10:06:55 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
/* Feed this message into MAC computation. */
|
2016-06-28 22:18:50 +00:00
|
|
|
if (RECORD_LAYER_is_sslv2_record(&s->rlayer)) {
|
2016-06-18 14:46:13 +00:00
|
|
|
if (!ssl3_finish_mac(s, (unsigned char *)s->init_buf->data,
|
|
|
|
s->init_num)) {
|
2017-11-23 10:37:51 +00:00
|
|
|
/* SSLfatal() already called */
|
2016-06-18 14:46:13 +00:00
|
|
|
*len = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
2015-03-27 23:01:51 +00:00
|
|
|
if (s->msg_callback)
|
2016-08-05 17:03:17 +00:00
|
|
|
s->msg_callback(0, SSL2_VERSION, 0, s->init_buf->data,
|
2015-03-27 23:01:51 +00:00
|
|
|
(size_t)s->init_num, s, s->msg_callback_arg);
|
|
|
|
} else {
|
2017-03-13 15:21:15 +00:00
|
|
|
/*
|
|
|
|
* We defer feeding in the HRR until later. We'll do it as part of
|
|
|
|
* processing the message
|
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
|
|
|
* The TLsv1.3 handshake transcript stops at the ClientFinished
|
|
|
|
* message.
|
2017-03-13 15:21:15 +00:00
|
|
|
*/
|
2017-12-05 10:14:35 +00:00
|
|
|
#define SERVER_HELLO_RANDOM_OFFSET (SSL3_HM_HEADER_LENGTH + 2)
|
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
|
|
|
/* KeyUpdate and NewSessionTicket do not need to be added */
|
|
|
|
if (!SSL_IS_TLS13(s) || (s->s3->tmp.message_type != SSL3_MT_NEWSESSION_TICKET
|
|
|
|
&& s->s3->tmp.message_type != SSL3_MT_KEY_UPDATE)) {
|
|
|
|
if (s->s3->tmp.message_type != SSL3_MT_SERVER_HELLO
|
|
|
|
|| s->init_num < SERVER_HELLO_RANDOM_OFFSET + SSL3_RANDOM_SIZE
|
|
|
|
|| memcmp(hrrrandom,
|
|
|
|
s->init_buf->data + SERVER_HELLO_RANDOM_OFFSET,
|
|
|
|
SSL3_RANDOM_SIZE) != 0) {
|
|
|
|
if (!ssl3_finish_mac(s, (unsigned char *)s->init_buf->data,
|
|
|
|
s->init_num + SSL3_HM_HEADER_LENGTH)) {
|
|
|
|
/* SSLfatal() already called */
|
|
|
|
*len = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
2017-12-05 10:14:35 +00:00
|
|
|
}
|
2016-06-18 14:46:13 +00:00
|
|
|
}
|
2015-03-27 23:01:51 +00:00
|
|
|
if (s->msg_callback)
|
|
|
|
s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, s->init_buf->data,
|
|
|
|
(size_t)s->init_num + SSL3_HM_HEADER_LENGTH, s,
|
|
|
|
s->msg_callback_arg);
|
|
|
|
}
|
|
|
|
|
2016-09-06 11:05:25 +00:00
|
|
|
*len = s->init_num;
|
2015-07-29 13:20:05 +00:00
|
|
|
return 1;
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2018-03-28 19:34:16 +00:00
|
|
|
static const X509ERR2ALERT x509table[] = {
|
|
|
|
{X509_V_ERR_APPLICATION_VERIFICATION, SSL_AD_HANDSHAKE_FAILURE},
|
|
|
|
{X509_V_ERR_CA_KEY_TOO_SMALL, SSL_AD_BAD_CERTIFICATE},
|
|
|
|
{X509_V_ERR_CA_MD_TOO_WEAK, SSL_AD_BAD_CERTIFICATE},
|
|
|
|
{X509_V_ERR_CERT_CHAIN_TOO_LONG, SSL_AD_UNKNOWN_CA},
|
|
|
|
{X509_V_ERR_CERT_HAS_EXPIRED, SSL_AD_CERTIFICATE_EXPIRED},
|
|
|
|
{X509_V_ERR_CERT_NOT_YET_VALID, SSL_AD_BAD_CERTIFICATE},
|
|
|
|
{X509_V_ERR_CERT_REJECTED, SSL_AD_BAD_CERTIFICATE},
|
|
|
|
{X509_V_ERR_CERT_REVOKED, SSL_AD_CERTIFICATE_REVOKED},
|
|
|
|
{X509_V_ERR_CERT_SIGNATURE_FAILURE, SSL_AD_DECRYPT_ERROR},
|
|
|
|
{X509_V_ERR_CERT_UNTRUSTED, SSL_AD_BAD_CERTIFICATE},
|
|
|
|
{X509_V_ERR_CRL_HAS_EXPIRED, SSL_AD_CERTIFICATE_EXPIRED},
|
|
|
|
{X509_V_ERR_CRL_NOT_YET_VALID, SSL_AD_BAD_CERTIFICATE},
|
|
|
|
{X509_V_ERR_CRL_SIGNATURE_FAILURE, SSL_AD_DECRYPT_ERROR},
|
|
|
|
{X509_V_ERR_DANE_NO_MATCH, SSL_AD_BAD_CERTIFICATE},
|
|
|
|
{X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT, SSL_AD_UNKNOWN_CA},
|
|
|
|
{X509_V_ERR_EE_KEY_TOO_SMALL, SSL_AD_BAD_CERTIFICATE},
|
|
|
|
{X509_V_ERR_EMAIL_MISMATCH, SSL_AD_BAD_CERTIFICATE},
|
|
|
|
{X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD, SSL_AD_BAD_CERTIFICATE},
|
|
|
|
{X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD, SSL_AD_BAD_CERTIFICATE},
|
|
|
|
{X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD, SSL_AD_BAD_CERTIFICATE},
|
|
|
|
{X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD, SSL_AD_BAD_CERTIFICATE},
|
|
|
|
{X509_V_ERR_HOSTNAME_MISMATCH, SSL_AD_BAD_CERTIFICATE},
|
|
|
|
{X509_V_ERR_INVALID_CA, SSL_AD_UNKNOWN_CA},
|
|
|
|
{X509_V_ERR_INVALID_CALL, SSL_AD_INTERNAL_ERROR},
|
|
|
|
{X509_V_ERR_INVALID_PURPOSE, SSL_AD_UNSUPPORTED_CERTIFICATE},
|
|
|
|
{X509_V_ERR_IP_ADDRESS_MISMATCH, SSL_AD_BAD_CERTIFICATE},
|
|
|
|
{X509_V_ERR_OUT_OF_MEM, SSL_AD_INTERNAL_ERROR},
|
|
|
|
{X509_V_ERR_PATH_LENGTH_EXCEEDED, SSL_AD_UNKNOWN_CA},
|
|
|
|
{X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN, SSL_AD_UNKNOWN_CA},
|
|
|
|
{X509_V_ERR_STORE_LOOKUP, SSL_AD_INTERNAL_ERROR},
|
|
|
|
{X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY, SSL_AD_BAD_CERTIFICATE},
|
|
|
|
{X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE, SSL_AD_BAD_CERTIFICATE},
|
|
|
|
{X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE, SSL_AD_BAD_CERTIFICATE},
|
|
|
|
{X509_V_ERR_UNABLE_TO_GET_CRL, SSL_AD_UNKNOWN_CA},
|
|
|
|
{X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER, SSL_AD_UNKNOWN_CA},
|
|
|
|
{X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT, SSL_AD_UNKNOWN_CA},
|
|
|
|
{X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY, SSL_AD_UNKNOWN_CA},
|
|
|
|
{X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE, SSL_AD_UNKNOWN_CA},
|
|
|
|
{X509_V_ERR_UNSPECIFIED, SSL_AD_INTERNAL_ERROR},
|
|
|
|
|
|
|
|
/* Last entry; return this if we don't find the value above. */
|
|
|
|
{X509_V_OK, SSL_AD_CERTIFICATE_UNKNOWN}
|
|
|
|
};
|
|
|
|
|
|
|
|
int ssl_x509err2alert(int x509err)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
2018-03-28 19:34:16 +00:00
|
|
|
const X509ERR2ALERT *tp;
|
|
|
|
|
|
|
|
for (tp = x509table; tp->x509err != X509_V_OK; ++tp)
|
|
|
|
if (tp->x509err == x509err)
|
|
|
|
break;
|
|
|
|
return tp->alert;
|
2015-01-22 03:40:55 +00:00
|
|
|
}
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2013-12-15 13:32:24 +00:00
|
|
|
int ssl_allow_compression(SSL *s)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
if (s->options & SSL_OP_NO_COMPRESSION)
|
|
|
|
return 0;
|
|
|
|
return ssl_security(s, SSL_SECOP_COMPRESSION, 0, 0, NULL);
|
|
|
|
}
|
2015-12-29 08:24:17 +00:00
|
|
|
|
2016-02-07 19:07:21 +00:00
|
|
|
static int version_cmp(const SSL *s, int a, int b)
|
2015-12-29 08:24:17 +00:00
|
|
|
{
|
|
|
|
int dtls = SSL_IS_DTLS(s);
|
|
|
|
|
|
|
|
if (a == b)
|
|
|
|
return 0;
|
|
|
|
if (!dtls)
|
|
|
|
return a < b ? -1 : 1;
|
|
|
|
return DTLS_VERSION_LT(a, b) ? -1 : 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
int version;
|
2016-08-05 17:03:17 +00:00
|
|
|
const SSL_METHOD *(*cmeth) (void);
|
|
|
|
const SSL_METHOD *(*smeth) (void);
|
2015-12-29 08:24:17 +00:00
|
|
|
} version_info;
|
|
|
|
|
2016-10-21 16:39:33 +00:00
|
|
|
#if TLS_MAX_VERSION != TLS1_3_VERSION
|
|
|
|
# error Code needs update for TLS_method() support beyond TLS1_3_VERSION.
|
2015-12-29 08:24:17 +00:00
|
|
|
#endif
|
|
|
|
|
2017-03-22 08:52:54 +00:00
|
|
|
/* Must be in order high to low */
|
2015-12-29 08:24:17 +00:00
|
|
|
static const version_info tls_version_table[] = {
|
2016-10-21 16:39:33 +00:00
|
|
|
#ifndef OPENSSL_NO_TLS1_3
|
|
|
|
{TLS1_3_VERSION, tlsv1_3_client_method, tlsv1_3_server_method},
|
|
|
|
#else
|
|
|
|
{TLS1_3_VERSION, NULL, NULL},
|
|
|
|
#endif
|
2016-01-18 18:10:21 +00:00
|
|
|
#ifndef OPENSSL_NO_TLS1_2
|
2016-08-05 17:03:17 +00:00
|
|
|
{TLS1_2_VERSION, tlsv1_2_client_method, tlsv1_2_server_method},
|
2016-01-18 18:10:21 +00:00
|
|
|
#else
|
2016-08-05 17:03:17 +00:00
|
|
|
{TLS1_2_VERSION, NULL, NULL},
|
2016-01-18 18:10:21 +00:00
|
|
|
#endif
|
|
|
|
#ifndef OPENSSL_NO_TLS1_1
|
2016-08-05 17:03:17 +00:00
|
|
|
{TLS1_1_VERSION, tlsv1_1_client_method, tlsv1_1_server_method},
|
2016-01-18 18:10:21 +00:00
|
|
|
#else
|
2016-08-05 17:03:17 +00:00
|
|
|
{TLS1_1_VERSION, NULL, NULL},
|
2016-01-18 18:10:21 +00:00
|
|
|
#endif
|
|
|
|
#ifndef OPENSSL_NO_TLS1
|
2016-08-05 17:03:17 +00:00
|
|
|
{TLS1_VERSION, tlsv1_client_method, tlsv1_server_method},
|
2016-01-18 18:10:21 +00:00
|
|
|
#else
|
2016-08-05 17:03:17 +00:00
|
|
|
{TLS1_VERSION, NULL, NULL},
|
2016-01-18 18:10:21 +00:00
|
|
|
#endif
|
2015-12-29 08:24:17 +00:00
|
|
|
#ifndef OPENSSL_NO_SSL3
|
2016-08-05 17:03:17 +00:00
|
|
|
{SSL3_VERSION, sslv3_client_method, sslv3_server_method},
|
2016-01-18 18:10:21 +00:00
|
|
|
#else
|
2016-08-05 17:03:17 +00:00
|
|
|
{SSL3_VERSION, NULL, NULL},
|
2015-12-29 08:24:17 +00:00
|
|
|
#endif
|
2016-08-05 17:03:17 +00:00
|
|
|
{0, NULL, NULL},
|
2015-12-29 08:24:17 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
#if DTLS_MAX_VERSION != DTLS1_2_VERSION
|
|
|
|
# error Code needs update for DTLS_method() support beyond DTLS1_2_VERSION.
|
|
|
|
#endif
|
|
|
|
|
2017-03-22 08:52:54 +00:00
|
|
|
/* Must be in order high to low */
|
2015-12-29 08:24:17 +00:00
|
|
|
static const version_info dtls_version_table[] = {
|
2016-01-18 18:10:21 +00:00
|
|
|
#ifndef OPENSSL_NO_DTLS1_2
|
2016-08-05 17:03:17 +00:00
|
|
|
{DTLS1_2_VERSION, dtlsv1_2_client_method, dtlsv1_2_server_method},
|
2016-01-18 18:10:21 +00:00
|
|
|
#else
|
2016-08-05 17:03:17 +00:00
|
|
|
{DTLS1_2_VERSION, NULL, NULL},
|
2016-01-18 18:10:21 +00:00
|
|
|
#endif
|
|
|
|
#ifndef OPENSSL_NO_DTLS1
|
2016-08-05 17:03:17 +00:00
|
|
|
{DTLS1_VERSION, dtlsv1_client_method, dtlsv1_server_method},
|
|
|
|
{DTLS1_BAD_VER, dtls_bad_ver_client_method, NULL},
|
2016-01-18 18:10:21 +00:00
|
|
|
#else
|
2016-08-05 17:03:17 +00:00
|
|
|
{DTLS1_VERSION, NULL, NULL},
|
|
|
|
{DTLS1_BAD_VER, NULL, NULL},
|
2016-01-18 18:10:21 +00:00
|
|
|
#endif
|
2016-08-05 17:03:17 +00:00
|
|
|
{0, NULL, NULL},
|
2015-12-29 08:24:17 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* ssl_method_error - Check whether an SSL_METHOD is enabled.
|
|
|
|
*
|
|
|
|
* @s: The SSL handle for the candidate method
|
|
|
|
* @method: the intended method.
|
|
|
|
*
|
|
|
|
* Returns 0 on success, or an SSL error reason on failure.
|
|
|
|
*/
|
2016-02-07 19:07:21 +00:00
|
|
|
static int ssl_method_error(const SSL *s, const SSL_METHOD *method)
|
2015-12-29 08:24:17 +00:00
|
|
|
{
|
|
|
|
int version = method->version;
|
|
|
|
|
|
|
|
if ((s->min_proto_version != 0 &&
|
|
|
|
version_cmp(s, version, s->min_proto_version) < 0) ||
|
|
|
|
ssl_security(s, SSL_SECOP_VERSION, 0, version, NULL) == 0)
|
|
|
|
return SSL_R_VERSION_TOO_LOW;
|
|
|
|
|
|
|
|
if (s->max_proto_version != 0 &&
|
2016-08-05 17:03:17 +00:00
|
|
|
version_cmp(s, version, s->max_proto_version) > 0)
|
2015-12-29 08:24:17 +00:00
|
|
|
return SSL_R_VERSION_TOO_HIGH;
|
|
|
|
|
|
|
|
if ((s->options & method->mask) != 0)
|
|
|
|
return SSL_R_UNSUPPORTED_PROTOCOL;
|
|
|
|
if ((method->flags & SSL_METHOD_NO_SUITEB) != 0 && tls1_suiteb(s))
|
|
|
|
return SSL_R_AT_LEAST_TLS_1_2_NEEDED_IN_SUITEB_MODE;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-03-11 14:44:01 +00:00
|
|
|
/*
|
|
|
|
* ssl_version_supported - Check that the specified `version` is supported by
|
|
|
|
* `SSL *` instance
|
|
|
|
*
|
|
|
|
* @s: The SSL handle for the candidate method
|
|
|
|
* @version: Protocol version to test against
|
|
|
|
*
|
|
|
|
* Returns 1 when supported, otherwise 0
|
|
|
|
*/
|
|
|
|
int ssl_version_supported(const SSL *s, int version)
|
|
|
|
{
|
|
|
|
const version_info *vent;
|
|
|
|
const version_info *table;
|
|
|
|
|
|
|
|
switch (s->method->version) {
|
|
|
|
default:
|
|
|
|
/* Version should match method version for non-ANY method */
|
|
|
|
return version_cmp(s, version, s->version) == 0;
|
|
|
|
case TLS_ANY_VERSION:
|
|
|
|
table = tls_version_table;
|
|
|
|
break;
|
|
|
|
case DTLS_ANY_VERSION:
|
|
|
|
table = dtls_version_table;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (vent = table;
|
|
|
|
vent->version != 0 && version_cmp(s, version, vent->version) <= 0;
|
|
|
|
++vent) {
|
|
|
|
if (vent->cmeth != NULL &&
|
|
|
|
version_cmp(s, version, vent->version) == 0 &&
|
|
|
|
ssl_method_error(s, vent->cmeth()) == 0) {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-12-29 08:24:17 +00:00
|
|
|
/*
|
|
|
|
* ssl_check_version_downgrade - In response to RFC7507 SCSV version
|
|
|
|
* fallback indication from a client check whether we're using the highest
|
|
|
|
* supported protocol version.
|
|
|
|
*
|
|
|
|
* @s server SSL handle.
|
|
|
|
*
|
|
|
|
* Returns 1 when using the highest enabled version, 0 otherwise.
|
|
|
|
*/
|
|
|
|
int ssl_check_version_downgrade(SSL *s)
|
|
|
|
{
|
|
|
|
const version_info *vent;
|
|
|
|
const version_info *table;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check that the current protocol is the highest enabled version
|
|
|
|
* (according to s->ctx->method, as version negotiation may have changed
|
|
|
|
* s->method).
|
|
|
|
*/
|
|
|
|
if (s->version == s->ctx->method->version)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Apparently we're using a version-flexible SSL_METHOD (not at its
|
|
|
|
* highest protocol version).
|
|
|
|
*/
|
|
|
|
if (s->ctx->method->version == TLS_method()->version)
|
|
|
|
table = tls_version_table;
|
|
|
|
else if (s->ctx->method->version == DTLS_method()->version)
|
|
|
|
table = dtls_version_table;
|
|
|
|
else {
|
|
|
|
/* Unexpected state; fail closed. */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (vent = table; vent->version != 0; ++vent) {
|
2016-08-05 17:03:17 +00:00
|
|
|
if (vent->smeth != NULL && ssl_method_error(s, vent->smeth()) == 0)
|
2015-12-29 08:24:17 +00:00
|
|
|
return s->version == vent->version;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* ssl_set_version_bound - set an upper or lower bound on the supported (D)TLS
|
|
|
|
* protocols, provided the initial (D)TLS method is version-flexible. This
|
|
|
|
* function sanity-checks the proposed value and makes sure the method is
|
|
|
|
* version-flexible, then sets the limit if all is well.
|
|
|
|
*
|
|
|
|
* @method_version: The version of the current SSL_METHOD.
|
|
|
|
* @version: the intended limit.
|
|
|
|
* @bound: pointer to limit to be updated.
|
|
|
|
*
|
|
|
|
* Returns 1 on success, 0 on failure.
|
|
|
|
*/
|
|
|
|
int ssl_set_version_bound(int method_version, int version, int *bound)
|
|
|
|
{
|
2016-01-02 19:06:07 +00:00
|
|
|
if (version == 0) {
|
|
|
|
*bound = version;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2015-12-29 08:24:17 +00:00
|
|
|
/*-
|
|
|
|
* Restrict TLS methods to TLS protocol versions.
|
|
|
|
* Restrict DTLS methods to DTLS protocol versions.
|
|
|
|
* Note, DTLS version numbers are decreasing, use comparison macros.
|
|
|
|
*
|
|
|
|
* Note that for both lower-bounds we use explicit versions, not
|
|
|
|
* (D)TLS_MIN_VERSION. This is because we don't want to break user
|
|
|
|
* configurations. If the MIN (supported) version ever rises, the user's
|
|
|
|
* "floor" remains valid even if no longer available. We don't expect the
|
|
|
|
* MAX ceiling to ever get lower, so making that variable makes sense.
|
|
|
|
*/
|
|
|
|
switch (method_version) {
|
|
|
|
default:
|
|
|
|
/*
|
|
|
|
* XXX For fixed version methods, should we always fail and not set any
|
|
|
|
* bounds, always succeed and not set any bounds, or set the bounds and
|
|
|
|
* arrange to fail later if they are not met? At present fixed-version
|
|
|
|
* methods are not subject to controls that disable individual protocol
|
|
|
|
* versions.
|
|
|
|
*/
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
case TLS_ANY_VERSION:
|
|
|
|
if (version < SSL3_VERSION || version > TLS_MAX_VERSION)
|
|
|
|
return 0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case DTLS_ANY_VERSION:
|
|
|
|
if (DTLS_VERSION_GT(version, DTLS_MAX_VERSION) ||
|
2016-07-25 17:03:27 +00:00
|
|
|
DTLS_VERSION_LT(version, DTLS1_BAD_VER))
|
2015-12-29 08:24:17 +00:00
|
|
|
return 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
*bound = version;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2017-03-22 08:52:54 +00:00
|
|
|
static void check_for_downgrade(SSL *s, int vers, DOWNGRADE *dgrd)
|
|
|
|
{
|
|
|
|
if (vers == TLS1_2_VERSION
|
|
|
|
&& ssl_version_supported(s, TLS1_3_VERSION)) {
|
|
|
|
*dgrd = DOWNGRADE_TO_1_2;
|
|
|
|
} else if (!SSL_IS_DTLS(s) && vers < TLS1_2_VERSION
|
|
|
|
&& (ssl_version_supported(s, TLS1_2_VERSION)
|
|
|
|
|| ssl_version_supported(s, TLS1_3_VERSION))) {
|
|
|
|
*dgrd = DOWNGRADE_TO_1_1;
|
|
|
|
} else {
|
|
|
|
*dgrd = DOWNGRADE_NONE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-12-29 08:24:17 +00:00
|
|
|
/*
|
|
|
|
* ssl_choose_server_version - Choose server (D)TLS version. Called when the
|
|
|
|
* client HELLO is received to select the final server protocol version and
|
|
|
|
* the version specific method.
|
|
|
|
*
|
|
|
|
* @s: server SSL handle.
|
|
|
|
*
|
|
|
|
* Returns 0 on success or an SSL error reason number on failure.
|
|
|
|
*/
|
2017-03-22 08:52:54 +00:00
|
|
|
int ssl_choose_server_version(SSL *s, CLIENTHELLO_MSG *hello, DOWNGRADE *dgrd)
|
2015-12-29 08:24:17 +00:00
|
|
|
{
|
|
|
|
/*-
|
|
|
|
* With version-flexible methods we have an initial state with:
|
|
|
|
*
|
|
|
|
* s->method->version == (D)TLS_ANY_VERSION,
|
|
|
|
* s->version == (D)TLS_MAX_VERSION.
|
|
|
|
*
|
|
|
|
* So we detect version-flexible methods via the method version, not the
|
|
|
|
* handle version.
|
|
|
|
*/
|
|
|
|
int server_version = s->method->version;
|
2016-11-07 14:59:12 +00:00
|
|
|
int client_version = hello->legacy_version;
|
2015-12-29 08:24:17 +00:00
|
|
|
const version_info *vent;
|
|
|
|
const version_info *table;
|
|
|
|
int disabled = 0;
|
2016-10-22 23:41:11 +00:00
|
|
|
RAW_EXTENSION *suppversions;
|
2015-12-29 08:24:17 +00:00
|
|
|
|
2016-10-22 16:24:37 +00:00
|
|
|
s->client_version = client_version;
|
|
|
|
|
2015-12-29 08:24:17 +00:00
|
|
|
switch (server_version) {
|
|
|
|
default:
|
2017-01-30 16:16:28 +00:00
|
|
|
if (!SSL_IS_TLS13(s)) {
|
|
|
|
if (version_cmp(s, client_version, s->version) < 0)
|
|
|
|
return SSL_R_WRONG_SSL_VERSION;
|
2017-03-22 08:52:54 +00:00
|
|
|
*dgrd = DOWNGRADE_NONE;
|
2017-01-30 16:16:28 +00:00
|
|
|
/*
|
|
|
|
* If this SSL handle is not from a version flexible method we don't
|
|
|
|
* (and never did) check min/max FIPS or Suite B constraints. Hope
|
|
|
|
* that's OK. It is up to the caller to not choose fixed protocol
|
|
|
|
* versions they don't want. If not, then easy to fix, just return
|
|
|
|
* ssl_method_error(s, s->method)
|
|
|
|
*/
|
|
|
|
return 0;
|
|
|
|
}
|
2016-11-02 11:33:20 +00:00
|
|
|
/*
|
2017-01-30 16:16:28 +00:00
|
|
|
* Fall through if we are TLSv1.3 already (this means we must be after
|
|
|
|
* a HelloRetryRequest
|
2015-12-29 08:24:17 +00:00
|
|
|
*/
|
2017-05-11 14:21:37 +00:00
|
|
|
/* fall thru */
|
2015-12-29 08:24:17 +00:00
|
|
|
case TLS_ANY_VERSION:
|
|
|
|
table = tls_version_table;
|
|
|
|
break;
|
|
|
|
case DTLS_ANY_VERSION:
|
|
|
|
table = dtls_version_table;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2016-11-28 09:31:59 +00:00
|
|
|
suppversions = &hello->pre_proc_exts[TLSEXT_IDX_supported_versions];
|
2016-10-22 23:41:11 +00:00
|
|
|
|
2017-11-09 16:03:40 +00:00
|
|
|
/* If we did an HRR then supported versions is mandatory */
|
2017-11-13 11:24:51 +00:00
|
|
|
if (!suppversions->present && s->hello_retry_request != SSL_HRR_NONE)
|
2017-11-09 16:03:40 +00:00
|
|
|
return SSL_R_UNSUPPORTED_PROTOCOL;
|
|
|
|
|
2016-11-28 09:31:59 +00:00
|
|
|
if (suppversions->present && !SSL_IS_DTLS(s)) {
|
2016-10-22 23:41:11 +00:00
|
|
|
unsigned int candidate_vers = 0;
|
|
|
|
unsigned int best_vers = 0;
|
|
|
|
const SSL_METHOD *best_method = NULL;
|
|
|
|
PACKET versionslist;
|
|
|
|
|
2016-11-24 16:59:48 +00:00
|
|
|
suppversions->parsed = 1;
|
|
|
|
|
2016-10-31 17:05:20 +00:00
|
|
|
if (!PACKET_as_length_prefixed_1(&suppversions->data, &versionslist)) {
|
2016-10-22 23:41:11 +00:00
|
|
|
/* Trailing or invalid data? */
|
|
|
|
return SSL_R_LENGTH_MISMATCH;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (PACKET_get_net_2(&versionslist, &candidate_vers)) {
|
|
|
|
/* TODO(TLS1.3): Remove this before release */
|
|
|
|
if (candidate_vers == TLS1_3_VERSION_DRAFT)
|
|
|
|
candidate_vers = TLS1_3_VERSION;
|
2016-11-09 14:43:05 +00:00
|
|
|
/*
|
|
|
|
* TODO(TLS1.3): There is some discussion on the TLS list about
|
2017-02-17 22:13:26 +00:00
|
|
|
* whether to ignore versions <TLS1.2 in supported_versions. At the
|
2016-11-09 14:43:05 +00:00
|
|
|
* moment we honour them if present. To be reviewed later
|
|
|
|
*/
|
2016-10-22 23:41:11 +00:00
|
|
|
if (version_cmp(s, candidate_vers, best_vers) <= 0)
|
|
|
|
continue;
|
|
|
|
for (vent = table;
|
|
|
|
vent->version != 0 && vent->version != (int)candidate_vers;
|
2016-10-31 17:05:20 +00:00
|
|
|
++vent)
|
2016-11-01 00:37:23 +00:00
|
|
|
continue;
|
2016-11-02 11:15:08 +00:00
|
|
|
if (vent->version != 0 && vent->smeth != NULL) {
|
2016-10-22 23:41:11 +00:00
|
|
|
const SSL_METHOD *method;
|
|
|
|
|
|
|
|
method = vent->smeth();
|
|
|
|
if (ssl_method_error(s, method) == 0) {
|
|
|
|
best_vers = candidate_vers;
|
|
|
|
best_method = method;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (PACKET_remaining(&versionslist) != 0) {
|
|
|
|
/* Trailing data? */
|
|
|
|
return SSL_R_LENGTH_MISMATCH;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (best_vers > 0) {
|
2017-11-13 11:24:51 +00:00
|
|
|
if (s->hello_retry_request != SSL_HRR_NONE) {
|
2017-01-30 16:16:28 +00:00
|
|
|
/*
|
2017-11-09 16:03:40 +00:00
|
|
|
* This is after a HelloRetryRequest so we better check that we
|
|
|
|
* negotiated TLSv1.3
|
2017-01-30 16:16:28 +00:00
|
|
|
*/
|
|
|
|
if (best_vers != TLS1_3_VERSION)
|
|
|
|
return SSL_R_UNSUPPORTED_PROTOCOL;
|
|
|
|
return 0;
|
|
|
|
}
|
2017-03-22 08:52:54 +00:00
|
|
|
check_for_downgrade(s, best_vers, dgrd);
|
2016-10-22 23:41:11 +00:00
|
|
|
s->version = best_vers;
|
|
|
|
s->method = best_method;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return SSL_R_UNSUPPORTED_PROTOCOL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If the supported versions extension isn't present, then the highest
|
|
|
|
* version we can negotiate is TLSv1.2
|
|
|
|
*/
|
|
|
|
if (version_cmp(s, client_version, TLS1_3_VERSION) >= 0)
|
|
|
|
client_version = TLS1_2_VERSION;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* No supported versions extension, so we just use the version supplied in
|
|
|
|
* the ClientHello.
|
|
|
|
*/
|
2015-12-29 08:24:17 +00:00
|
|
|
for (vent = table; vent->version != 0; ++vent) {
|
|
|
|
const SSL_METHOD *method;
|
|
|
|
|
|
|
|
if (vent->smeth == NULL ||
|
|
|
|
version_cmp(s, client_version, vent->version) < 0)
|
|
|
|
continue;
|
|
|
|
method = vent->smeth();
|
|
|
|
if (ssl_method_error(s, method) == 0) {
|
2017-03-22 08:52:54 +00:00
|
|
|
check_for_downgrade(s, vent->version, dgrd);
|
2015-12-29 08:24:17 +00:00
|
|
|
s->version = vent->version;
|
|
|
|
s->method = method;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
disabled = 1;
|
|
|
|
}
|
|
|
|
return disabled ? SSL_R_UNSUPPORTED_PROTOCOL : SSL_R_VERSION_TOO_LOW;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* ssl_choose_client_version - Choose client (D)TLS version. Called when the
|
|
|
|
* server HELLO is received to select the final client protocol version and
|
|
|
|
* the version specific method.
|
|
|
|
*
|
|
|
|
* @s: client SSL handle.
|
|
|
|
* @version: The proposed version from the server's HELLO.
|
2017-11-03 16:38:48 +00:00
|
|
|
* @extensions: The extensions received
|
2015-12-29 08:24:17 +00:00
|
|
|
*
|
2017-11-23 13:11:42 +00:00
|
|
|
* Returns 1 on success or 0 on error.
|
2015-12-29 08:24:17 +00:00
|
|
|
*/
|
2017-11-03 16:38:48 +00:00
|
|
|
int ssl_choose_client_version(SSL *s, int version, RAW_EXTENSION *extensions)
|
2015-12-29 08:24:17 +00:00
|
|
|
{
|
|
|
|
const version_info *vent;
|
|
|
|
const version_info *table;
|
2017-03-22 11:50:32 +00:00
|
|
|
int highver = 0;
|
2017-11-03 16:38:48 +00:00
|
|
|
int origv;
|
2015-12-29 08:24:17 +00:00
|
|
|
|
2017-11-03 16:38:48 +00:00
|
|
|
origv = s->version;
|
|
|
|
s->version = version;
|
2016-11-07 13:48:07 +00:00
|
|
|
|
2017-11-03 16:38:48 +00:00
|
|
|
/* This will overwrite s->version if the extension is present */
|
|
|
|
if (!tls_parse_extension(s, TLSEXT_IDX_supported_versions,
|
|
|
|
SSL_EXT_TLS1_2_SERVER_HELLO
|
|
|
|
| SSL_EXT_TLS1_3_SERVER_HELLO, extensions,
|
|
|
|
NULL, 0)) {
|
|
|
|
s->version = origv;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-11-13 11:24:51 +00:00
|
|
|
if (s->hello_retry_request != SSL_HRR_NONE
|
|
|
|
&& s->version != TLS1_3_VERSION) {
|
2017-11-03 16:38:48 +00:00
|
|
|
s->version = origv;
|
2017-11-23 13:11:42 +00:00
|
|
|
SSLfatal(s, SSL_AD_PROTOCOL_VERSION, SSL_F_SSL_CHOOSE_CLIENT_VERSION,
|
|
|
|
SSL_R_WRONG_SSL_VERSION);
|
|
|
|
return 0;
|
2017-03-22 11:50:32 +00:00
|
|
|
}
|
|
|
|
|
2015-12-29 08:24:17 +00:00
|
|
|
switch (s->method->version) {
|
|
|
|
default:
|
2017-11-03 16:38:48 +00:00
|
|
|
if (s->version != s->method->version) {
|
|
|
|
s->version = origv;
|
2017-11-23 13:11:42 +00:00
|
|
|
SSLfatal(s, SSL_AD_PROTOCOL_VERSION,
|
|
|
|
SSL_F_SSL_CHOOSE_CLIENT_VERSION,
|
|
|
|
SSL_R_WRONG_SSL_VERSION);
|
|
|
|
return 0;
|
2017-03-22 11:50:32 +00:00
|
|
|
}
|
2015-12-29 08:24:17 +00:00
|
|
|
/*
|
|
|
|
* If this SSL handle is not from a version flexible method we don't
|
|
|
|
* (and never did) check min/max, FIPS or Suite B constraints. Hope
|
|
|
|
* that's OK. It is up to the caller to not choose fixed protocol
|
|
|
|
* versions they don't want. If not, then easy to fix, just return
|
|
|
|
* ssl_method_error(s, s->method)
|
|
|
|
*/
|
2017-11-23 13:11:42 +00:00
|
|
|
return 1;
|
2015-12-29 08:24:17 +00:00
|
|
|
case TLS_ANY_VERSION:
|
|
|
|
table = tls_version_table;
|
|
|
|
break;
|
|
|
|
case DTLS_ANY_VERSION:
|
|
|
|
table = dtls_version_table;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (vent = table; vent->version != 0; ++vent) {
|
|
|
|
const SSL_METHOD *method;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
if (vent->cmeth == NULL)
|
2017-03-22 11:50:32 +00:00
|
|
|
continue;
|
|
|
|
|
2017-11-03 16:38:48 +00:00
|
|
|
if (highver != 0 && s->version != vent->version)
|
2017-03-22 11:50:32 +00:00
|
|
|
continue;
|
2017-02-01 13:31:27 +00:00
|
|
|
|
2015-12-29 08:24:17 +00:00
|
|
|
method = vent->cmeth();
|
|
|
|
err = ssl_method_error(s, method);
|
2017-03-22 11:50:32 +00:00
|
|
|
if (err != 0) {
|
2017-11-03 16:38:48 +00:00
|
|
|
if (s->version == vent->version) {
|
|
|
|
s->version = origv;
|
2017-11-23 13:11:42 +00:00
|
|
|
SSLfatal(s, SSL_AD_PROTOCOL_VERSION,
|
|
|
|
SSL_F_SSL_CHOOSE_CLIENT_VERSION, err);
|
|
|
|
return 0;
|
2017-03-22 11:50:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (highver == 0)
|
|
|
|
highver = vent->version;
|
|
|
|
|
2017-11-03 16:38:48 +00:00
|
|
|
if (s->version != vent->version)
|
2017-03-22 11:50:32 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
#ifndef OPENSSL_NO_TLS13DOWNGRADE
|
|
|
|
/* Check for downgrades */
|
2017-11-03 16:38:48 +00:00
|
|
|
if (s->version == TLS1_2_VERSION && highver > s->version) {
|
|
|
|
if (memcmp(tls12downgrade,
|
|
|
|
s->s3->server_random + SSL3_RANDOM_SIZE
|
|
|
|
- sizeof(tls12downgrade),
|
|
|
|
sizeof(tls12downgrade)) == 0) {
|
|
|
|
s->version = origv;
|
|
|
|
SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER,
|
|
|
|
SSL_F_SSL_CHOOSE_CLIENT_VERSION,
|
|
|
|
SSL_R_INAPPROPRIATE_FALLBACK);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
} else if (!SSL_IS_DTLS(s)
|
|
|
|
&& s->version < TLS1_2_VERSION
|
|
|
|
&& highver > s->version) {
|
|
|
|
if (memcmp(tls11downgrade,
|
|
|
|
s->s3->server_random + SSL3_RANDOM_SIZE
|
|
|
|
- sizeof(tls11downgrade),
|
|
|
|
sizeof(tls11downgrade)) == 0) {
|
|
|
|
s->version = origv;
|
|
|
|
SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER,
|
|
|
|
SSL_F_SSL_CHOOSE_CLIENT_VERSION,
|
|
|
|
SSL_R_INAPPROPRIATE_FALLBACK);
|
|
|
|
return 0;
|
2017-03-22 11:50:32 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2015-12-29 08:24:17 +00:00
|
|
|
s->method = method;
|
2017-11-23 13:11:42 +00:00
|
|
|
return 1;
|
2015-12-29 08:24:17 +00:00
|
|
|
}
|
|
|
|
|
2017-11-03 16:38:48 +00:00
|
|
|
s->version = origv;
|
2017-11-23 13:11:42 +00:00
|
|
|
SSLfatal(s, SSL_AD_PROTOCOL_VERSION, SSL_F_SSL_CHOOSE_CLIENT_VERSION,
|
|
|
|
SSL_R_UNSUPPORTED_PROTOCOL);
|
|
|
|
return 0;
|
2015-12-29 08:24:17 +00:00
|
|
|
}
|
|
|
|
|
2016-02-07 19:07:21 +00:00
|
|
|
/*
|
2017-04-26 10:28:20 +00:00
|
|
|
* ssl_get_min_max_version - get minimum and maximum protocol version
|
2016-02-07 19:07:21 +00:00
|
|
|
* @s: The SSL connection
|
|
|
|
* @min_version: The minimum supported version
|
|
|
|
* @max_version: The maximum supported version
|
|
|
|
*
|
|
|
|
* Work out what version we should be using for the initial ClientHello if the
|
|
|
|
* version is initially (D)TLS_ANY_VERSION. We apply any explicit SSL_OP_NO_xxx
|
|
|
|
* options, the MinProtocol and MaxProtocol configuration commands, any Suite B
|
2017-02-28 11:30:28 +00:00
|
|
|
* constraints and any floor imposed by the security level here,
|
2016-02-07 19:07:21 +00:00
|
|
|
* so we don't advertise the wrong protocol version to only reject the outcome later.
|
2015-12-29 08:24:17 +00:00
|
|
|
*
|
2016-06-28 20:51:27 +00:00
|
|
|
* Computing the right floor matters. If, e.g., TLS 1.0 and 1.2 are enabled,
|
2015-12-29 08:24:17 +00:00
|
|
|
* TLS 1.1 is disabled, but the security level, Suite-B and/or MinProtocol
|
|
|
|
* only allow TLS 1.2, we want to advertise TLS1.2, *not* TLS1.
|
|
|
|
*
|
2016-02-07 19:07:21 +00:00
|
|
|
* Returns 0 on success or an SSL error reason number on failure. On failure
|
|
|
|
* min_version and max_version will also be set to 0.
|
2015-12-29 08:24:17 +00:00
|
|
|
*/
|
2017-04-26 10:28:20 +00:00
|
|
|
int ssl_get_min_max_version(const SSL *s, int *min_version, int *max_version)
|
2015-12-29 08:24:17 +00:00
|
|
|
{
|
|
|
|
int version;
|
|
|
|
int hole;
|
|
|
|
const SSL_METHOD *single = NULL;
|
|
|
|
const SSL_METHOD *method;
|
|
|
|
const version_info *table;
|
|
|
|
const version_info *vent;
|
|
|
|
|
|
|
|
switch (s->method->version) {
|
|
|
|
default:
|
|
|
|
/*
|
|
|
|
* If this SSL handle is not from a version flexible method we don't
|
|
|
|
* (and never did) check min/max FIPS or Suite B constraints. Hope
|
|
|
|
* that's OK. It is up to the caller to not choose fixed protocol
|
|
|
|
* versions they don't want. If not, then easy to fix, just return
|
|
|
|
* ssl_method_error(s, s->method)
|
|
|
|
*/
|
2016-02-07 19:07:21 +00:00
|
|
|
*min_version = *max_version = s->version;
|
2015-12-29 08:24:17 +00:00
|
|
|
return 0;
|
|
|
|
case TLS_ANY_VERSION:
|
|
|
|
table = tls_version_table;
|
|
|
|
break;
|
|
|
|
case DTLS_ANY_VERSION:
|
|
|
|
table = dtls_version_table;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* SSL_OP_NO_X disables all protocols above X *if* there are some protocols
|
|
|
|
* below X enabled. This is required in order to maintain the "version
|
|
|
|
* capability" vector contiguous. Any versions with a NULL client method
|
|
|
|
* (protocol version client is disabled at compile-time) is also a "hole".
|
|
|
|
*
|
|
|
|
* Our initial state is hole == 1, version == 0. That is, versions above
|
|
|
|
* the first version in the method table are disabled (a "hole" above
|
|
|
|
* the valid protocol entries) and we don't have a selected version yet.
|
|
|
|
*
|
|
|
|
* Whenever "hole == 1", and we hit an enabled method, its version becomes
|
|
|
|
* the selected version, and the method becomes a candidate "single"
|
|
|
|
* method. We're no longer in a hole, so "hole" becomes 0.
|
|
|
|
*
|
|
|
|
* If "hole == 0" and we hit an enabled method, then "single" is cleared,
|
|
|
|
* as we support a contiguous range of at least two methods. If we hit
|
|
|
|
* a disabled method, then hole becomes true again, but nothing else
|
|
|
|
* changes yet, because all the remaining methods may be disabled too.
|
|
|
|
* If we again hit an enabled method after the new hole, it becomes
|
|
|
|
* selected, as we start from scratch.
|
|
|
|
*/
|
2016-02-07 19:07:21 +00:00
|
|
|
*min_version = version = 0;
|
2015-12-29 08:24:17 +00:00
|
|
|
hole = 1;
|
|
|
|
for (vent = table; vent->version != 0; ++vent) {
|
|
|
|
/*
|
|
|
|
* A table entry with a NULL client method is still a hole in the
|
|
|
|
* "version capability" vector.
|
|
|
|
*/
|
|
|
|
if (vent->cmeth == NULL) {
|
|
|
|
hole = 1;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
method = vent->cmeth();
|
|
|
|
if (ssl_method_error(s, method) != 0) {
|
|
|
|
hole = 1;
|
|
|
|
} else if (!hole) {
|
|
|
|
single = NULL;
|
2016-02-07 19:07:21 +00:00
|
|
|
*min_version = method->version;
|
2015-12-29 08:24:17 +00:00
|
|
|
} else {
|
|
|
|
version = (single = method)->version;
|
2016-02-07 19:07:21 +00:00
|
|
|
*min_version = version;
|
2015-12-29 08:24:17 +00:00
|
|
|
hole = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-02-07 19:07:21 +00:00
|
|
|
*max_version = version;
|
|
|
|
|
2015-12-29 08:24:17 +00:00
|
|
|
/* Fail if everything is disabled */
|
|
|
|
if (version == 0)
|
|
|
|
return SSL_R_NO_PROTOCOLS_AVAILABLE;
|
|
|
|
|
2016-02-07 19:07:21 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* ssl_set_client_hello_version - Work out what version we should be using for
|
2016-11-23 13:56:15 +00:00
|
|
|
* the initial ClientHello.legacy_version field.
|
2016-02-07 19:07:21 +00:00
|
|
|
*
|
|
|
|
* @s: client SSL handle.
|
|
|
|
*
|
|
|
|
* Returns 0 on success or an SSL error reason number on failure.
|
|
|
|
*/
|
|
|
|
int ssl_set_client_hello_version(SSL *s)
|
|
|
|
{
|
2016-02-07 19:17:07 +00:00
|
|
|
int ver_min, ver_max, ret;
|
2016-02-07 19:07:21 +00:00
|
|
|
|
2018-04-23 16:14:47 +00:00
|
|
|
/*
|
|
|
|
* In a renegotiation we always send the same client_version that we sent
|
|
|
|
* last time, regardless of which version we eventually negotiated.
|
|
|
|
*/
|
|
|
|
if (!SSL_IS_FIRST_HANDSHAKE(s))
|
|
|
|
return 0;
|
|
|
|
|
2017-04-26 10:28:20 +00:00
|
|
|
ret = ssl_get_min_max_version(s, &ver_min, &ver_max);
|
2016-02-07 19:07:21 +00:00
|
|
|
|
|
|
|
if (ret != 0)
|
|
|
|
return ret;
|
|
|
|
|
2016-11-23 13:56:15 +00:00
|
|
|
s->version = ver_max;
|
|
|
|
|
|
|
|
/* TLS1.3 always uses TLS1.2 in the legacy_version field */
|
|
|
|
if (!SSL_IS_DTLS(s) && ver_max > TLS1_2_VERSION)
|
|
|
|
ver_max = TLS1_2_VERSION;
|
|
|
|
|
|
|
|
s->client_version = ver_max;
|
2015-12-29 08:24:17 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2017-02-01 17:10:45 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Checks a list of |groups| to determine if the |group_id| is in it. If it is
|
|
|
|
* and |checkallow| is 1 then additionally check if the group is allowed to be
|
|
|
|
* used. Returns 1 if the group is in the list (and allowed if |checkallow| is
|
|
|
|
* 1) or 0 otherwise.
|
|
|
|
*/
|
2017-02-14 15:57:50 +00:00
|
|
|
#ifndef OPENSSL_NO_EC
|
2017-09-22 15:06:52 +00:00
|
|
|
int check_in_list(SSL *s, uint16_t group_id, const uint16_t *groups,
|
2017-02-01 17:10:45 +00:00
|
|
|
size_t num_groups, int checkallow)
|
|
|
|
{
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
if (groups == NULL || num_groups == 0)
|
|
|
|
return 0;
|
|
|
|
|
2017-09-22 15:06:52 +00:00
|
|
|
for (i = 0; i < num_groups; i++) {
|
|
|
|
uint16_t group = groups[i];
|
|
|
|
|
|
|
|
if (group_id == group
|
2017-02-01 17:10:45 +00:00
|
|
|
&& (!checkallow
|
2017-09-22 15:06:52 +00:00
|
|
|
|| tls_curve_allowed(s, group, SSL_SECOP_CURVE_CHECK))) {
|
2017-03-21 21:30:21 +00:00
|
|
|
return 1;
|
2017-02-01 17:10:45 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-03-21 21:30:21 +00:00
|
|
|
return 0;
|
2017-02-01 17:10:45 +00:00
|
|
|
}
|
2017-02-14 15:57:50 +00:00
|
|
|
#endif
|
2017-03-13 15:21:15 +00:00
|
|
|
|
|
|
|
/* Replace ClientHello1 in the transcript hash with a synthetic message */
|
2017-09-11 14:43:56 +00:00
|
|
|
int create_synthetic_message_hash(SSL *s, const unsigned char *hashval,
|
|
|
|
size_t hashlen, const unsigned char *hrr,
|
|
|
|
size_t hrrlen)
|
2017-03-13 15:21:15 +00:00
|
|
|
{
|
2017-09-11 14:43:56 +00:00
|
|
|
unsigned char hashvaltmp[EVP_MAX_MD_SIZE];
|
2017-03-16 14:06:00 +00:00
|
|
|
unsigned char msghdr[SSL3_HM_HEADER_LENGTH];
|
|
|
|
|
|
|
|
memset(msghdr, 0, sizeof(msghdr));
|
2017-03-13 15:21:15 +00:00
|
|
|
|
2017-09-11 14:43:56 +00:00
|
|
|
if (hashval == NULL) {
|
|
|
|
hashval = hashvaltmp;
|
|
|
|
hashlen = 0;
|
|
|
|
/* Get the hash of the initial ClientHello */
|
|
|
|
if (!ssl3_digest_cached_records(s, 0)
|
|
|
|
|| !ssl_handshake_hash(s, hashvaltmp, sizeof(hashvaltmp),
|
|
|
|
&hashlen)) {
|
|
|
|
/* SSLfatal() already called */
|
|
|
|
return 0;
|
|
|
|
}
|
2017-03-13 15:21:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Reinitialise the transcript hash */
|
2017-11-21 17:18:43 +00:00
|
|
|
if (!ssl3_init_finished_mac(s)) {
|
|
|
|
/* SSLfatal() already called */
|
2017-03-13 15:21:15 +00:00
|
|
|
return 0;
|
2017-11-21 17:18:43 +00:00
|
|
|
}
|
2017-03-13 15:21:15 +00:00
|
|
|
|
|
|
|
/* Inject the synthetic message_hash message */
|
2017-03-16 14:06:00 +00:00
|
|
|
msghdr[0] = SSL3_MT_MESSAGE_HASH;
|
2017-11-11 21:23:12 +00:00
|
|
|
msghdr[SSL3_HM_HEADER_LENGTH - 1] = (unsigned char)hashlen;
|
2017-03-13 15:21:15 +00:00
|
|
|
if (!ssl3_finish_mac(s, msghdr, SSL3_HM_HEADER_LENGTH)
|
|
|
|
|| !ssl3_finish_mac(s, hashval, hashlen)) {
|
2017-11-21 17:18:43 +00:00
|
|
|
/* SSLfatal() already called */
|
2017-03-13 15:21:15 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-09-11 14:43:56 +00:00
|
|
|
/*
|
|
|
|
* Now re-inject the HRR and current message if appropriate (we just deleted
|
|
|
|
* it when we reinitialised the transcript hash above). Only necessary after
|
|
|
|
* receiving a ClientHello2 with a cookie.
|
|
|
|
*/
|
|
|
|
if (hrr != NULL
|
|
|
|
&& (!ssl3_finish_mac(s, hrr, hrrlen)
|
|
|
|
|| !ssl3_finish_mac(s, (unsigned char *)s->init_buf->data,
|
|
|
|
s->s3->tmp.message_size
|
|
|
|
+ SSL3_HM_HEADER_LENGTH))) {
|
|
|
|
/* SSLfatal() already called */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-03-13 15:21:15 +00:00
|
|
|
return 1;
|
|
|
|
}
|
2017-03-08 18:17:17 +00:00
|
|
|
|
|
|
|
static int ca_dn_cmp(const X509_NAME *const *a, const X509_NAME *const *b)
|
|
|
|
{
|
|
|
|
return X509_NAME_cmp(*a, *b);
|
|
|
|
}
|
|
|
|
|
2017-11-21 17:18:43 +00:00
|
|
|
int parse_ca_names(SSL *s, PACKET *pkt)
|
2017-03-08 18:17:17 +00:00
|
|
|
{
|
|
|
|
STACK_OF(X509_NAME) *ca_sk = sk_X509_NAME_new(ca_dn_cmp);
|
|
|
|
X509_NAME *xn = NULL;
|
|
|
|
PACKET cadns;
|
|
|
|
|
|
|
|
if (ca_sk == NULL) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_PARSE_CA_NAMES,
|
|
|
|
ERR_R_MALLOC_FAILURE);
|
|
|
|
goto err;
|
2017-03-08 18:17:17 +00:00
|
|
|
}
|
|
|
|
/* get the CA RDNs */
|
|
|
|
if (!PACKET_get_length_prefixed_2(pkt, &cadns)) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_DECODE_ERROR,SSL_F_PARSE_CA_NAMES,
|
|
|
|
SSL_R_LENGTH_MISMATCH);
|
|
|
|
goto err;
|
2017-03-08 18:17:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
while (PACKET_remaining(&cadns)) {
|
|
|
|
const unsigned char *namestart, *namebytes;
|
|
|
|
unsigned int name_len;
|
|
|
|
|
|
|
|
if (!PACKET_get_net_2(&cadns, &name_len)
|
|
|
|
|| !PACKET_get_bytes(&cadns, &namebytes, name_len)) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_F_PARSE_CA_NAMES,
|
|
|
|
SSL_R_LENGTH_MISMATCH);
|
|
|
|
goto err;
|
2017-03-08 18:17:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
namestart = namebytes;
|
|
|
|
if ((xn = d2i_X509_NAME(NULL, &namebytes, name_len)) == NULL) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_F_PARSE_CA_NAMES,
|
|
|
|
ERR_R_ASN1_LIB);
|
|
|
|
goto err;
|
2017-03-08 18:17:17 +00:00
|
|
|
}
|
|
|
|
if (namebytes != (namestart + name_len)) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_F_PARSE_CA_NAMES,
|
|
|
|
SSL_R_CA_DN_LENGTH_MISMATCH);
|
|
|
|
goto err;
|
2017-03-08 18:17:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!sk_X509_NAME_push(ca_sk, xn)) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_PARSE_CA_NAMES,
|
|
|
|
ERR_R_MALLOC_FAILURE);
|
2017-03-08 18:17:17 +00:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
xn = NULL;
|
|
|
|
}
|
|
|
|
|
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 = ca_sk;
|
2017-03-08 18:17:17 +00:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
err:
|
|
|
|
sk_X509_NAME_pop_free(ca_sk, X509_NAME_free);
|
|
|
|
X509_NAME_free(xn);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int construct_ca_names(SSL *s, WPACKET *pkt)
|
|
|
|
{
|
2017-03-20 18:33:54 +00:00
|
|
|
const STACK_OF(X509_NAME) *ca_sk = SSL_get0_CA_list(s);
|
2017-03-08 18:17:17 +00:00
|
|
|
|
|
|
|
/* Start sub-packet for client CA list */
|
2017-11-21 17:18:43 +00:00
|
|
|
if (!WPACKET_start_sub_packet_u16(pkt)) {
|
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_CONSTRUCT_CA_NAMES,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
2017-03-08 18:17:17 +00:00
|
|
|
return 0;
|
2017-11-21 17:18:43 +00:00
|
|
|
}
|
2017-03-08 18:17:17 +00:00
|
|
|
|
|
|
|
if (ca_sk != NULL) {
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < sk_X509_NAME_num(ca_sk); i++) {
|
|
|
|
unsigned char *namebytes;
|
|
|
|
X509_NAME *name = sk_X509_NAME_value(ca_sk, i);
|
|
|
|
int namelen;
|
|
|
|
|
|
|
|
if (name == NULL
|
|
|
|
|| (namelen = i2d_X509_NAME(name, NULL)) < 0
|
|
|
|
|| !WPACKET_sub_allocate_bytes_u16(pkt, namelen,
|
|
|
|
&namebytes)
|
|
|
|
|| i2d_X509_NAME(name, &namebytes) != namelen) {
|
2017-11-21 17:18:43 +00:00
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_CONSTRUCT_CA_NAMES,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
2017-03-08 18:17:17 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-11-21 17:18:43 +00:00
|
|
|
if (!WPACKET_close(pkt)) {
|
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_CONSTRUCT_CA_NAMES,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
2017-03-08 18:17:17 +00:00
|
|
|
return 0;
|
2017-11-21 17:18:43 +00:00
|
|
|
}
|
2017-03-08 18:17:17 +00:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
2017-06-16 18:23:47 +00:00
|
|
|
|
|
|
|
/* Create a buffer containing data to be signed for server key exchange */
|
2017-11-21 17:18:43 +00:00
|
|
|
size_t construct_key_exchange_tbs(SSL *s, unsigned char **ptbs,
|
2017-06-16 18:23:47 +00:00
|
|
|
const void *param, size_t paramlen)
|
|
|
|
{
|
|
|
|
size_t tbslen = 2 * SSL3_RANDOM_SIZE + paramlen;
|
|
|
|
unsigned char *tbs = OPENSSL_malloc(tbslen);
|
|
|
|
|
2017-11-21 17:18:43 +00:00
|
|
|
if (tbs == NULL) {
|
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_CONSTRUCT_KEY_EXCHANGE_TBS,
|
|
|
|
ERR_R_MALLOC_FAILURE);
|
2017-06-16 18:23:47 +00:00
|
|
|
return 0;
|
2017-11-21 17:18:43 +00:00
|
|
|
}
|
2017-06-16 18:23:47 +00:00
|
|
|
memcpy(tbs, s->s3->client_random, SSL3_RANDOM_SIZE);
|
|
|
|
memcpy(tbs + SSL3_RANDOM_SIZE, s->s3->server_random, SSL3_RANDOM_SIZE);
|
|
|
|
|
|
|
|
memcpy(tbs + SSL3_RANDOM_SIZE * 2, param, paramlen);
|
|
|
|
|
|
|
|
*ptbs = tbs;
|
|
|
|
return tbslen;
|
|
|
|
}
|
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
|
|
|
|
|
|
|
/*
|
|
|
|
* Saves the current handshake digest for Post-Handshake Auth,
|
|
|
|
* Done after ClientFinished is processed, done exactly once
|
|
|
|
*/
|
|
|
|
int tls13_save_handshake_digest_for_pha(SSL *s)
|
|
|
|
{
|
|
|
|
if (s->pha_dgst == NULL) {
|
|
|
|
if (!ssl3_digest_cached_records(s, 1))
|
|
|
|
/* SSLfatal() already called */
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
s->pha_dgst = EVP_MD_CTX_new();
|
|
|
|
if (s->pha_dgst == NULL) {
|
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR,
|
|
|
|
SSL_F_TLS13_SAVE_HANDSHAKE_DIGEST_FOR_PHA,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (!EVP_MD_CTX_copy_ex(s->pha_dgst,
|
|
|
|
s->s3->handshake_dgst)) {
|
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR,
|
|
|
|
SSL_F_TLS13_SAVE_HANDSHAKE_DIGEST_FOR_PHA,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Restores the Post-Handshake Auth handshake digest
|
|
|
|
* Done just before sending/processing the Cert Request
|
|
|
|
*/
|
|
|
|
int tls13_restore_handshake_digest_for_pha(SSL *s)
|
|
|
|
{
|
|
|
|
if (s->pha_dgst == NULL) {
|
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR,
|
|
|
|
SSL_F_TLS13_RESTORE_HANDSHAKE_DIGEST_FOR_PHA,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (!EVP_MD_CTX_copy_ex(s->s3->handshake_dgst,
|
|
|
|
s->pha_dgst)) {
|
|
|
|
SSLfatal(s, SSL_AD_INTERNAL_ERROR,
|
|
|
|
SSL_F_TLS13_RESTORE_HANDSHAKE_DIGEST_FOR_PHA,
|
|
|
|
ERR_R_INTERNAL_ERROR);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|