Finalize Release Candidate 1

README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="assets/SecureFolderFS_Header.png" />
+  <img src=".github/assets/SecureFolderFS_Header.png" />
 </p>
 
 <p align="center">
@@ -32,19 +32,19 @@ This ensures that your data will always remain secure.
 
 <p align="left">
   <a style="text-decoration:none" href="https://apps.microsoft.com/store/detail/securefolderfs/9NZ7CZRN7GG8" target="_blank">
-    <img height="56" src="assets/Source_Microsoft.png" alt="Get it from Microsoft" />
+    <img height="56" src=".github/assets/Source_Microsoft.png" alt="Get it from Microsoft" />
   </a>
   <!--<a style="text-decoration:none" href="https://apps.apple.com">
-    <img height="56" src="assets/Source_AppStore.png" alt="Download on the App Store" />
+    <img height="56" src=".github/assets/Source_AppStore.png" alt="Download on the App Store" />
   </a>
   <a style="text-decoration:none" href="https://play.google.com/store/apps/details?id=org.securefolderfs.securefolderfs">
-    <img height="56" src="assets/Source_GooglePlay.png" alt="Get it on Google Play" />
+    <img height="56" src=".github/assets/Source_GooglePlay.png" alt="Get it on Google Play" />
   </a>
   <a style="text-decoration:none" href="https://flathub.org/apps/org.securefolderfs.securefolderfs">
-    <img height="56" src="assets/Source_Flathub.png" alt="Get it on Flathub" />
+    <img height="56" src=".github/assets/Source_Flathub.png" alt="Get it on Flathub" />
   </a>-->
   <a style="text-decoration:none" href="https://github.com/securefolderfs-community/SecureFolderFS/releases/latest">
-    <img height="56" src="assets/Source_GitHub.png" alt="Get it from GitHub" />
+    <img height="56" src=".github/assets/Source_GitHub.png" alt="Get it from GitHub" />
   </a>
 </p>
 
@@ -58,14 +58,14 @@ SecureFolderFS is a modern encryption program that helps you keep your files saf
 From the app's UI, you can create new vaults to store items securely.
 
 <p align="center">
-  <img src="assets/SecureFolderFS_LockedVault.png" width="750" />
+  <img src=".github/assets/SecureFolderFS_LockedVault.png" width="750" />
 </p>
 
 > *For example, the 'Secrets' vault is locked behind a password.*
 > *You must enter the correct password, which was set when the vault was created, to decrypt and unlock the vault.*
 
 <p align="center">
-  <img src="assets/SecureFolderFS_Dashboard.png" width="750" />
+  <img src=".github/assets/SecureFolderFS_Dashboard.png" width="750" />
 </p>
 
 > *Upon entering the correct password, the vault will then open.*
@@ -162,5 +162,5 @@ cd SecureFolderFS
 ---
 
 <p align="center">
-  <img src="assets/SecureFolderFS_Hero.png" />
+  <img src=".github/assets/SecureFolderFS_Hero.png" />
 </p>

src/Core/SecureFolderFS.Core.Cryptography/Cipher/AesCtr128.cs → src/Core/SecureFolderFS.Core.Cryptography/Cipher/AesCtr256.cs

@@ -5,7 +5,7 @@
 namespace SecureFolderFS.Core.Cryptography.Cipher
 {
     [Obsolete("AES-CTR + HMAC encryption mode is deprecated.")]
-    public static class AesCtr128
+    public static class AesCtr256
     {
         private const ulong CTR_START = 0UL;
 

src/Core/SecureFolderFS.Core.Cryptography/Cipher/AesGcm128.cs → src/Core/SecureFolderFS.Core.Cryptography/Cipher/AesGcm256.cs

@@ -3,8 +3,7 @@
 
 namespace SecureFolderFS.Core.Cryptography.Cipher
 {
-    /// TODO: Needs docs
-    public static class AesGcm128
+    public static class AesGcm256
     {
         public static void Encrypt(ReadOnlySpan<byte> bytes, ReadOnlySpan<byte> key, ReadOnlySpan<byte> nonce, Span<byte> tag, Span<byte> result, ReadOnlySpan<byte> associatedData)
         {

src/Core/SecureFolderFS.Core.Cryptography/Cipher/AesSiv128.cs → src/Core/SecureFolderFS.Core.Cryptography/Cipher/AesSiv256.cs

@@ -1,21 +1,19 @@
-using Miscreant;
-using System;
+using System;
 using System.Runtime.CompilerServices;
-using System.Security.Cryptography;
+using Miscreant;
 
 namespace SecureFolderFS.Core.Cryptography.Cipher
 {
-    // TODO: Needs docs
-    public sealed class AesSiv128 : IDisposable
+    public sealed class AesSiv256 : IDisposable
     {
         private readonly Aead _aesCmacSiv;
 
-        private AesSiv128(Aead aesCmacSiv)
+        private AesSiv256(Aead aesCmacSiv)
         {
             _aesCmacSiv = aesCmacSiv;
         }
 
-        public static AesSiv128 CreateInstance(ReadOnlySpan<byte> dekKey, ReadOnlySpan<byte> macKey)
+        public static AesSiv256 CreateInstance(ReadOnlySpan<byte> dekKey, ReadOnlySpan<byte> macKey)
         {
             // The longKey will be split into two keys - one for S2V and the other one for CTR
             var longKey = new byte[dekKey.Length + macKey.Length];
@@ -26,7 +24,7 @@ public static AesSiv128 CreateInstance(ReadOnlySpan<byte> dekKey, ReadOnlySpan<b
             macKey.CopyTo(longKeySpan.Slice(dekKey.Length));
 
             var aesCmacSiv = Aead.CreateAesCmacSiv(longKey);
-            return new AesSiv128(aesCmacSiv);
+            return new AesSiv256(aesCmacSiv);
         }
 
         [MethodImpl(MethodImplOptions.Synchronized)]

src/Core/SecureFolderFS.Core.Cryptography/ContentCrypt/AesCtrHmacContentCrypt.cs

@@ -37,7 +37,7 @@ public override unsafe void EncryptChunk(ReadOnlySpan<byte> plaintextChunk, long
             RandomNumberGenerator.Fill(ciphertextChunk.Slice(0, CHUNK_NONCE_SIZE));
 
             // Encrypt
-            AesCtr128.Encrypt(
+            AesCtr256.Encrypt(
                 plaintextChunk,
                 header.GetHeaderContentKey(),
                 ciphertextChunk.Slice(0, CHUNK_NONCE_SIZE),
@@ -114,7 +114,7 @@ public override unsafe bool DecryptChunk(ReadOnlySpan<byte> ciphertextChunk, lon
             }
 
             // Decrypt
-            AesCtr128.Decrypt(
+            AesCtr256.Decrypt(
                 ciphertextChunk.GetChunkPayload(),
                 header.GetHeaderContentKey(),
                 ciphertextChunk.GetChunkNonce(),

src/Core/SecureFolderFS.Core.Cryptography/ContentCrypt/AesGcmContentCrypt.cs

@@ -34,7 +34,7 @@ public override void EncryptChunk(ReadOnlySpan<byte> plaintextChunk, long chunkN
             CryptHelpers.FillAssociatedDataBigEndian(associatedData, header.GetHeaderNonce(), chunkNumber);
 
             // Encrypt
-            AesGcm128.Encrypt(
+            AesGcm256.Encrypt(
                 plaintextChunk,
                 header.GetHeaderContentKey(),
                 ciphertextChunk.Slice(0, CHUNK_NONCE_SIZE),
@@ -52,7 +52,7 @@ public override bool DecryptChunk(ReadOnlySpan<byte> ciphertextChunk, long chunk
             CryptHelpers.FillAssociatedDataBigEndian(associatedData, header.GetHeaderNonce(), chunkNumber);
 
             // Decrypt
-            return AesGcm128.TryDecrypt(
+            return AesGcm256.TryDecrypt(
                 ciphertextChunk.GetChunkPayload(),
                 header.GetHeaderContentKey(),
                 ciphertextChunk.GetChunkNonce(),

src/Core/SecureFolderFS.Core.Cryptography/ContentCrypt/BaseContentCrypt.cs

@@ -35,7 +35,7 @@ public virtual long CalculateCiphertextSize(long plaintextSize)
         /// <inheritdoc/>
         public virtual long CalculatePlaintextSize(long ciphertextSize)
         {
-            if (ciphertextSize == 0L)
+            if (ciphertextSize <= 0L)
                 return 0L;
 
             var chunkOverhead = ChunkCiphertextSize - ChunkPlaintextSize;

src/Core/SecureFolderFS.Core.Cryptography/HeaderCrypt/AesCtrHmacHeaderCrypt.cs

@@ -50,7 +50,7 @@ public override unsafe void EncryptHeader(ReadOnlySpan<byte> plaintextHeader, Sp
                     var pt = new ReadOnlySpan<byte>((byte*)s.ptPtr, s.ptLen);
                     var ct = new Span<byte>((byte*)s.ctPtr, s.ctLen);
 
-                    AesCtr128.Encrypt(
+                    AesCtr256.Encrypt(
                         pt.GetHeaderContentKey(),
                         dekKey,
                         pt.GetHeaderNonce(),
@@ -113,7 +113,7 @@ public override unsafe bool DecryptHeader(ReadOnlySpan<byte> ciphertextHeader, S
                     var ct = new ReadOnlySpan<byte>((byte*)s.ctPtr, s.ctLen);
                     var pt = new Span<byte>((byte*)s.ptPtr, s.ptLen);
 
-                    AesCtr128.Decrypt(
+                    AesCtr256.Decrypt(
                         ct.GetHeaderContentKey(),
                         dekKey,
                         ct.GetHeaderNonce(),

src/Core/SecureFolderFS.Core.Cryptography/HeaderCrypt/AesGcmHeaderCrypt.cs

@@ -48,7 +48,7 @@ public override unsafe void EncryptHeader(ReadOnlySpan<byte> plaintextHeader, Sp
                     var ct = new Span<byte>((byte*)s.ctPtr, s.ctLen);
 
                     // Encrypt
-                    AesGcm128.Encrypt(
+                    AesGcm256.Encrypt(
                         pt.GetHeaderContentKey(),
                         dekKey,
                         pt.GetHeaderNonce(),
@@ -76,7 +76,7 @@ public override unsafe bool DecryptHeader(ReadOnlySpan<byte> ciphertextHeader, S
                     var pt = new Span<byte>((byte*)s.ptPtr, s.ptLen);
 
                     // Decrypt
-                    return AesGcm128.TryDecrypt(
+                    return AesGcm256.TryDecrypt(
                         ct.GetHeaderContentKey(),
                         dekKey,
                         ct.GetHeaderNonce(),

src/Core/SecureFolderFS.Core.Cryptography/NameCrypt/AesSivNameCrypt.cs

@@ -8,29 +8,30 @@ namespace SecureFolderFS.Core.Cryptography.NameCrypt
     /// <inheritdoc cref="INameCrypt"/>
     internal sealed class AesSivNameCrypt : BaseNameCrypt
     {
-        private readonly AesSiv128 _aesSiv128;
+        private readonly AesSiv256 _aesSiv256;
 
         public AesSivNameCrypt(KeyPair keyPair, string fileNameEncodingId)
             : base(fileNameEncodingId)
         {
-            _aesSiv128 = keyPair.UseKeys((dekKey, macKey) =>
+            _aesSiv256 = keyPair.UseKeys((dekKey, macKey) =>
             {
-                return AesSiv128.CreateInstance(dekKey.ToArray(), macKey.ToArray()); // Note: AesSiv128 requires a byte[] key.
+                // Note: AesSiv256 requires a byte[] key.
+                return AesSiv256.CreateInstance(dekKey.ToArray(), macKey.ToArray());
             });
         }
 
         /// <inheritdoc/>
         protected override byte[] EncryptFileName(ReadOnlySpan<byte> plaintextFileNameBuffer, ReadOnlySpan<byte> directoryId)
         {
-            return _aesSiv128.Encrypt(plaintextFileNameBuffer, directoryId);
+            return _aesSiv256.Encrypt(plaintextFileNameBuffer, directoryId);
         }
 
         /// <inheritdoc/>
         protected override byte[]? DecryptFileName(ReadOnlySpan<byte> ciphertextFileNameBuffer, ReadOnlySpan<byte> directoryId)
         {
             try
             {
-                return _aesSiv128.Decrypt(ciphertextFileNameBuffer, directoryId);
+                return _aesSiv256.Decrypt(ciphertextFileNameBuffer, directoryId);
             }
             catch (CryptographicException)
             {
@@ -41,7 +42,7 @@ protected override byte[] EncryptFileName(ReadOnlySpan<byte> plaintextFileNameBu
         /// <inheritdoc/>
         public override void Dispose()
         {
-            _aesSiv128.Dispose();
+            _aesSiv256.Dispose();
         }
     }
 }

src/Core/SecureFolderFS.Core.Dokany/Callbacks/BaseDokanyCallbacks.cs

@@ -18,14 +18,13 @@ namespace SecureFolderFS.Core.Dokany.Callbacks
 {
     internal abstract class BaseDokanyCallbacks : IDokanOperationsUnsafe, IDisposable
     {
+        protected readonly FileSystemSpecifics specifics;
         protected readonly BaseHandlesManager handlesManager;
         protected readonly VolumeModel volumeModel;
 
-        public FileSystemSpecifics Specifics { get; }
-
         protected BaseDokanyCallbacks(FileSystemSpecifics specifics, BaseHandlesManager handlesManager, VolumeModel volumeModel)
         {
-            Specifics = specifics;
+            this.specifics = specifics;
             this.handlesManager = handlesManager;
             this.volumeModel = volumeModel;
         }
@@ -83,7 +82,7 @@ public virtual NtStatus FindFiles(string fileName, out IList<FileInformation> fi
         /// <inheritdoc/>
         public virtual NtStatus SetEndOfFile(string fileName, long length, IDokanFileInfo info)
         {
-            if (Specifics.Options.IsReadOnly)
+            if (specifics.Options.IsReadOnly)
                 return Trace(DokanResult.AccessDenied, fileName, info);
 
             if (handlesManager.GetHandle<FileHandle>(GetContextValue(info)) is not { } fileHandle)
@@ -207,7 +206,7 @@ public virtual unsafe NtStatus ReadFile(string fileName, IntPtr buffer, uint buf
         [MethodImpl(MethodImplOptions.Synchronized)]
         public virtual unsafe NtStatus WriteFile(string fileName, IntPtr buffer, uint bufferLength, out int bytesWritten, long offset, IDokanFileInfo info)
         {
-            if (Specifics.Options.IsReadOnly)
+            if (specifics.Options.IsReadOnly)
             {
                 bytesWritten = 0;
                 return Trace(DokanResult.AccessDenied, fileName, info);
@@ -349,7 +348,7 @@ protected void CloseHandle(IDokanFileInfo info)
         /// <inheritdoc/>
         public virtual void Dispose()
         {
-            Specifics.Dispose();
+            specifics.Dispose();
             handlesManager.Dispose();
         }