An executive decision has been taken to expose marshal private key as well

rides the libcrypto bump

5 files changed, 13 insertions, 9 deletions

diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list
index 80d6ae986c..33668f24c5 100644
--- a/src/lib/libcrypto/Symbols.list
+++ b/src/lib/libcrypto/Symbols.list
@@ -1452,6 +1452,7 @@ MD5_Update
 MLKEM_decap
 MLKEM_encap
 MLKEM_generate_key
+MLKEM_marshal_private_key
 MLKEM_marshal_public_key
 MLKEM_parse_private_key
 MLKEM_parse_public_key
diff --git a/src/lib/libcrypto/hidden/openssl/mlkem.h b/src/lib/libcrypto/hidden/openssl/mlkem.h
index 3807b3fa1e..e5f1fc0634 100644
--- a/src/lib/libcrypto/hidden/openssl/mlkem.h
+++ b/src/lib/libcrypto/hidden/openssl/mlkem.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mlkem.h,v 1.5 2025/08/14 15:48:48 beck Exp $ */
+/* $OpenBSD: mlkem.h,v 1.6 2025/08/19 21:37:08 tb Exp $ */
 /*
  * Copyright (c) 2025 Bob Beck <beck@openbsd.org>
  *
@@ -40,6 +40,7 @@ LCRYPTO_USED(MLKEM_encap);
 LCRYPTO_USED(MLKEM_decap);
 LCRYPTO_USED(MLKEM_marshal_public_key);
 LCRYPTO_USED(MLKEM_parse_public_key);
+LCRYPTO_USED(MLKEM_marshal_private_key);
 LCRYPTO_USED(MLKEM_parse_private_key);
 
 #endif /* _LIBCRYPTO_MLKEM_H */
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 <beck@obtuse.com>
  *
@@ -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 <beck@obtuse.com>
  *
@@ -210,6 +210,12 @@ 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
  * error or failure. |private_key| must be a new uninitialized key. |in_len|
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