From 8956b7038c871c3cd3d92ddd877666f4d9b16294 Mon Sep 17 00:00:00 2001
From: Robin Krahl <robin@nitrokey.com>
Date: Mon, 8 Jun 2026 11:12:21 +0200
Subject: [PATCH] Flatten authenticator module

The authenticator module contains the main types of the crate so it
makes sense to provide them from the top level instead of the
authenticator module.
---
 CHANGELOG.md         | 1 +
 src/authenticator.rs | 3 ---
 src/lib.rs           | 3 ++-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06d8692..af43dea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Remove re-exports for `heapless` and `heapless-bytes` as the relevant types are already re-exported.
 - `ctap2::get_info`: Use subcommand enum for `authenticator_config_commands`.
 - `webauthn`: Make `KnownPublicKeyCredentialParameters` an enum.
+- `authenticator`: Move `Authenticator`, `Request` and `Response` to the crate root.
 
 ## [0.6.0-rc.4] 2026-06-01
 
diff --git a/src/authenticator.rs b/src/authenticator.rs
index 94a6661..067b1a0 100644
--- a/src/authenticator.rs
+++ b/src/authenticator.rs
@@ -3,9 +3,6 @@
 use crate::ctap1;
 use crate::ctap2;
 
-pub use ctap1::Authenticator as Ctap1Authenticator;
-pub use ctap2::Authenticator as Ctap2Authenticator;
-
 #[derive(Clone, Debug, PartialEq)]
 #[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
 // clippy says (2022-02-26): large size difference
diff --git a/src/lib.rs b/src/lib.rs
index 610c55c..11ed1db 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -25,7 +25,7 @@ pub use serde_bytes::ByteArray;
 
 #[cfg(feature = "arbitrary")]
 mod arbitrary;
-pub mod authenticator;
+mod authenticator;
 pub mod ctap1;
 pub mod ctap2;
 pub(crate) mod operation;
@@ -34,6 +34,7 @@ pub mod sizes;
 mod test;
 pub mod webauthn;
 
+pub use authenticator::{Authenticator, Request, Response};
 pub use ctap2::{Error, Result};
 
 use core::fmt::{self, Display, Formatter};