diff options
author | tb <> | 2024-12-17 06:43:32 +0000 |
---|---|---|
committer | tb <> | 2024-12-17 06:43:32 +0000 |
commit | 1a40936cc553b1bae49e4ccf3cf9af38b5c5290d (patch) | |
tree | b0bce0b0fa7a3cd7c6423a6827a919a617abb780 /src | |
parent | bbb1460f03b011099930814d5c0e38c60fb6dc84 (diff) | |
download | openbsd-1a40936cc553b1bae49e4ccf3cf9af38b5c5290d.tar.gz openbsd-1a40936cc553b1bae49e4ccf3cf9af38b5c5290d.tar.bz2 openbsd-1a40936cc553b1bae49e4ccf3cf9af38b5c5290d.zip |
mlkem: clean up top matter in headers
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/mlkem/mlkem.h | 15 | ||||
-rw-r--r-- | src/lib/libcrypto/mlkem/mlkem_internal.h | 7 |
2 files changed, 14 insertions, 8 deletions
diff --git a/src/lib/libcrypto/mlkem/mlkem.h b/src/lib/libcrypto/mlkem/mlkem.h index 1033b89a60..7941c21875 100644 --- a/src/lib/libcrypto/mlkem/mlkem.h +++ b/src/lib/libcrypto/mlkem/mlkem.h | |||
@@ -1,4 +1,6 @@ | |||
1 | /* Copyright (c) 2024, Google Inc. | 1 | /* $OpenBSD: mlkem.h,v 1.3 2024/12/17 06:43:32 tb Exp $ */ |
2 | /* | ||
3 | * Copyright (c) 2024, Google Inc. | ||
2 | * | 4 | * |
3 | * Permission to use, copy, modify, and/or distribute this software for any | 5 | * Permission to use, copy, modify, and/or distribute this software for any |
4 | * 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 |
@@ -10,7 +12,8 @@ | |||
10 | * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | 12 | * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
11 | * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION | 13 | * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION |
12 | * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN | 14 | * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN |
13 | * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ | 15 | * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
16 | */ | ||
14 | 17 | ||
15 | #ifndef OPENSSL_HEADER_MLKEM_H | 18 | #ifndef OPENSSL_HEADER_MLKEM_H |
16 | #define OPENSSL_HEADER_MLKEM_H | 19 | #define OPENSSL_HEADER_MLKEM_H |
@@ -21,16 +24,16 @@ | |||
21 | #ifdef LIBRESSL_HAS_MLKEM | 24 | #ifdef LIBRESSL_HAS_MLKEM |
22 | /* This needs to become public */ | 25 | /* This needs to become public */ |
23 | #include <openssl/bytestring.h> | 26 | #include <openssl/bytestring.h> |
24 | #else | ||
25 | /* Hack for now */ | ||
26 | struct cbs_st; | ||
27 | struct cbb_st; | ||
28 | #endif | 27 | #endif |
29 | 28 | ||
30 | #if defined(__cplusplus) | 29 | #if defined(__cplusplus) |
31 | extern "C" { | 30 | extern "C" { |
32 | #endif | 31 | #endif |
33 | 32 | ||
33 | /* Hack for now */ | ||
34 | struct cbs_st; | ||
35 | struct cbb_st; | ||
36 | |||
34 | /* | 37 | /* |
35 | * ML-KEM-768 | 38 | * ML-KEM-768 |
36 | * | 39 | * |
diff --git a/src/lib/libcrypto/mlkem/mlkem_internal.h b/src/lib/libcrypto/mlkem/mlkem_internal.h index 3141160ac2..4c8a0650a8 100644 --- a/src/lib/libcrypto/mlkem/mlkem_internal.h +++ b/src/lib/libcrypto/mlkem/mlkem_internal.h | |||
@@ -1,4 +1,6 @@ | |||
1 | /* Copyright (c) 2023, Google Inc. | 1 | /* $OpenBSD: mlkem_internal.h,v 1.3 2024/12/17 06:43:32 tb Exp $ */ |
2 | /* | ||
3 | * Copyright (c) 2023, Google Inc. | ||
2 | * | 4 | * |
3 | * Permission to use, copy, modify, and/or distribute this software for any | 5 | * Permission to use, copy, modify, and/or distribute this software for any |
4 | * 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 |
@@ -10,7 +12,8 @@ | |||
10 | * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | 12 | * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
11 | * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION | 13 | * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION |
12 | * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN | 14 | * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN |
13 | * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ | 15 | * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
16 | */ | ||
14 | 17 | ||
15 | #ifndef OPENSSL_HEADER_CRYPTO_MLKEM_INTERNAL_H | 18 | #ifndef OPENSSL_HEADER_CRYPTO_MLKEM_INTERNAL_H |
16 | #define OPENSSL_HEADER_CRYPTO_MLKEM_INTERNAL_H | 19 | #define OPENSSL_HEADER_CRYPTO_MLKEM_INTERNAL_H |