diff options
| author | Daiki Ueno <ueno@gnu.org> | 2022-08-29 06:41:46 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2022-08-29 09:35:48 +0900 |
| commit | 12bd7e5337351473bcdf080a602b3336230e689e (patch) | |
| tree | 9aca9d9a346ed6534e3f01585c234f89d68afa0f /lib | |
| parent | 0278eb5358392dce0c9ee951e325191a388e937a (diff) | |
| download | gnutls-12bd7e5337351473bcdf080a602b3336230e689e.tar.gz | |
gnutls_session_channel_binding: perform check on "tls-exporter"
According to RFC9622 4.2, the "tls-exporter" channel binding is only
usable when the handshake is bound to a unique master secret. This
adds a check whether either TLS 1.3 or extended master secret
extension is negotiated.
Signed-off-by: Daiki Ueno <ueno@gnu.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/state.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/lib/state.c b/lib/state.c index ee72646128..9e16d99300 100644 --- a/lib/state.c +++ b/lib/state.c @@ -1369,7 +1369,7 @@ gnutls_session_channel_binding(gnutls_session_t session, if (cbtype == GNUTLS_CB_TLS_UNIQUE) { const version_entry_st *ver = get_version(session); if (unlikely(ver == NULL || ver->tls13_sem)) - return GNUTLS_E_INVALID_REQUEST; + return GNUTLS_E_CHANNEL_BINDING_NOT_AVAILABLE; cb->size = session->internals.cb_tls_unique_len; cb->data = gnutls_malloc(cb->size); @@ -1461,6 +1461,21 @@ gnutls_session_channel_binding(gnutls_session_t session, #define EXPORTER_CTX_DATA "" #define EXPORTER_CTX_LEN 0 + const version_entry_st *ver = get_version(session); + if (unlikely(ver == NULL)) { + return GNUTLS_E_CHANNEL_BINDING_NOT_AVAILABLE; + } + + /* "tls-exporter" channel binding is defined only when + * the TLS handshake results in unique master secrets, + * i.e., either TLS 1.3, or TLS 1.2 with extended + * master secret negotiated. + */ + if (!ver->tls13_sem && + gnutls_session_ext_master_secret_status(session) == 0) { + return GNUTLS_E_CHANNEL_BINDING_NOT_AVAILABLE; + } + cb->size = 32; cb->data = gnutls_malloc(cb->size); if (cb->data == NULL) |