diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/libcrypto/hidden/crypto_namespace.h | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/hidden/openssl/mlkem.h | 40 |
2 files changed, 23 insertions, 23 deletions
diff --git a/src/lib/libcrypto/hidden/crypto_namespace.h b/src/lib/libcrypto/hidden/crypto_namespace.h index 741ad08549..43c8718ed0 100644 --- a/src/lib/libcrypto/hidden/crypto_namespace.h +++ b/src/lib/libcrypto/hidden/crypto_namespace.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: crypto_namespace.h,v 1.4 2024/07/11 21:31:52 miod Exp $ */ | 1 | /* $OpenBSD: crypto_namespace.h,v 1.5 2025/08/18 16:00:05 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2016 Philip Guenther <guenther@openbsd.org> | 3 | * Copyright (c) 2016 Philip Guenther <guenther@openbsd.org> |
4 | * | 4 | * |
@@ -45,7 +45,11 @@ | |||
45 | # define LCRYPTO_UNUSED(x) | 45 | # define LCRYPTO_UNUSED(x) |
46 | # define LCRYPTO_USED(x) | 46 | # define LCRYPTO_USED(x) |
47 | # define LCRYPTO_ALIAS1(pre,x) | 47 | # define LCRYPTO_ALIAS1(pre,x) |
48 | #ifdef _MSC_VER | ||
49 | # define LCRYPTO_ALIAS(x) | ||
50 | #else | ||
48 | # define LCRYPTO_ALIAS(x) asm("") | 51 | # define LCRYPTO_ALIAS(x) asm("") |
52 | #endif /* _MSC_VER */ | ||
49 | #endif | 53 | #endif |
50 | 54 | ||
51 | #endif /* _LIBCRYPTO_CRYPTO_NAMESPACE_H_ */ | 55 | #endif /* _LIBCRYPTO_CRYPTO_NAMESPACE_H_ */ |
diff --git a/src/lib/libcrypto/hidden/openssl/mlkem.h b/src/lib/libcrypto/hidden/openssl/mlkem.h index 8cd80eb3af..3807b3fa1e 100644 --- a/src/lib/libcrypto/hidden/openssl/mlkem.h +++ b/src/lib/libcrypto/hidden/openssl/mlkem.h | |||
@@ -1,6 +1,6 @@ | |||
1 | /* $OpenBSD: mlkem.h,v 1.4 2024/12/20 15:10:31 tb Exp $ */ | 1 | /* $OpenBSD: mlkem.h,v 1.5 2025/08/14 15:48:48 beck Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2024 Bob Beck <beck@obtuse.com> | 3 | * Copyright (c) 2025 Bob Beck <beck@openbsd.org> |
4 | * | 4 | * |
5 | * Permission to use, copy, modify, and distribute this software for any | 5 | * Permission to use, copy, modify, and distribute this software for any |
6 | * purpose with or without fee is hereby granted, provided that the above | 6 | * purpose with or without fee is hereby granted, provided that the above |
@@ -18,9 +18,6 @@ | |||
18 | #ifndef _LIBCRYPTO_MLKEM_H | 18 | #ifndef _LIBCRYPTO_MLKEM_H |
19 | #define _LIBCRYPTO_MLKEM_H | 19 | #define _LIBCRYPTO_MLKEM_H |
20 | 20 | ||
21 | /* Undo when making public */ | ||
22 | #ifdef LIBRESSL_HAS_MLKEM | ||
23 | |||
24 | #ifndef _MSC_VER | 21 | #ifndef _MSC_VER |
25 | #include_next <openssl/mlkem.h> | 22 | #include_next <openssl/mlkem.h> |
26 | #else | 23 | #else |
@@ -28,22 +25,21 @@ | |||
28 | #endif | 25 | #endif |
29 | #include "crypto_namespace.h" | 26 | #include "crypto_namespace.h" |
30 | 27 | ||
31 | LCRYPTO_USED(MLKEM768_generate_key); | 28 | LCRYPTO_USED(MLKEM_private_key_new); |
32 | LCRYPTO_USED(MLKEM768_public_from_private); | 29 | LCRYPTO_USED(MLKEM_private_key_free); |
33 | LCRYPTO_USED(MLKEM768_encap); | 30 | LCRYPTO_USED(MLKEM_private_key_ciphertext_length); |
34 | LCRYPTO_USED(MLKEM768_decap); | 31 | LCRYPTO_USED(MLKEM_private_key_encoded_length); |
35 | LCRYPTO_USED(MLKEM768_marshal_public_key); | 32 | LCRYPTO_USED(MLKEM_public_key_new); |
36 | LCRYPTO_USED(MLKEM768_parse_public_key); | 33 | LCRYPTO_USED(MLKEM_public_key_free); |
37 | LCRYPTO_USED(MLKEM768_private_key_from_seed); | 34 | LCRYPTO_USED(MLKEM_public_key_ciphertext_length); |
38 | LCRYPTO_USED(MLKEM768_parse_private_key); | 35 | LCRYPTO_USED(MLKEM_public_key_encoded_length); |
39 | LCRYPTO_USED(MLKEM1024_generate_key); | 36 | LCRYPTO_USED(MLKEM_generate_key); |
40 | LCRYPTO_USED(MLKEM1024_public_from_private); | 37 | LCRYPTO_USED(MLKEM_private_key_from_seed); |
41 | LCRYPTO_USED(MLKEM1024_encap); | 38 | LCRYPTO_USED(MLKEM_public_from_private); |
42 | LCRYPTO_USED(MLKEM1024_decap); | 39 | LCRYPTO_USED(MLKEM_encap); |
43 | LCRYPTO_USED(MLKEM1024_marshal_public_key); | 40 | LCRYPTO_USED(MLKEM_decap); |
44 | LCRYPTO_USED(MLKEM1024_parse_public_key); | 41 | LCRYPTO_USED(MLKEM_marshal_public_key); |
45 | LCRYPTO_USED(MLKEM1024_private_key_from_seed); | 42 | LCRYPTO_USED(MLKEM_parse_public_key); |
46 | LCRYPTO_USED(MLKEM1024_parse_private_key); | 43 | LCRYPTO_USED(MLKEM_parse_private_key); |
47 | #endif /* LIBRESSL_HAS_MLKEM */ | ||
48 | 44 | ||
49 | #endif /* _LIBCRYPTO_MLKEM_H */ | 45 | #endif /* _LIBCRYPTO_MLKEM_H */ |