From 1a40936cc553b1bae49e4ccf3cf9af38b5c5290d Mon Sep 17 00:00:00 2001
From: tb <>
Date: Tue, 17 Dec 2024 06:43:32 +0000
Subject: mlkem: clean up top matter in headers

---
 src/lib/libcrypto/mlkem/mlkem.h          | 15 +++++++++------
 src/lib/libcrypto/mlkem/mlkem_internal.h |  7 +++++--
 2 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'src')

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 @@
-/* Copyright (c) 2024, Google Inc.
+/*	$OpenBSD: mlkem.h,v 1.3 2024/12/17 06:43:32 tb Exp $ */
+/*
+ * Copyright (c) 2024, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -10,7 +12,8 @@
  * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
 
 #ifndef OPENSSL_HEADER_MLKEM_H
 #define OPENSSL_HEADER_MLKEM_H
@@ -21,16 +24,16 @@
 #ifdef LIBRESSL_HAS_MLKEM
 /* This needs to become public */
 #include <openssl/bytestring.h>
-#else
-/* Hack for now */
-struct cbs_st;
-struct cbb_st;
 #endif
 
 #if defined(__cplusplus)
 extern "C" {
 #endif
 
+/* Hack for now */
+struct cbs_st;
+struct cbb_st;
+
 /*
  * ML-KEM-768
  *
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 @@
-/* Copyright (c) 2023, Google Inc.
+/*	$OpenBSD: mlkem_internal.h,v 1.3 2024/12/17 06:43:32 tb Exp $ */
+/*
+ * Copyright (c) 2023, Google Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -10,7 +12,8 @@
  * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
 
 #ifndef OPENSSL_HEADER_CRYPTO_MLKEM_INTERNAL_H
 #define OPENSSL_HEADER_CRYPTO_MLKEM_INTERNAL_H
-- 
cgit v1.2.3-55-g6feb