diff options
| author | beck <> | 2025-12-04 21:03:42 +0000 |
|---|---|---|
| committer | beck <> | 2025-12-04 21:03:42 +0000 |
| commit | f8fcf556caab3fb1fb9d9b496d2724345c90a3eb (patch) | |
| tree | e39a46d0520e4b766125513ea7a2a2e6521f7cf6 /src/lib/libssl/tls_internal.h | |
| parent | 25e047ad935a9d585bc84fe9aae3de40dbad3e72 (diff) | |
| download | openbsd-f8fcf556caab3fb1fb9d9b496d2724345c90a3eb.tar.gz openbsd-f8fcf556caab3fb1fb9d9b496d2724345c90a3eb.tar.bz2 openbsd-f8fcf556caab3fb1fb9d9b496d2724345c90a3eb.zip | |
Add a MLKEM768_X25519 hybrid key share.
This implements the currently in use MLKEM768_X25519 hybrid
key share as outlined in
https://datatracker.ietf.org/doc/draft-ietf-tls-ecdhe-mlkem/
This commit does not yet wire this up to anything, that is done
in follow on changes.
ok tb@ jsing@ kenjiro@
Diffstat (limited to 'src/lib/libssl/tls_internal.h')
| -rw-r--r-- | src/lib/libssl/tls_internal.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/libssl/tls_internal.h b/src/lib/libssl/tls_internal.h index 84edde8474..3d8d6aa940 100644 --- a/src/lib/libssl/tls_internal.h +++ b/src/lib/libssl/tls_internal.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: tls_internal.h,v 1.10 2022/11/10 18:06:37 jsing Exp $ */ | 1 | /* $OpenBSD: tls_internal.h,v 1.11 2025/12/04 21:03:42 beck Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2018, 2019, 2021 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2018, 2019, 2021 Joel Sing <jsing@openbsd.org> |
| 4 | * | 4 | * |
| @@ -85,12 +85,15 @@ int tls_key_share_nid(struct tls_key_share *ks); | |||
| 85 | void tls_key_share_set_key_bits(struct tls_key_share *ks, size_t key_bits); | 85 | void tls_key_share_set_key_bits(struct tls_key_share *ks, size_t key_bits); |
| 86 | int tls_key_share_set_dh_params(struct tls_key_share *ks, DH *dh_params); | 86 | int tls_key_share_set_dh_params(struct tls_key_share *ks, DH *dh_params); |
| 87 | int tls_key_share_peer_pkey(struct tls_key_share *ks, EVP_PKEY *pkey); | 87 | int tls_key_share_peer_pkey(struct tls_key_share *ks, EVP_PKEY *pkey); |
| 88 | int tls_key_share_generate(struct tls_key_share *ks); | 88 | int tls_key_share_client_generate(struct tls_key_share *ks); |
| 89 | int tls_key_share_server_generate(struct tls_key_share *ks); | ||
| 89 | int tls_key_share_params(struct tls_key_share *ks, CBB *cbb); | 90 | int tls_key_share_params(struct tls_key_share *ks, CBB *cbb); |
| 90 | int tls_key_share_public(struct tls_key_share *ks, CBB *cbb); | 91 | int tls_key_share_public(struct tls_key_share *ks, CBB *cbb); |
| 91 | int tls_key_share_peer_params(struct tls_key_share *ks, CBS *cbs, | 92 | int tls_key_share_peer_params(struct tls_key_share *ks, CBS *cbs, |
| 92 | int *decode_error, int *invalid_params); | 93 | int *decode_error, int *invalid_params); |
| 93 | int tls_key_share_peer_public(struct tls_key_share *ks, CBS *cbs, | 94 | int tls_key_share_server_peer_public(struct tls_key_share *ks, CBS *cbs, |
| 95 | int *decode_error, int *invalid_key); | ||
| 96 | int tls_key_share_client_peer_public(struct tls_key_share *ks, CBS *cbs, | ||
| 94 | int *decode_error, int *invalid_key); | 97 | int *decode_error, int *invalid_key); |
| 95 | int tls_key_share_derive(struct tls_key_share *ks, uint8_t **shared_key, | 98 | int tls_key_share_derive(struct tls_key_share *ks, uint8_t **shared_key, |
| 96 | size_t *shared_key_len); | 99 | size_t *shared_key_len); |
