diff options
author | tb <> | 2020-02-23 17:51:36 +0000 |
---|---|---|
committer | tb <> | 2020-02-23 17:51:36 +0000 |
commit | 641bad64221cf40474fb5635d7910da49791255c (patch) | |
tree | ac8f05626bfd1391153419122e8064d99bedcc36 /src | |
parent | ee3fd3389c54d5a01b831fd265d4cd8ec65e25cd (diff) | |
download | openbsd-641bad64221cf40474fb5635d7910da49791255c.tar.gz openbsd-641bad64221cf40474fb5635d7910da49791255c.tar.bz2 openbsd-641bad64221cf40474fb5635d7910da49791255c.zip |
According to RFC 8446, Section 4.4.4, recipients of incorrect Finished
messages must terminate the connection with a decrypt_error alert, so
replace the use of the deprecated decryption_failed alert accordingly.
ok beck inoguchi jsing
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libssl/tls13_client.c | 4 | ||||
-rw-r--r-- | src/lib/libssl/tls13_server.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libssl/tls13_client.c b/src/lib/libssl/tls13_client.c index e9eee19bff..1c9debc4e5 100644 --- a/src/lib/libssl/tls13_client.c +++ b/src/lib/libssl/tls13_client.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tls13_client.c,v 1.44 2020/02/18 16:12:14 tb Exp $ */ | 1 | /* $OpenBSD: tls13_client.c,v 1.45 2020/02/23 17:51:36 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -868,7 +868,7 @@ tls13_server_finished_recv(struct tls13_ctx *ctx, CBS *cbs) | |||
868 | goto err; | 868 | goto err; |
869 | 869 | ||
870 | if (!CBS_mem_equal(cbs, verify_data, verify_data_len)) { | 870 | if (!CBS_mem_equal(cbs, verify_data, verify_data_len)) { |
871 | ctx->alert = TLS1_AD_DECRYPTION_FAILED; | 871 | ctx->alert = TLS1_AD_DECRYPT_ERROR; |
872 | goto err; | 872 | goto err; |
873 | } | 873 | } |
874 | 874 | ||
diff --git a/src/lib/libssl/tls13_server.c b/src/lib/libssl/tls13_server.c index bb06b0f398..eb865bcfb1 100644 --- a/src/lib/libssl/tls13_server.c +++ b/src/lib/libssl/tls13_server.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tls13_server.c,v 1.25 2020/02/18 16:12:14 tb Exp $ */ | 1 | /* $OpenBSD: tls13_server.c,v 1.26 2020/02/23 17:51:36 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2019, 2020 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2019, 2020 Joel Sing <jsing@openbsd.org> |
4 | * Copyright (c) 2020 Bob Beck <beck@openbsd.org> | 4 | * Copyright (c) 2020 Bob Beck <beck@openbsd.org> |
@@ -893,7 +893,7 @@ tls13_client_finished_recv(struct tls13_ctx *ctx, CBS *cbs) | |||
893 | goto err; | 893 | goto err; |
894 | 894 | ||
895 | if (!CBS_mem_equal(cbs, verify_data, verify_data_len)) { | 895 | if (!CBS_mem_equal(cbs, verify_data, verify_data_len)) { |
896 | ctx->alert = TLS1_AD_DECRYPTION_FAILED; | 896 | ctx->alert = TLS1_AD_DECRYPT_ERROR; |
897 | goto err; | 897 | goto err; |
898 | } | 898 | } |
899 | 899 | ||