From fe2206ea0ebbcabbfbe6889f6747287fae32b1fc Mon Sep 17 00:00:00 2001 From: tb <> Date: Tue, 19 Aug 2025 21:37:08 +0000 Subject: An executive decision has been taken to expose marshal private key as well rides the libcrypto bump --- src/lib/libcrypto/mlkem/mlkem.c | 3 ++- src/lib/libcrypto/mlkem/mlkem.h | 8 +++++++- src/lib/libcrypto/mlkem/mlkem_internal.h | 7 +------ 3 files changed, 10 insertions(+), 8 deletions(-) (limited to 'src/lib/libcrypto/mlkem') diff --git a/src/lib/libcrypto/mlkem/mlkem.c b/src/lib/libcrypto/mlkem/mlkem.c index bf53e5d77a..dcc73c2631 100644 --- a/src/lib/libcrypto/mlkem/mlkem.c +++ b/src/lib/libcrypto/mlkem/mlkem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mlkem.c,v 1.2 2025/08/14 16:04:01 beck Exp $ */ +/* $OpenBSD: mlkem.c,v 1.3 2025/08/19 21:37:08 tb Exp $ */ /* * Copyright (c) 2025, Bob Beck * @@ -358,6 +358,7 @@ MLKEM_marshal_private_key(const MLKEM_private_key *private_key, uint8_t **out, return 0; } } +LCRYPTO_ALIAS(MLKEM_marshal_private_key); int MLKEM_parse_public_key(MLKEM_public_key *public_key, const uint8_t *in, diff --git a/src/lib/libcrypto/mlkem/mlkem.h b/src/lib/libcrypto/mlkem/mlkem.h index 31d4858195..dac3cf24de 100644 --- a/src/lib/libcrypto/mlkem/mlkem.h +++ b/src/lib/libcrypto/mlkem/mlkem.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mlkem.h,v 1.7 2025/08/14 15:48:48 beck Exp $ */ +/* $OpenBSD: mlkem.h,v 1.8 2025/08/19 21:37:08 tb Exp $ */ /* * Copyright (c) 2025 Bob Beck * @@ -209,6 +209,12 @@ int MLKEM_marshal_public_key(const MLKEM_public_key *public_key, uint8_t **out, int MLKEM_parse_public_key(MLKEM_public_key *public_key, const uint8_t *in, size_t in_len); +/* + * Marshals a private key to encoded format, used for NIST tests. + */ +int MLKEM_marshal_private_key(const MLKEM_private_key *private_key, + uint8_t **out, size_t *out_len); + /* * MLKEM_parse_private_key parses a private key, in the format generated by * |MLKEM_marshal_private_key|, from |in|. It returns one on success or zero on diff --git a/src/lib/libcrypto/mlkem/mlkem_internal.h b/src/lib/libcrypto/mlkem/mlkem_internal.h index 776f8aac17..7e6c313aa9 100644 --- a/src/lib/libcrypto/mlkem/mlkem_internal.h +++ b/src/lib/libcrypto/mlkem/mlkem_internal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mlkem_internal.h,v 1.8 2025/08/14 15:48:48 beck Exp $ */ +/* $OpenBSD: mlkem_internal.h,v 1.9 2025/08/19 21:37:08 tb Exp $ */ /* * Copyright (c) 2023, Google Inc. * @@ -58,11 +58,6 @@ int MLKEM_generate_key_external_entropy(MLKEM_private_key *private_key, uint8_t **out_encoded_public_key, size_t *out_encoded_public_key_len, const uint8_t *entropy); -/* - * Marshals a private key to encoded format, used for NIST tests. - */ -int MLKEM_marshal_private_key(const MLKEM_private_key *private_key, - uint8_t **out, size_t *out_len); /* * ML-KEM-768 -- cgit v1.2.3-55-g6feb