OmniNX/Atmosphere
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

spl/vapours: move CTR_DRBG to vapours

Browse Source
This commit is contained in:
Alula
2026-09-18 07:22:42 +02:00
parent 85f119a5c4
commit 866c831f7a
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/libstratosphere/source/crypto/crypto_csrng.os.generic.cpp
View File

@@ -14,14 +14,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <stratosphere.hpp> #include <stratosphere.hpp>
#include "../spl/impl/spl_ctr_drbg.hpp" #include <vapours/crypto/impl/crypto_ctr_drbg.hpp>
#include <sys/random.h> #include <sys/random.h>
namespace ams::crypto { namespace ams::crypto {
namespace { 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 = {}; constinit util::TypedStorage<Drbg> g_drbg = {};

4
libraries/libstratosphere/source/spl/impl/spl_api_impl.cpp
View File

@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <stratosphere.hpp> #include <stratosphere.hpp>
#include "spl_ctr_drbg.hpp" #include <vapours/crypto/impl/crypto_ctr_drbg.hpp>
#include "spl_device_address_mapper.hpp" #include "spl_device_address_mapper.hpp"
#include "spl_key_slot_cache.hpp" #include "spl_key_slot_cache.hpp"
@@ -29,7 +29,7 @@ namespace ams::spl::impl {
namespace { namespace {
/* Drbg type. */ /* Drbg type. */
using Drbg = CtrDrbg<crypto::AesEncryptor128, AesKeySize, false>; using Drbg = crypto::impl::CtrDrbg<crypto::AesEncryptor128, AesKeySize, false>;
/* Convenient defines. */ /* Convenient defines. */
#if defined(ATMOSPHERE_OS_HORIZON) #if defined(ATMOSPHERE_OS_HORIZON)

4
libraries/libstratosphere/source/spl/impl/spl_ctr_drbg.hpp → libraries/libvapours/include/vapours/crypto/impl/crypto_ctr_drbg.hpp
View File

@@ -14,9 +14,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#pragma once #pragma once
#include <stratosphere.hpp> #include <vapours.hpp>
namespace ams::spl::impl { namespace ams::crypto::impl {
constexpr inline int BitsPerByte = BITSIZEOF(u8); constexpr inline int BitsPerByte = BITSIZEOF(u8);