From 866c831f7a26e02d5ba31889487fea5f54077397 Mon Sep 17 00:00:00 2001
From: Alula <git@alula.me>
Date: Fri, 18 Sep 2026 07:22:42 +0200
Subject: [PATCH] spl/vapours: move CTR_DRBG to vapours

---
 .../libstratosphere/source/crypto/crypto_csrng.os.generic.cpp | 4 ++--
 libraries/libstratosphere/source/spl/impl/spl_api_impl.cpp    | 4 ++--
 .../include/vapours/crypto/impl/crypto_ctr_drbg.hpp}          | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename libraries/{libstratosphere/source/spl/impl/spl_ctr_drbg.hpp => libvapours/include/vapours/crypto/impl/crypto_ctr_drbg.hpp} (99%)

diff --git a/libraries/libstratosphere/source/crypto/crypto_csrng.os.generic.cpp b/libraries/libstratosphere/source/crypto/crypto_csrng.os.generic.cpp
index ecb9e2d0a..414953364 100644
--- a/libraries/libstratosphere/source/crypto/crypto_csrng.os.generic.cpp
+++ b/libraries/libstratosphere/source/crypto/crypto_csrng.os.generic.cpp
@@ -14,14 +14,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <stratosphere.hpp>
-#include "../spl/impl/spl_ctr_drbg.hpp"
+#include <vapours/crypto/impl/crypto_ctr_drbg.hpp>
 #include <sys/random.h>
 
 namespace ams::crypto {
 
     namespace {
 
-        using Drbg = ::ams::spl::impl::CtrDrbg<crypto::AesEncryptor128, crypto::AesEncryptor128::KeySize, false>;
+        using Drbg = ::ams::crypto::impl::CtrDrbg<crypto::AesEncryptor128, crypto::AesEncryptor128::KeySize, false>;
 
         constinit util::TypedStorage<Drbg> g_drbg = {};
 
diff --git a/libraries/libstratosphere/source/spl/impl/spl_api_impl.cpp b/libraries/libstratosphere/source/spl/impl/spl_api_impl.cpp
index c5c450b1b..93821f85b 100644
--- a/libraries/libstratosphere/source/spl/impl/spl_api_impl.cpp
+++ b/libraries/libstratosphere/source/spl/impl/spl_api_impl.cpp
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <stratosphere.hpp>
-#include "spl_ctr_drbg.hpp"
+#include <vapours/crypto/impl/crypto_ctr_drbg.hpp>
 #include "spl_device_address_mapper.hpp"
 #include "spl_key_slot_cache.hpp"
 
@@ -29,7 +29,7 @@ namespace ams::spl::impl {
     namespace {
 
         /* Drbg type. */
-        using Drbg = CtrDrbg<crypto::AesEncryptor128, AesKeySize, false>;
+        using Drbg = crypto::impl::CtrDrbg<crypto::AesEncryptor128, AesKeySize, false>;
 
         /* Convenient defines. */
         #if defined(ATMOSPHERE_OS_HORIZON)
diff --git a/libraries/libstratosphere/source/spl/impl/spl_ctr_drbg.hpp b/libraries/libvapours/include/vapours/crypto/impl/crypto_ctr_drbg.hpp
similarity index 99%
rename from libraries/libstratosphere/source/spl/impl/spl_ctr_drbg.hpp
rename to libraries/libvapours/include/vapours/crypto/impl/crypto_ctr_drbg.hpp
index b615f02c1..6454fae02 100644
--- a/libraries/libstratosphere/source/spl/impl/spl_ctr_drbg.hpp
+++ b/libraries/libvapours/include/vapours/crypto/impl/crypto_ctr_drbg.hpp
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include <stratosphere.hpp>
+#include <vapours.hpp>
 
-namespace ams::spl::impl {
+namespace ams::crypto::impl {
 
     constexpr inline int BitsPerByte = BITSIZEOF(u8);