diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libssl/tls13_handshake.c | 8 | ||||
| -rw-r--r-- | src/lib/libssl/tls13_handshake.h | 4 | ||||
| -rw-r--r-- | src/lib/libssl/tls13_internal.h | 4 | ||||
| -rw-r--r-- | src/lib/libssl/tls13_server.c | 14 |
4 files changed, 4 insertions, 26 deletions
diff --git a/src/lib/libssl/tls13_handshake.c b/src/lib/libssl/tls13_handshake.c index 677fca3cf3..51585d31ba 100644 --- a/src/lib/libssl/tls13_handshake.c +++ b/src/lib/libssl/tls13_handshake.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: tls13_handshake.c,v 1.51 2020/02/05 16:42:29 jsing Exp $ */ | 1 | /* $OpenBSD: tls13_handshake.c,v 1.52 2020/03/10 17:15:02 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2018-2019 Theo Buehler <tb@openbsd.org> | 3 | * Copyright (c) 2018-2019 Theo Buehler <tb@openbsd.org> |
| 4 | * Copyright (c) 2019 Joel Sing <jsing@openbsd.org> | 4 | * Copyright (c) 2019 Joel Sing <jsing@openbsd.org> |
| @@ -89,12 +89,6 @@ struct tls13_handshake_action state_machine[] = { | |||
| 89 | .sent = tls13_client_finished_sent, | 89 | .sent = tls13_client_finished_sent, |
| 90 | .recv = tls13_client_finished_recv, | 90 | .recv = tls13_client_finished_recv, |
| 91 | }, | 91 | }, |
| 92 | [CLIENT_KEY_UPDATE] = { | ||
| 93 | .handshake_type = TLS13_MT_KEY_UPDATE, | ||
| 94 | .sender = TLS13_HS_CLIENT, | ||
| 95 | .send = tls13_client_key_update_send, | ||
| 96 | .recv = tls13_client_key_update_recv, | ||
| 97 | }, | ||
| 98 | [SERVER_HELLO] = { | 92 | [SERVER_HELLO] = { |
| 99 | .handshake_type = TLS13_MT_SERVER_HELLO, | 93 | .handshake_type = TLS13_MT_SERVER_HELLO, |
| 100 | .sender = TLS13_HS_SERVER, | 94 | .sender = TLS13_HS_SERVER, |
diff --git a/src/lib/libssl/tls13_handshake.h b/src/lib/libssl/tls13_handshake.h index 9910dab106..956d27c61a 100644 --- a/src/lib/libssl/tls13_handshake.h +++ b/src/lib/libssl/tls13_handshake.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: tls13_handshake.h,v 1.3 2019/04/05 20:23:38 tb Exp $ */ | 1 | /* $OpenBSD: tls13_handshake.h,v 1.4 2020/03/10 17:15:02 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2019 Theo Buehler <tb@openbsd.org> | 3 | * Copyright (c) 2019 Theo Buehler <tb@openbsd.org> |
| 4 | * | 4 | * |
| @@ -45,8 +45,6 @@ enum tls13_message_type { | |||
| 45 | CLIENT_CERTIFICATE, | 45 | CLIENT_CERTIFICATE, |
| 46 | CLIENT_CERTIFICATE_VERIFY, | 46 | CLIENT_CERTIFICATE_VERIFY, |
| 47 | CLIENT_FINISHED, | 47 | CLIENT_FINISHED, |
| 48 | CLIENT_KEY_UPDATE, | ||
| 49 | SERVER_NEW_SESSION_TICKET, | ||
| 50 | APPLICATION_DATA, | 48 | APPLICATION_DATA, |
| 51 | TLS13_NUM_MESSAGE_TYPES, | 49 | TLS13_NUM_MESSAGE_TYPES, |
| 52 | }; | 50 | }; |
diff --git a/src/lib/libssl/tls13_internal.h b/src/lib/libssl/tls13_internal.h index 76b1ebf914..053a7972a0 100644 --- a/src/lib/libssl/tls13_internal.h +++ b/src/lib/libssl/tls13_internal.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: tls13_internal.h,v 1.60 2020/02/05 16:42:29 jsing Exp $ */ | 1 | /* $OpenBSD: tls13_internal.h,v 1.61 2020/03/10 17:15:02 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2018 Bob Beck <beck@openbsd.org> | 3 | * Copyright (c) 2018 Bob Beck <beck@openbsd.org> |
| 4 | * Copyright (c) 2018 Theo Buehler <tb@openbsd.org> | 4 | * Copyright (c) 2018 Theo Buehler <tb@openbsd.org> |
| @@ -304,8 +304,6 @@ int tls13_client_certificate_verify_recv(struct tls13_ctx *ctx, CBS *cbs); | |||
| 304 | int tls13_client_finished_recv(struct tls13_ctx *ctx, CBS *cbs); | 304 | int tls13_client_finished_recv(struct tls13_ctx *ctx, CBS *cbs); |
| 305 | int tls13_client_finished_send(struct tls13_ctx *ctx, CBB *cbb); | 305 | int tls13_client_finished_send(struct tls13_ctx *ctx, CBB *cbb); |
| 306 | int tls13_client_finished_sent(struct tls13_ctx *ctx); | 306 | int tls13_client_finished_sent(struct tls13_ctx *ctx); |
| 307 | int tls13_client_key_update_send(struct tls13_ctx *ctx, CBB *cbb); | ||
| 308 | int tls13_client_key_update_recv(struct tls13_ctx *ctx, CBS *cbs); | ||
| 309 | int tls13_server_hello_recv(struct tls13_ctx *ctx, CBS *cbs); | 307 | int tls13_server_hello_recv(struct tls13_ctx *ctx, CBS *cbs); |
| 310 | int tls13_server_hello_send(struct tls13_ctx *ctx, CBB *cbb); | 308 | int tls13_server_hello_send(struct tls13_ctx *ctx, CBB *cbb); |
| 311 | int tls13_server_hello_sent(struct tls13_ctx *ctx); | 309 | int tls13_server_hello_sent(struct tls13_ctx *ctx); |
diff --git a/src/lib/libssl/tls13_server.c b/src/lib/libssl/tls13_server.c index eb865bcfb1..edffd45239 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.26 2020/02/23 17:51:36 tb Exp $ */ | 1 | /* $OpenBSD: tls13_server.c,v 1.27 2020/03/10 17:15:02 jsing 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> |
| @@ -488,18 +488,6 @@ tls13_client_certificate_verify_recv(struct tls13_ctx *ctx, CBS *cbs) | |||
| 488 | return ret; | 488 | return ret; |
| 489 | } | 489 | } |
| 490 | 490 | ||
| 491 | int | ||
| 492 | tls13_client_key_update_send(struct tls13_ctx *ctx, CBB *cbb) | ||
| 493 | { | ||
| 494 | return 0; | ||
| 495 | } | ||
| 496 | |||
| 497 | int | ||
| 498 | tls13_client_key_update_recv(struct tls13_ctx *ctx, CBS *cbs) | ||
| 499 | { | ||
| 500 | return 0; | ||
| 501 | } | ||
| 502 | |||
| 503 | static int | 491 | static int |
| 504 | tls13_server_hello_build(struct tls13_ctx *ctx, CBB *cbb) | 492 | tls13_server_hello_build(struct tls13_ctx *ctx, CBB *cbb) |
| 505 | { | 493 | { |
