diff options
| author | Benjamin Kaduk <bkaduk@akamai.com> | 2018-01-11 11:47:12 -0600 |
|---|---|---|
| committer | Benjamin Kaduk <bkaduk@akamai.com> | 2018-01-25 12:57:22 -0600 |
| commit | c589c34e619c8700ab16b152dd9c8ee58356b319 (patch) | |
| tree | a2e3f758062721c082f0d836040b80c37bad329a /include | |
| parent | a6419d1ed873a94bce99ae2b880885b8780d6eb9 (diff) | |
Add support for the TLS 1.3 signature_algorithms_cert extension
The new extension is like signature_algorithms, but only for the
signature *on* the certificate we will present to the peer (the
old signature_algorithms extension is still used for signatures that
we *generate*, i.e., those over TLS data structures).
We do not need to generate this extension, since we are the same
implementation as our X.509 stack and can handle the same types
of signatures, but we need to be prepared to receive it, and use the received
information when selecting what certificate to present.
There is a lot of interplay between signature_algorithms_cert and
signature_algorithms, since both affect what certificate we can
use, and thus the resulting signature algorithm used for TLS messages.
So, apply signature_algorithms_cert (if present) as a filter on what
certificates we can consider when choosing a certificate+sigalg
pair.
As part of this addition, we also remove the fallback code that let
keys of type EVP_PKEY_RSA be used to generate RSA-PSS signatures -- the
new rsa_pss_pss_* and rsa_pss_rsae_* signature schemes have pulled
the key type into what is covered by the signature algorithm, so
we should not apply this sort of compatibility workaround.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5068)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/sslerr.h | 3 | ||||
| -rw-r--r-- | include/openssl/tls1.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h index 2431b492d1..ec81ba3f03 100644 --- a/include/openssl/sslerr.h +++ b/include/openssl/sslerr.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -364,6 +364,7 @@ int ERR_load_SSL_strings(void); # define SSL_F_TLS_PARSE_CTOS_SERVER_NAME 573 # define SSL_F_TLS_PARSE_CTOS_SESSION_TICKET 574 # define SSL_F_TLS_PARSE_CTOS_SIG_ALGS 575 +# define SSL_F_TLS_PARSE_CTOS_SIG_ALGS_CERT 615 # define SSL_F_TLS_PARSE_CTOS_SRP 576 # define SSL_F_TLS_PARSE_CTOS_STATUS_REQUEST 577 # define SSL_F_TLS_PARSE_CTOS_SUPPORTED_GROUPS 578 diff --git a/include/openssl/tls1.h b/include/openssl/tls1.h index 500a6374b9..434e327f76 100644 --- a/include/openssl/tls1.h +++ b/include/openssl/tls1.h @@ -146,6 +146,7 @@ extern "C" { # define TLSEXT_TYPE_cookie 44 # define TLSEXT_TYPE_psk_kex_modes 45 # define TLSEXT_TYPE_certificate_authorities 47 +# define TLSEXT_TYPE_signature_algorithms_cert 50 # define TLSEXT_TYPE_key_share 51 /* Temporary extension type */ |