From 12fe47c91c911c5fba065aa7b7c95593a79490fe Mon Sep 17 00:00:00 2001 From: Alex Barney Date: Thu, 18 Mar 2021 02:04:05 -0700 Subject: [PATCH] Rename "Detail" namespaces to "Impl" --- src/LibHac/Bcat/BcatServer.cs | 6 +++--- src/LibHac/Bcat/{Detail => Impl}/Ipc/BcatServiceObject.cs | 2 +- .../{Detail => Impl}/Ipc/IDeliveryCacheDirectoryService.cs | 2 +- .../Bcat/{Detail => Impl}/Ipc/IDeliveryCacheFileService.cs | 2 +- .../{Detail => Impl}/Ipc/IDeliveryCacheStorageService.cs | 2 +- src/LibHac/Bcat/{Detail => Impl}/Ipc/IServiceCreator.cs | 2 +- src/LibHac/Bcat/{Detail => Impl}/Service/AccessControl.cs | 2 +- .../Service/Core/DeliveryCacheDirectoryMetaAccessor.cs | 2 +- .../Service/Core/DeliveryCacheDirectoryMetaEntry.cs | 2 +- .../Service/Core/DeliveryCacheFileMetaAccessor.cs | 2 +- .../Service/Core/DeliveryCacheFileMetaEntry.cs | 2 +- .../Service/Core/DeliveryCacheStorageManager.cs | 2 +- .../Service/DeliveryCacheDirectoryService.cs | 6 +++--- .../{Detail => Impl}/Service/DeliveryCacheFileService.cs | 6 +++--- .../{Detail => Impl}/Service/DeliveryCacheStorageService.cs | 6 +++--- src/LibHac/Bcat/{Detail => Impl}/Service/ServiceCreator.cs | 4 ++-- src/LibHac/Crypto/Aes.cs | 2 +- src/LibHac/Crypto/AesCbcCipher.cs | 2 +- src/LibHac/Crypto/AesCbcCipherNi.cs | 2 +- src/LibHac/Crypto/AesCtrCipher.cs | 2 +- src/LibHac/Crypto/AesCtrCipherNi.cs | 2 +- src/LibHac/Crypto/AesEcbCipher.cs | 2 +- src/LibHac/Crypto/AesEcbCipherNi.cs | 2 +- src/LibHac/Crypto/AesXtsCipher.cs | 2 +- src/LibHac/Crypto/AesXtsCipherNi.cs | 2 +- src/LibHac/Crypto/{Detail => Impl}/AesCbcMode.cs | 2 +- src/LibHac/Crypto/{Detail => Impl}/AesCbcModeNi.cs | 2 +- src/LibHac/Crypto/{Detail => Impl}/AesCore.cs | 2 +- src/LibHac/Crypto/{Detail => Impl}/AesCoreNi.cs | 3 +-- src/LibHac/Crypto/{Detail => Impl}/AesCtrMode.cs | 2 +- src/LibHac/Crypto/{Detail => Impl}/AesCtrModeNi.cs | 2 +- src/LibHac/Crypto/{Detail => Impl}/AesEcbMode.cs | 2 +- src/LibHac/Crypto/{Detail => Impl}/AesEcbModeNi.cs | 2 +- src/LibHac/Crypto/{Detail => Impl}/AesXtsMode.cs | 2 +- src/LibHac/Crypto/{Detail => Impl}/AesXtsModeNi.cs | 2 +- src/LibHac/Crypto/{Detail => Impl}/HashState.cs | 2 +- src/LibHac/Crypto/{Detail => Impl}/Sha256Impl.cs | 2 +- src/LibHac/Crypto/Sha256.cs | 2 +- src/LibHac/Crypto/Sha256Generator.cs | 2 +- src/LibHac/FsSrv/FsCreator/PartitionFileSystemCreator.cs | 2 +- src/LibHac/FsSrv/FsCreator/StorageOnNcaCreator.cs | 2 +- .../FsSystem/{Detail => Impl}/PartitionFileSystemFormats.cs | 2 +- src/LibHac/FsSystem/PartitionFileSystemCore.cs | 2 +- src/LibHac/FsSystem/PartitionFileSystemMetaCore.cs | 2 +- src/hactoolnet/ProcessBench.cs | 5 +++-- 45 files changed, 56 insertions(+), 56 deletions(-) rename src/LibHac/Bcat/{Detail => Impl}/Ipc/BcatServiceObject.cs (92%) rename src/LibHac/Bcat/{Detail => Impl}/Ipc/IDeliveryCacheDirectoryService.cs (89%) rename src/LibHac/Bcat/{Detail => Impl}/Ipc/IDeliveryCacheFileService.cs (91%) rename src/LibHac/Bcat/{Detail => Impl}/Ipc/IDeliveryCacheStorageService.cs (91%) rename src/LibHac/Bcat/{Detail => Impl}/Ipc/IServiceCreator.cs (90%) rename src/LibHac/Bcat/{Detail => Impl}/Service/AccessControl.cs (88%) rename src/LibHac/Bcat/{Detail => Impl}/Service/Core/DeliveryCacheDirectoryMetaAccessor.cs (98%) rename src/LibHac/Bcat/{Detail => Impl}/Service/Core/DeliveryCacheDirectoryMetaEntry.cs (86%) rename src/LibHac/Bcat/{Detail => Impl}/Service/Core/DeliveryCacheFileMetaAccessor.cs (98%) rename src/LibHac/Bcat/{Detail => Impl}/Service/Core/DeliveryCacheFileMetaEntry.cs (89%) rename src/LibHac/Bcat/{Detail => Impl}/Service/Core/DeliveryCacheStorageManager.cs (99%) rename src/LibHac/Bcat/{Detail => Impl}/Service/DeliveryCacheDirectoryService.cs (96%) rename src/LibHac/Bcat/{Detail => Impl}/Service/DeliveryCacheFileService.cs (97%) rename src/LibHac/Bcat/{Detail => Impl}/Service/DeliveryCacheStorageService.cs (96%) rename src/LibHac/Bcat/{Detail => Impl}/Service/ServiceCreator.cs (96%) rename src/LibHac/Crypto/{Detail => Impl}/AesCbcMode.cs (95%) rename src/LibHac/Crypto/{Detail => Impl}/AesCbcModeNi.cs (99%) rename src/LibHac/Crypto/{Detail => Impl}/AesCore.cs (98%) rename src/LibHac/Crypto/{Detail => Impl}/AesCoreNi.cs (99%) rename src/LibHac/Crypto/{Detail => Impl}/AesCtrMode.cs (98%) rename src/LibHac/Crypto/{Detail => Impl}/AesCtrModeNi.cs (99%) rename src/LibHac/Crypto/{Detail => Impl}/AesEcbMode.cs (95%) rename src/LibHac/Crypto/{Detail => Impl}/AesEcbModeNi.cs (94%) rename src/LibHac/Crypto/{Detail => Impl}/AesXtsMode.cs (99%) rename src/LibHac/Crypto/{Detail => Impl}/AesXtsModeNi.cs (99%) rename src/LibHac/Crypto/{Detail => Impl}/HashState.cs (74%) rename src/LibHac/Crypto/{Detail => Impl}/Sha256Impl.cs (97%) rename src/LibHac/FsSystem/{Detail => Impl}/PartitionFileSystemFormats.cs (97%) diff --git a/src/LibHac/Bcat/BcatServer.cs b/src/LibHac/Bcat/BcatServer.cs index 20e72bf1..9f021eb4 100644 --- a/src/LibHac/Bcat/BcatServer.cs +++ b/src/LibHac/Bcat/BcatServer.cs @@ -1,7 +1,7 @@ using System.Diagnostics; -using LibHac.Bcat.Detail.Ipc; -using LibHac.Bcat.Detail.Service; -using LibHac.Bcat.Detail.Service.Core; +using LibHac.Bcat.Impl.Ipc; +using LibHac.Bcat.Impl.Service; +using LibHac.Bcat.Impl.Service.Core; using LibHac.Fs; namespace LibHac.Bcat diff --git a/src/LibHac/Bcat/Detail/Ipc/BcatServiceObject.cs b/src/LibHac/Bcat/Impl/Ipc/BcatServiceObject.cs similarity index 92% rename from src/LibHac/Bcat/Detail/Ipc/BcatServiceObject.cs rename to src/LibHac/Bcat/Impl/Ipc/BcatServiceObject.cs index cff3d6f7..53028710 100644 --- a/src/LibHac/Bcat/Detail/Ipc/BcatServiceObject.cs +++ b/src/LibHac/Bcat/Impl/Ipc/BcatServiceObject.cs @@ -1,6 +1,6 @@ using LibHac.Sm; -namespace LibHac.Bcat.Detail.Ipc +namespace LibHac.Bcat.Impl.Ipc { internal class BcatServiceObject : IServiceObject { diff --git a/src/LibHac/Bcat/Detail/Ipc/IDeliveryCacheDirectoryService.cs b/src/LibHac/Bcat/Impl/Ipc/IDeliveryCacheDirectoryService.cs similarity index 89% rename from src/LibHac/Bcat/Detail/Ipc/IDeliveryCacheDirectoryService.cs rename to src/LibHac/Bcat/Impl/Ipc/IDeliveryCacheDirectoryService.cs index 0e064361..318748fd 100644 --- a/src/LibHac/Bcat/Detail/Ipc/IDeliveryCacheDirectoryService.cs +++ b/src/LibHac/Bcat/Impl/Ipc/IDeliveryCacheDirectoryService.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.Bcat.Detail.Ipc +namespace LibHac.Bcat.Impl.Ipc { public interface IDeliveryCacheDirectoryService : IDisposable { diff --git a/src/LibHac/Bcat/Detail/Ipc/IDeliveryCacheFileService.cs b/src/LibHac/Bcat/Impl/Ipc/IDeliveryCacheFileService.cs similarity index 91% rename from src/LibHac/Bcat/Detail/Ipc/IDeliveryCacheFileService.cs rename to src/LibHac/Bcat/Impl/Ipc/IDeliveryCacheFileService.cs index 0956f7d2..bb8cab31 100644 --- a/src/LibHac/Bcat/Detail/Ipc/IDeliveryCacheFileService.cs +++ b/src/LibHac/Bcat/Impl/Ipc/IDeliveryCacheFileService.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.Bcat.Detail.Ipc +namespace LibHac.Bcat.Impl.Ipc { public interface IDeliveryCacheFileService : IDisposable { diff --git a/src/LibHac/Bcat/Detail/Ipc/IDeliveryCacheStorageService.cs b/src/LibHac/Bcat/Impl/Ipc/IDeliveryCacheStorageService.cs similarity index 91% rename from src/LibHac/Bcat/Detail/Ipc/IDeliveryCacheStorageService.cs rename to src/LibHac/Bcat/Impl/Ipc/IDeliveryCacheStorageService.cs index 4429c1af..1a492801 100644 --- a/src/LibHac/Bcat/Detail/Ipc/IDeliveryCacheStorageService.cs +++ b/src/LibHac/Bcat/Impl/Ipc/IDeliveryCacheStorageService.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.Bcat.Detail.Ipc +namespace LibHac.Bcat.Impl.Ipc { public interface IDeliveryCacheStorageService : IDisposable { diff --git a/src/LibHac/Bcat/Detail/Ipc/IServiceCreator.cs b/src/LibHac/Bcat/Impl/Ipc/IServiceCreator.cs similarity index 90% rename from src/LibHac/Bcat/Detail/Ipc/IServiceCreator.cs rename to src/LibHac/Bcat/Impl/Ipc/IServiceCreator.cs index 0b7c136a..58ea59f3 100644 --- a/src/LibHac/Bcat/Detail/Ipc/IServiceCreator.cs +++ b/src/LibHac/Bcat/Impl/Ipc/IServiceCreator.cs @@ -1,4 +1,4 @@ -namespace LibHac.Bcat.Detail.Ipc +namespace LibHac.Bcat.Impl.Ipc { public interface IServiceCreator { diff --git a/src/LibHac/Bcat/Detail/Service/AccessControl.cs b/src/LibHac/Bcat/Impl/Service/AccessControl.cs similarity index 88% rename from src/LibHac/Bcat/Detail/Service/AccessControl.cs rename to src/LibHac/Bcat/Impl/Service/AccessControl.cs index 007f1194..e33d9ace 100644 --- a/src/LibHac/Bcat/Detail/Service/AccessControl.cs +++ b/src/LibHac/Bcat/Impl/Service/AccessControl.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.Bcat.Detail.Service +namespace LibHac.Bcat.Impl.Service { [Flags] internal enum AccessControl diff --git a/src/LibHac/Bcat/Detail/Service/Core/DeliveryCacheDirectoryMetaAccessor.cs b/src/LibHac/Bcat/Impl/Service/Core/DeliveryCacheDirectoryMetaAccessor.cs similarity index 98% rename from src/LibHac/Bcat/Detail/Service/Core/DeliveryCacheDirectoryMetaAccessor.cs rename to src/LibHac/Bcat/Impl/Service/Core/DeliveryCacheDirectoryMetaAccessor.cs index 5fa8f5f9..12b9ec72 100644 --- a/src/LibHac/Bcat/Detail/Service/Core/DeliveryCacheDirectoryMetaAccessor.cs +++ b/src/LibHac/Bcat/Impl/Service/Core/DeliveryCacheDirectoryMetaAccessor.cs @@ -5,7 +5,7 @@ using LibHac.Common; using LibHac.Fs; using LibHac.Fs.Fsa; -namespace LibHac.Bcat.Detail.Service.Core +namespace LibHac.Bcat.Impl.Service.Core { internal class DeliveryCacheDirectoryMetaAccessor { diff --git a/src/LibHac/Bcat/Detail/Service/Core/DeliveryCacheDirectoryMetaEntry.cs b/src/LibHac/Bcat/Impl/Service/Core/DeliveryCacheDirectoryMetaEntry.cs similarity index 86% rename from src/LibHac/Bcat/Detail/Service/Core/DeliveryCacheDirectoryMetaEntry.cs rename to src/LibHac/Bcat/Impl/Service/Core/DeliveryCacheDirectoryMetaEntry.cs index 116fb698..002d039f 100644 --- a/src/LibHac/Bcat/Detail/Service/Core/DeliveryCacheDirectoryMetaEntry.cs +++ b/src/LibHac/Bcat/Impl/Service/Core/DeliveryCacheDirectoryMetaEntry.cs @@ -1,6 +1,6 @@ using System.Runtime.InteropServices; -namespace LibHac.Bcat.Detail.Service.Core +namespace LibHac.Bcat.Impl.Service.Core { [StructLayout(LayoutKind.Explicit, Size = 0x40)] internal struct DeliveryCacheDirectoryMetaEntry diff --git a/src/LibHac/Bcat/Detail/Service/Core/DeliveryCacheFileMetaAccessor.cs b/src/LibHac/Bcat/Impl/Service/Core/DeliveryCacheFileMetaAccessor.cs similarity index 98% rename from src/LibHac/Bcat/Detail/Service/Core/DeliveryCacheFileMetaAccessor.cs rename to src/LibHac/Bcat/Impl/Service/Core/DeliveryCacheFileMetaAccessor.cs index 605757d9..c45d431d 100644 --- a/src/LibHac/Bcat/Detail/Service/Core/DeliveryCacheFileMetaAccessor.cs +++ b/src/LibHac/Bcat/Impl/Service/Core/DeliveryCacheFileMetaAccessor.cs @@ -6,7 +6,7 @@ using LibHac.Fs; using LibHac.Fs.Fsa; using LibHac.Util; -namespace LibHac.Bcat.Detail.Service.Core +namespace LibHac.Bcat.Impl.Service.Core { internal class DeliveryCacheFileMetaAccessor { diff --git a/src/LibHac/Bcat/Detail/Service/Core/DeliveryCacheFileMetaEntry.cs b/src/LibHac/Bcat/Impl/Service/Core/DeliveryCacheFileMetaEntry.cs similarity index 89% rename from src/LibHac/Bcat/Detail/Service/Core/DeliveryCacheFileMetaEntry.cs rename to src/LibHac/Bcat/Impl/Service/Core/DeliveryCacheFileMetaEntry.cs index 2ffa897a..40a391ab 100644 --- a/src/LibHac/Bcat/Detail/Service/Core/DeliveryCacheFileMetaEntry.cs +++ b/src/LibHac/Bcat/Impl/Service/Core/DeliveryCacheFileMetaEntry.cs @@ -1,6 +1,6 @@ using System.Runtime.InteropServices; -namespace LibHac.Bcat.Detail.Service.Core +namespace LibHac.Bcat.Impl.Service.Core { [StructLayout(LayoutKind.Explicit, Size = 0x80)] internal struct DeliveryCacheFileMetaEntry diff --git a/src/LibHac/Bcat/Detail/Service/Core/DeliveryCacheStorageManager.cs b/src/LibHac/Bcat/Impl/Service/Core/DeliveryCacheStorageManager.cs similarity index 99% rename from src/LibHac/Bcat/Detail/Service/Core/DeliveryCacheStorageManager.cs rename to src/LibHac/Bcat/Impl/Service/Core/DeliveryCacheStorageManager.cs index bdbda87f..a4741d6a 100644 --- a/src/LibHac/Bcat/Detail/Service/Core/DeliveryCacheStorageManager.cs +++ b/src/LibHac/Bcat/Impl/Service/Core/DeliveryCacheStorageManager.cs @@ -6,7 +6,7 @@ using LibHac.Fs.Fsa; using LibHac.Fs.Shim; using static LibHac.Fs.StringTraits; -namespace LibHac.Bcat.Detail.Service.Core +namespace LibHac.Bcat.Impl.Service.Core { internal class DeliveryCacheStorageManager { diff --git a/src/LibHac/Bcat/Detail/Service/DeliveryCacheDirectoryService.cs b/src/LibHac/Bcat/Impl/Service/DeliveryCacheDirectoryService.cs similarity index 96% rename from src/LibHac/Bcat/Detail/Service/DeliveryCacheDirectoryService.cs rename to src/LibHac/Bcat/Impl/Service/DeliveryCacheDirectoryService.cs index 3feefa5c..5c4a89ea 100644 --- a/src/LibHac/Bcat/Detail/Service/DeliveryCacheDirectoryService.cs +++ b/src/LibHac/Bcat/Impl/Service/DeliveryCacheDirectoryService.cs @@ -1,9 +1,9 @@ using System; -using LibHac.Bcat.Detail.Ipc; -using LibHac.Bcat.Detail.Service.Core; +using LibHac.Bcat.Impl.Ipc; +using LibHac.Bcat.Impl.Service.Core; using LibHac.Common; -namespace LibHac.Bcat.Detail.Service +namespace LibHac.Bcat.Impl.Service { internal class DeliveryCacheDirectoryService : IDeliveryCacheDirectoryService { diff --git a/src/LibHac/Bcat/Detail/Service/DeliveryCacheFileService.cs b/src/LibHac/Bcat/Impl/Service/DeliveryCacheFileService.cs similarity index 97% rename from src/LibHac/Bcat/Detail/Service/DeliveryCacheFileService.cs rename to src/LibHac/Bcat/Impl/Service/DeliveryCacheFileService.cs index 2b4b884e..144655af 100644 --- a/src/LibHac/Bcat/Detail/Service/DeliveryCacheFileService.cs +++ b/src/LibHac/Bcat/Impl/Service/DeliveryCacheFileService.cs @@ -1,11 +1,11 @@ using System; -using LibHac.Bcat.Detail.Ipc; -using LibHac.Bcat.Detail.Service.Core; +using LibHac.Bcat.Impl.Ipc; +using LibHac.Bcat.Impl.Service.Core; using LibHac.Common; using LibHac.Fs; using LibHac.Fs.Fsa; -namespace LibHac.Bcat.Detail.Service +namespace LibHac.Bcat.Impl.Service { internal class DeliveryCacheFileService : IDeliveryCacheFileService { diff --git a/src/LibHac/Bcat/Detail/Service/DeliveryCacheStorageService.cs b/src/LibHac/Bcat/Impl/Service/DeliveryCacheStorageService.cs similarity index 96% rename from src/LibHac/Bcat/Detail/Service/DeliveryCacheStorageService.cs rename to src/LibHac/Bcat/Impl/Service/DeliveryCacheStorageService.cs index cdbd1a4b..aefec5ee 100644 --- a/src/LibHac/Bcat/Detail/Service/DeliveryCacheStorageService.cs +++ b/src/LibHac/Bcat/Impl/Service/DeliveryCacheStorageService.cs @@ -1,11 +1,11 @@ using System; using System.Diagnostics; -using LibHac.Bcat.Detail.Ipc; -using LibHac.Bcat.Detail.Service.Core; +using LibHac.Bcat.Impl.Ipc; +using LibHac.Bcat.Impl.Service.Core; using LibHac.Common; using LibHac.Util; -namespace LibHac.Bcat.Detail.Service +namespace LibHac.Bcat.Impl.Service { internal class DeliveryCacheStorageService : IDeliveryCacheStorageService { diff --git a/src/LibHac/Bcat/Detail/Service/ServiceCreator.cs b/src/LibHac/Bcat/Impl/Service/ServiceCreator.cs similarity index 96% rename from src/LibHac/Bcat/Detail/Service/ServiceCreator.cs rename to src/LibHac/Bcat/Impl/Service/ServiceCreator.cs index cb9ace1c..5488ae45 100644 --- a/src/LibHac/Bcat/Detail/Service/ServiceCreator.cs +++ b/src/LibHac/Bcat/Impl/Service/ServiceCreator.cs @@ -1,8 +1,8 @@ using LibHac.Arp; -using LibHac.Bcat.Detail.Ipc; +using LibHac.Bcat.Impl.Ipc; using LibHac.Common; -namespace LibHac.Bcat.Detail.Service +namespace LibHac.Bcat.Impl.Service { internal class ServiceCreator : IServiceCreator { diff --git a/src/LibHac/Crypto/Aes.cs b/src/LibHac/Crypto/Aes.cs index ae8e7d1b..13ac315e 100644 --- a/src/LibHac/Crypto/Aes.cs +++ b/src/LibHac/Crypto/Aes.cs @@ -2,7 +2,7 @@ using System; using System.Runtime.CompilerServices; using LibHac.Common; -using LibHac.Crypto.Detail; +using LibHac.Crypto.Impl; using LibHac.Diag; using AesNi = System.Runtime.Intrinsics.X86.Aes; diff --git a/src/LibHac/Crypto/AesCbcCipher.cs b/src/LibHac/Crypto/AesCbcCipher.cs index deeeb673..7e246066 100644 --- a/src/LibHac/Crypto/AesCbcCipher.cs +++ b/src/LibHac/Crypto/AesCbcCipher.cs @@ -1,5 +1,5 @@ using System; -using LibHac.Crypto.Detail; +using LibHac.Crypto.Impl; namespace LibHac.Crypto { diff --git a/src/LibHac/Crypto/AesCbcCipherNi.cs b/src/LibHac/Crypto/AesCbcCipherNi.cs index 0f393600..99ac5675 100644 --- a/src/LibHac/Crypto/AesCbcCipherNi.cs +++ b/src/LibHac/Crypto/AesCbcCipherNi.cs @@ -2,7 +2,7 @@ using System.Runtime.CompilerServices; using System.Runtime.Intrinsics; using LibHac.Common; -using LibHac.Crypto.Detail; +using LibHac.Crypto.Impl; namespace LibHac.Crypto { diff --git a/src/LibHac/Crypto/AesCtrCipher.cs b/src/LibHac/Crypto/AesCtrCipher.cs index d8f1e6d7..35a9454b 100644 --- a/src/LibHac/Crypto/AesCtrCipher.cs +++ b/src/LibHac/Crypto/AesCtrCipher.cs @@ -1,6 +1,6 @@ using System; using LibHac.Common; -using LibHac.Crypto.Detail; +using LibHac.Crypto.Impl; namespace LibHac.Crypto { diff --git a/src/LibHac/Crypto/AesCtrCipherNi.cs b/src/LibHac/Crypto/AesCtrCipherNi.cs index 3562b9cd..f8222cd1 100644 --- a/src/LibHac/Crypto/AesCtrCipherNi.cs +++ b/src/LibHac/Crypto/AesCtrCipherNi.cs @@ -2,7 +2,7 @@ using System.Runtime.CompilerServices; using System.Runtime.Intrinsics; using LibHac.Common; -using LibHac.Crypto.Detail; +using LibHac.Crypto.Impl; namespace LibHac.Crypto { diff --git a/src/LibHac/Crypto/AesEcbCipher.cs b/src/LibHac/Crypto/AesEcbCipher.cs index fcc6c698..25bd1fe1 100644 --- a/src/LibHac/Crypto/AesEcbCipher.cs +++ b/src/LibHac/Crypto/AesEcbCipher.cs @@ -1,5 +1,5 @@ using System; -using LibHac.Crypto.Detail; +using LibHac.Crypto.Impl; namespace LibHac.Crypto { diff --git a/src/LibHac/Crypto/AesEcbCipherNi.cs b/src/LibHac/Crypto/AesEcbCipherNi.cs index 429edc61..8adf0f62 100644 --- a/src/LibHac/Crypto/AesEcbCipherNi.cs +++ b/src/LibHac/Crypto/AesEcbCipherNi.cs @@ -1,5 +1,5 @@ using System; -using LibHac.Crypto.Detail; +using LibHac.Crypto.Impl; namespace LibHac.Crypto { diff --git a/src/LibHac/Crypto/AesXtsCipher.cs b/src/LibHac/Crypto/AesXtsCipher.cs index 86a07c83..e8096260 100644 --- a/src/LibHac/Crypto/AesXtsCipher.cs +++ b/src/LibHac/Crypto/AesXtsCipher.cs @@ -1,6 +1,6 @@ using System; using LibHac.Common; -using LibHac.Crypto.Detail; +using LibHac.Crypto.Impl; namespace LibHac.Crypto { diff --git a/src/LibHac/Crypto/AesXtsCipherNi.cs b/src/LibHac/Crypto/AesXtsCipherNi.cs index c50dec22..476c0a81 100644 --- a/src/LibHac/Crypto/AesXtsCipherNi.cs +++ b/src/LibHac/Crypto/AesXtsCipherNi.cs @@ -2,7 +2,7 @@ using System.Runtime.CompilerServices; using System.Runtime.Intrinsics; using LibHac.Common; -using LibHac.Crypto.Detail; +using LibHac.Crypto.Impl; namespace LibHac.Crypto { diff --git a/src/LibHac/Crypto/Detail/AesCbcMode.cs b/src/LibHac/Crypto/Impl/AesCbcMode.cs similarity index 95% rename from src/LibHac/Crypto/Detail/AesCbcMode.cs rename to src/LibHac/Crypto/Impl/AesCbcMode.cs index 86361cd0..e66e7944 100644 --- a/src/LibHac/Crypto/Detail/AesCbcMode.cs +++ b/src/LibHac/Crypto/Impl/AesCbcMode.cs @@ -1,7 +1,7 @@ using System; using System.Security.Cryptography; -namespace LibHac.Crypto.Detail +namespace LibHac.Crypto.Impl { public struct AesCbcMode { diff --git a/src/LibHac/Crypto/Detail/AesCbcModeNi.cs b/src/LibHac/Crypto/Impl/AesCbcModeNi.cs similarity index 99% rename from src/LibHac/Crypto/Detail/AesCbcModeNi.cs rename to src/LibHac/Crypto/Impl/AesCbcModeNi.cs index bc3e79b6..cd880774 100644 --- a/src/LibHac/Crypto/Detail/AesCbcModeNi.cs +++ b/src/LibHac/Crypto/Impl/AesCbcModeNi.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Runtime.Intrinsics; using System.Runtime.Intrinsics.X86; -namespace LibHac.Crypto.Detail +namespace LibHac.Crypto.Impl { public struct AesCbcModeNi { diff --git a/src/LibHac/Crypto/Detail/AesCore.cs b/src/LibHac/Crypto/Impl/AesCore.cs similarity index 98% rename from src/LibHac/Crypto/Detail/AesCore.cs rename to src/LibHac/Crypto/Impl/AesCore.cs index b87fbf40..32023b68 100644 --- a/src/LibHac/Crypto/Detail/AesCore.cs +++ b/src/LibHac/Crypto/Impl/AesCore.cs @@ -3,7 +3,7 @@ using System.Diagnostics; using System.Security.Cryptography; using LibHac.Common; -namespace LibHac.Crypto.Detail +namespace LibHac.Crypto.Impl { public struct AesCore { diff --git a/src/LibHac/Crypto/Detail/AesCoreNi.cs b/src/LibHac/Crypto/Impl/AesCoreNi.cs similarity index 99% rename from src/LibHac/Crypto/Detail/AesCoreNi.cs rename to src/LibHac/Crypto/Impl/AesCoreNi.cs index 67cb7c13..dbfd04a6 100644 --- a/src/LibHac/Crypto/Detail/AesCoreNi.cs +++ b/src/LibHac/Crypto/Impl/AesCoreNi.cs @@ -4,10 +4,9 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Runtime.Intrinsics; using System.Runtime.Intrinsics.X86; - using AesNi = System.Runtime.Intrinsics.X86.Aes; -namespace LibHac.Crypto.Detail +namespace LibHac.Crypto.Impl { [StructLayout(LayoutKind.Sequential, Size = RoundKeyCount * RoundKeySize)] public struct AesCoreNi diff --git a/src/LibHac/Crypto/Detail/AesCtrMode.cs b/src/LibHac/Crypto/Impl/AesCtrMode.cs similarity index 98% rename from src/LibHac/Crypto/Detail/AesCtrMode.cs rename to src/LibHac/Crypto/Impl/AesCtrMode.cs index 80470619..f6c38f68 100644 --- a/src/LibHac/Crypto/Detail/AesCtrMode.cs +++ b/src/LibHac/Crypto/Impl/AesCtrMode.cs @@ -7,7 +7,7 @@ using System.Security.Cryptography; using LibHac.Common; using LibHac.Util; -namespace LibHac.Crypto.Detail +namespace LibHac.Crypto.Impl { public struct AesCtrMode { diff --git a/src/LibHac/Crypto/Detail/AesCtrModeNi.cs b/src/LibHac/Crypto/Impl/AesCtrModeNi.cs similarity index 99% rename from src/LibHac/Crypto/Detail/AesCtrModeNi.cs rename to src/LibHac/Crypto/Impl/AesCtrModeNi.cs index 84b901aa..85fe48f5 100644 --- a/src/LibHac/Crypto/Detail/AesCtrModeNi.cs +++ b/src/LibHac/Crypto/Impl/AesCtrModeNi.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Runtime.Intrinsics; using System.Runtime.Intrinsics.X86; -namespace LibHac.Crypto.Detail +namespace LibHac.Crypto.Impl { public struct AesCtrModeNi { diff --git a/src/LibHac/Crypto/Detail/AesEcbMode.cs b/src/LibHac/Crypto/Impl/AesEcbMode.cs similarity index 95% rename from src/LibHac/Crypto/Detail/AesEcbMode.cs rename to src/LibHac/Crypto/Impl/AesEcbMode.cs index 8a90322d..0b1b7b26 100644 --- a/src/LibHac/Crypto/Detail/AesEcbMode.cs +++ b/src/LibHac/Crypto/Impl/AesEcbMode.cs @@ -1,7 +1,7 @@ using System; using System.Security.Cryptography; -namespace LibHac.Crypto.Detail +namespace LibHac.Crypto.Impl { public struct AesEcbMode { diff --git a/src/LibHac/Crypto/Detail/AesEcbModeNi.cs b/src/LibHac/Crypto/Impl/AesEcbModeNi.cs similarity index 94% rename from src/LibHac/Crypto/Detail/AesEcbModeNi.cs rename to src/LibHac/Crypto/Impl/AesEcbModeNi.cs index f05cd22c..fa7a03fc 100644 --- a/src/LibHac/Crypto/Detail/AesEcbModeNi.cs +++ b/src/LibHac/Crypto/Impl/AesEcbModeNi.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.Crypto.Detail +namespace LibHac.Crypto.Impl { public struct AesEcbModeNi { diff --git a/src/LibHac/Crypto/Detail/AesXtsMode.cs b/src/LibHac/Crypto/Impl/AesXtsMode.cs similarity index 99% rename from src/LibHac/Crypto/Detail/AesXtsMode.cs rename to src/LibHac/Crypto/Impl/AesXtsMode.cs index 679ed3d0..4c51f187 100644 --- a/src/LibHac/Crypto/Detail/AesXtsMode.cs +++ b/src/LibHac/Crypto/Impl/AesXtsMode.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Security.Cryptography; using LibHac.Common; -namespace LibHac.Crypto.Detail +namespace LibHac.Crypto.Impl { public struct AesXtsMode { diff --git a/src/LibHac/Crypto/Detail/AesXtsModeNi.cs b/src/LibHac/Crypto/Impl/AesXtsModeNi.cs similarity index 99% rename from src/LibHac/Crypto/Detail/AesXtsModeNi.cs rename to src/LibHac/Crypto/Impl/AesXtsModeNi.cs index 3578a7a7..627bc67f 100644 --- a/src/LibHac/Crypto/Detail/AesXtsModeNi.cs +++ b/src/LibHac/Crypto/Impl/AesXtsModeNi.cs @@ -6,7 +6,7 @@ using System.Runtime.Intrinsics; using System.Runtime.Intrinsics.X86; using LibHac.Common; -namespace LibHac.Crypto.Detail +namespace LibHac.Crypto.Impl { public struct AesXtsModeNi { diff --git a/src/LibHac/Crypto/Detail/HashState.cs b/src/LibHac/Crypto/Impl/HashState.cs similarity index 74% rename from src/LibHac/Crypto/Detail/HashState.cs rename to src/LibHac/Crypto/Impl/HashState.cs index e227f451..cc63712d 100644 --- a/src/LibHac/Crypto/Detail/HashState.cs +++ b/src/LibHac/Crypto/Impl/HashState.cs @@ -1,4 +1,4 @@ -namespace LibHac.Crypto.Detail +namespace LibHac.Crypto.Impl { public enum HashState { diff --git a/src/LibHac/Crypto/Detail/Sha256Impl.cs b/src/LibHac/Crypto/Impl/Sha256Impl.cs similarity index 97% rename from src/LibHac/Crypto/Detail/Sha256Impl.cs rename to src/LibHac/Crypto/Impl/Sha256Impl.cs index 9f211b62..3e444215 100644 --- a/src/LibHac/Crypto/Detail/Sha256Impl.cs +++ b/src/LibHac/Crypto/Impl/Sha256Impl.cs @@ -3,7 +3,7 @@ using System.Diagnostics; using System.Security.Cryptography; using LibHac.Common; -namespace LibHac.Crypto.Detail +namespace LibHac.Crypto.Impl { public struct Sha256Impl { diff --git a/src/LibHac/Crypto/Sha256.cs b/src/LibHac/Crypto/Sha256.cs index 8b5559c0..dcdc1306 100644 --- a/src/LibHac/Crypto/Sha256.cs +++ b/src/LibHac/Crypto/Sha256.cs @@ -1,5 +1,5 @@ using System; -using LibHac.Crypto.Detail; +using LibHac.Crypto.Impl; namespace LibHac.Crypto { diff --git a/src/LibHac/Crypto/Sha256Generator.cs b/src/LibHac/Crypto/Sha256Generator.cs index ff0e79ee..ddcc0918 100644 --- a/src/LibHac/Crypto/Sha256Generator.cs +++ b/src/LibHac/Crypto/Sha256Generator.cs @@ -1,5 +1,5 @@ using System; -using LibHac.Crypto.Detail; +using LibHac.Crypto.Impl; namespace LibHac.Crypto { diff --git a/src/LibHac/FsSrv/FsCreator/PartitionFileSystemCreator.cs b/src/LibHac/FsSrv/FsCreator/PartitionFileSystemCreator.cs index 5e67fe7c..75ebad6e 100644 --- a/src/LibHac/FsSrv/FsCreator/PartitionFileSystemCreator.cs +++ b/src/LibHac/FsSrv/FsCreator/PartitionFileSystemCreator.cs @@ -2,7 +2,7 @@ using LibHac.Fs; using LibHac.Fs.Fsa; using LibHac.FsSystem; -using LibHac.FsSystem.Detail; +using LibHac.FsSystem.Impl; namespace LibHac.FsSrv.FsCreator { diff --git a/src/LibHac/FsSrv/FsCreator/StorageOnNcaCreator.cs b/src/LibHac/FsSrv/FsCreator/StorageOnNcaCreator.cs index 8ce51a10..4a634b35 100644 --- a/src/LibHac/FsSrv/FsCreator/StorageOnNcaCreator.cs +++ b/src/LibHac/FsSrv/FsCreator/StorageOnNcaCreator.cs @@ -4,7 +4,7 @@ using LibHac.Common.Keys; using LibHac.Fs; using LibHac.Fs.Fsa; using LibHac.FsSystem; -using LibHac.FsSystem.Detail; +using LibHac.FsSystem.Impl; using LibHac.FsSystem.NcaUtils; namespace LibHac.FsSrv.FsCreator diff --git a/src/LibHac/FsSystem/Detail/PartitionFileSystemFormats.cs b/src/LibHac/FsSystem/Impl/PartitionFileSystemFormats.cs similarity index 97% rename from src/LibHac/FsSystem/Detail/PartitionFileSystemFormats.cs rename to src/LibHac/FsSystem/Impl/PartitionFileSystemFormats.cs index 866edb15..e60c6714 100644 --- a/src/LibHac/FsSystem/Detail/PartitionFileSystemFormats.cs +++ b/src/LibHac/FsSystem/Impl/PartitionFileSystemFormats.cs @@ -1,7 +1,7 @@ using System.Runtime.InteropServices; using LibHac.Common; -namespace LibHac.FsSystem.Detail +namespace LibHac.FsSystem.Impl { public interface IPartitionFileSystemEntry { diff --git a/src/LibHac/FsSystem/PartitionFileSystemCore.cs b/src/LibHac/FsSystem/PartitionFileSystemCore.cs index a985cdd2..480da5d4 100644 --- a/src/LibHac/FsSystem/PartitionFileSystemCore.cs +++ b/src/LibHac/FsSystem/PartitionFileSystemCore.cs @@ -4,7 +4,7 @@ using LibHac.Common; using LibHac.Crypto; using LibHac.Fs; using LibHac.Fs.Fsa; -using LibHac.FsSystem.Detail; +using LibHac.FsSystem.Impl; using LibHac.Util; namespace LibHac.FsSystem diff --git a/src/LibHac/FsSystem/PartitionFileSystemMetaCore.cs b/src/LibHac/FsSystem/PartitionFileSystemMetaCore.cs index 1fb43e15..e32e72eb 100644 --- a/src/LibHac/FsSystem/PartitionFileSystemMetaCore.cs +++ b/src/LibHac/FsSystem/PartitionFileSystemMetaCore.cs @@ -4,7 +4,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using LibHac.Common; using LibHac.Fs; -using LibHac.FsSystem.Detail; +using LibHac.FsSystem.Impl; using LibHac.Util; namespace LibHac.FsSystem diff --git a/src/hactoolnet/ProcessBench.cs b/src/hactoolnet/ProcessBench.cs index 5576d7ce..9046977b 100644 --- a/src/hactoolnet/ProcessBench.cs +++ b/src/hactoolnet/ProcessBench.cs @@ -6,6 +6,7 @@ using System.Runtime.InteropServices; using System.Runtime.Intrinsics; using LibHac; using LibHac.Crypto; +using LibHac.Crypto.Impl; using LibHac.Fs; using LibHac.FsSystem; @@ -253,7 +254,7 @@ namespace hactoolnet while (Unsafe.IsAddressLessThan(ref inBlock, ref end)) { var inputVec = Unsafe.ReadUnaligned>(ref inBlock); - Vector128 outputVec = LibHac.Crypto.Detail.AesCoreNi.EncryptBlock(inputVec, keyVec); + Vector128 outputVec = AesCoreNi.EncryptBlock(inputVec, keyVec); Unsafe.WriteUnaligned(ref outBlock, outputVec); inBlock = ref Unsafe.Add(ref inBlock, Aes.BlockSize); @@ -273,7 +274,7 @@ namespace hactoolnet while (Unsafe.IsAddressLessThan(ref inBlock, ref end)) { var inputVec = Unsafe.ReadUnaligned>(ref inBlock); - Vector128 outputVec = LibHac.Crypto.Detail.AesCoreNi.DecryptBlock(inputVec, keyVec); + Vector128 outputVec = AesCoreNi.DecryptBlock(inputVec, keyVec); Unsafe.WriteUnaligned(ref outBlock, outputVec); inBlock = ref Unsafe.Add(ref inBlock, Aes.BlockSize);