From a6828dc24570f70a89a31f70f169e775c8eae2c5 Mon Sep 17 00:00:00 2001
From: Fabian Albert <fabian.albert@rohde-schwarz.com>
Date: Mon, 5 Aug 2024 09:41:07 +0200
Subject: [PATCH] Apply review suggestions

---
 src/lib/pubkey/hybrid_kem/hybrid_kem.cpp                 | 2 +-
 src/lib/pubkey/hybrid_kem/hybrid_kem_ops.cpp             | 8 ++++++++
 src/lib/pubkey/kex_to_kem_adapter/info.txt               | 6 ++++--
 src/lib/pubkey/kex_to_kem_adapter/kex_to_kem_adapter.cpp | 4 ++--
 src/lib/pubkey/kex_to_kem_adapter/kex_to_kem_adapter.h   | 8 ++++----
 src/lib/tls/tls13_pqc/hybrid_public_key.cpp              | 2 +-
 src/tests/test_tls_hybrid_kem_key.cpp                    | 2 +-
 7 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/lib/pubkey/hybrid_kem/hybrid_kem.cpp b/src/lib/pubkey/hybrid_kem/hybrid_kem.cpp
index d57422f1848..e88c9fc5ab8 100644
--- a/src/lib/pubkey/hybrid_kem/hybrid_kem.cpp
+++ b/src/lib/pubkey/hybrid_kem/hybrid_kem.cpp
@@ -8,9 +8,9 @@
 */
 #include <botan/hybrid_kem.h>
 
-#include <botan/kex_to_kem_adapter.h>
 #include <botan/pk_algs.h>
 #include <botan/internal/fmt.h>
+#include <botan/internal/kex_to_kem_adapter.h>
 #include <botan/internal/pk_ops_impl.h>
 #include <botan/internal/stl_util.h>
 
diff --git a/src/lib/pubkey/hybrid_kem/hybrid_kem_ops.cpp b/src/lib/pubkey/hybrid_kem/hybrid_kem_ops.cpp
index f16d34cc274..9687ded2043 100644
--- a/src/lib/pubkey/hybrid_kem/hybrid_kem_ops.cpp
+++ b/src/lib/pubkey/hybrid_kem/hybrid_kem_ops.cpp
@@ -1,3 +1,11 @@
+/**
+* Abstraction for a combined KEM encryptors and decryptors.
+*
+* (C) 2024 Jack Lloyd
+*     2024 Fabian Albert, René Meusel - Rohde & Schwarz Cybersecurity
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
 #include <botan/internal/hybrid_kem_ops.h>
 
 #include <botan/internal/stl_util.h>
diff --git a/src/lib/pubkey/kex_to_kem_adapter/info.txt b/src/lib/pubkey/kex_to_kem_adapter/info.txt
index e2e6f260939..ec9fee6c088 100644
--- a/src/lib/pubkey/kex_to_kem_adapter/info.txt
+++ b/src/lib/pubkey/kex_to_kem_adapter/info.txt
@@ -4,12 +4,14 @@ KEX_TO_KEM_ADAPTER -> 20240504
 
 <module_info>
 name -> "KEX to KEM adapter"
+brief -> "Basic KEX to KEM key transformation"
+type -> "Internal"
 </module_info>
 
 
-<header:public>
+<header:internal>
 kex_to_kem_adapter.h
-</header:public>
+</header:internal>
 
 <requires>
 
diff --git a/src/lib/pubkey/kex_to_kem_adapter/kex_to_kem_adapter.cpp b/src/lib/pubkey/kex_to_kem_adapter/kex_to_kem_adapter.cpp
index 9c620424c45..f14c0a56676 100644
--- a/src/lib/pubkey/kex_to_kem_adapter/kex_to_kem_adapter.cpp
+++ b/src/lib/pubkey/kex_to_kem_adapter/kex_to_kem_adapter.cpp
@@ -3,12 +3,12 @@
  * key in the KEM encapsulation.
  *
  * (C) 2023 Jack Lloyd
- *     2023 Fabian Albert, René Meusel - Rohde & Schwarz Cybersecurity
+ *     2023,2024 Fabian Albert, René Meusel - Rohde & Schwarz Cybersecurity
  *
  * Botan is released under the Simplified BSD License (see license.txt)
  */
 
-#include <botan/kex_to_kem_adapter.h>
+#include <botan/internal/kex_to_kem_adapter.h>
 
 #include <botan/internal/fmt.h>
 #include <botan/internal/pk_ops_impl.h>
diff --git a/src/lib/pubkey/kex_to_kem_adapter/kex_to_kem_adapter.h b/src/lib/pubkey/kex_to_kem_adapter/kex_to_kem_adapter.h
index 37e2c8b9f09..cbccd51b046 100644
--- a/src/lib/pubkey/kex_to_kem_adapter/kex_to_kem_adapter.h
+++ b/src/lib/pubkey/kex_to_kem_adapter/kex_to_kem_adapter.h
@@ -3,7 +3,7 @@
  * key in the KEM encapsulation.
  *
  * (C) 2023 Jack Lloyd
- *     2023 Fabian Albert, René Meusel - Rohde & Schwarz Cybersecurity
+ *     2023,2024 Fabian Albert, René Meusel - Rohde & Schwarz Cybersecurity
  *
  * Botan is released under the Simplified BSD License (see license.txt)
  */
@@ -21,7 +21,7 @@ namespace Botan {
  * Adapter to use a key agreement key pair (e.g. ECDH) as a key encapsulation
  * mechanism.
  */
-class BOTAN_PUBLIC_API(3, 5) KEX_to_KEM_Adapter_PublicKey : public virtual Public_Key {
+class BOTAN_TEST_API KEX_to_KEM_Adapter_PublicKey : public virtual Public_Key {
    public:
       KEX_to_KEM_Adapter_PublicKey(std::unique_ptr<Public_Key> public_key);
 
@@ -65,8 +65,8 @@ BOTAN_DIAGNOSTIC_IGNORE_INHERITED_VIA_DOMINANCE
  *  * KEM-decapsulate(PrivateKey, EncapsulatedSharedSecret) -> SharedSecret
  *       => KEX-agree(PrivateKey, EncapsulatedSharedSecret)
  */
-class BOTAN_PUBLIC_API(3, 5) KEX_to_KEM_Adapter_PrivateKey final : public KEX_to_KEM_Adapter_PublicKey,
-                                                                   public virtual Private_Key {
+class BOTAN_TEST_API KEX_to_KEM_Adapter_PrivateKey final : public KEX_to_KEM_Adapter_PublicKey,
+                                                           public virtual Private_Key {
    public:
       KEX_to_KEM_Adapter_PrivateKey(std::unique_ptr<Private_Key> private_key);
 
diff --git a/src/lib/tls/tls13_pqc/hybrid_public_key.cpp b/src/lib/tls/tls13_pqc/hybrid_public_key.cpp
index dd4d696a337..c326456b0a1 100644
--- a/src/lib/tls/tls13_pqc/hybrid_public_key.cpp
+++ b/src/lib/tls/tls13_pqc/hybrid_public_key.cpp
@@ -12,9 +12,9 @@
 
 #include <botan/pk_algs.h>
 
-#include <botan/kex_to_kem_adapter.h>
 #include <botan/internal/fmt.h>
 #include <botan/internal/hybrid_kem_ops.h>
+#include <botan/internal/kex_to_kem_adapter.h>
 #include <botan/internal/pk_ops_impl.h>
 #include <botan/internal/stl_util.h>
 
diff --git a/src/tests/test_tls_hybrid_kem_key.cpp b/src/tests/test_tls_hybrid_kem_key.cpp
index be2e5b3f3cc..57d17130d52 100644
--- a/src/tests/test_tls_hybrid_kem_key.cpp
+++ b/src/tests/test_tls_hybrid_kem_key.cpp
@@ -10,9 +10,9 @@
 #if defined(BOTAN_HAS_TLS_13_PQC) && defined(BOTAN_HAS_KYBER) && defined(BOTAN_HAS_DIFFIE_HELLMAN) && \
    defined(BOTAN_HAS_ECDSA)
 
-   #include <botan/kex_to_kem_adapter.h>
    #include <botan/pk_algs.h>
    #include <botan/internal/hybrid_public_key.h>
+   #include <botan/internal/kex_to_kem_adapter.h>
    #include <botan/internal/stl_util.h>
 
 namespace Botan_Tests {