Collective work for Release Candidate 1

SecureFolderFS.sln

@@ -76,6 +76,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SecureFolderFS.Core.WinFsp"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SecureFolderFS.Cli", "src\Platforms\SecureFolderFS.Cli\SecureFolderFS.Cli.csproj", "{A9219707-C494-4D3B-8123-43652707B516}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SecureFolderFS.Sdk.DeviceLink", "src\Sdk\SecureFolderFS.Sdk.DeviceLink\SecureFolderFS.Sdk.DeviceLink.csproj", "{85FE77EA-9F89-4F42-BD79-26C82F847DDC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SecureFolderFS.Sdk.Dropbox", "src\Sdk\SecureFolderFS.Sdk.Dropbox\SecureFolderFS.Sdk.Dropbox.csproj", "{FD52B782-4E07-41B2-8EA9-DE2347DEB9E2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SecureFolderFS.Sdk.WebDavClient", "src\Sdk\SecureFolderFS.Sdk.WebDavClient\SecureFolderFS.Sdk.WebDavClient.csproj", "{E9D21865-C31B-49AD-B9CE-A8A9491789D5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -504,6 +510,54 @@ Global
 		{A9219707-C494-4D3B-8123-43652707B516}.Release|x64.Build.0 = Release|Any CPU
 		{A9219707-C494-4D3B-8123-43652707B516}.Release|x86.ActiveCfg = Release|Any CPU
 		{A9219707-C494-4D3B-8123-43652707B516}.Release|x86.Build.0 = Release|Any CPU
+		{85FE77EA-9F89-4F42-BD79-26C82F847DDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85FE77EA-9F89-4F42-BD79-26C82F847DDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{85FE77EA-9F89-4F42-BD79-26C82F847DDC}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{85FE77EA-9F89-4F42-BD79-26C82F847DDC}.Debug|arm64.Build.0 = Debug|Any CPU
+		{85FE77EA-9F89-4F42-BD79-26C82F847DDC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{85FE77EA-9F89-4F42-BD79-26C82F847DDC}.Debug|x64.Build.0 = Debug|Any CPU
+		{85FE77EA-9F89-4F42-BD79-26C82F847DDC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{85FE77EA-9F89-4F42-BD79-26C82F847DDC}.Debug|x86.Build.0 = Debug|Any CPU
+		{85FE77EA-9F89-4F42-BD79-26C82F847DDC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{85FE77EA-9F89-4F42-BD79-26C82F847DDC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{85FE77EA-9F89-4F42-BD79-26C82F847DDC}.Release|arm64.ActiveCfg = Release|Any CPU
+		{85FE77EA-9F89-4F42-BD79-26C82F847DDC}.Release|arm64.Build.0 = Release|Any CPU
+		{85FE77EA-9F89-4F42-BD79-26C82F847DDC}.Release|x64.ActiveCfg = Release|Any CPU
+		{85FE77EA-9F89-4F42-BD79-26C82F847DDC}.Release|x64.Build.0 = Release|Any CPU
+		{85FE77EA-9F89-4F42-BD79-26C82F847DDC}.Release|x86.ActiveCfg = Release|Any CPU
+		{85FE77EA-9F89-4F42-BD79-26C82F847DDC}.Release|x86.Build.0 = Release|Any CPU
+		{FD52B782-4E07-41B2-8EA9-DE2347DEB9E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD52B782-4E07-41B2-8EA9-DE2347DEB9E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD52B782-4E07-41B2-8EA9-DE2347DEB9E2}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{FD52B782-4E07-41B2-8EA9-DE2347DEB9E2}.Debug|arm64.Build.0 = Debug|Any CPU
+		{FD52B782-4E07-41B2-8EA9-DE2347DEB9E2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FD52B782-4E07-41B2-8EA9-DE2347DEB9E2}.Debug|x64.Build.0 = Debug|Any CPU
+		{FD52B782-4E07-41B2-8EA9-DE2347DEB9E2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FD52B782-4E07-41B2-8EA9-DE2347DEB9E2}.Debug|x86.Build.0 = Debug|Any CPU
+		{FD52B782-4E07-41B2-8EA9-DE2347DEB9E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD52B782-4E07-41B2-8EA9-DE2347DEB9E2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD52B782-4E07-41B2-8EA9-DE2347DEB9E2}.Release|arm64.ActiveCfg = Release|Any CPU
+		{FD52B782-4E07-41B2-8EA9-DE2347DEB9E2}.Release|arm64.Build.0 = Release|Any CPU
+		{FD52B782-4E07-41B2-8EA9-DE2347DEB9E2}.Release|x64.ActiveCfg = Release|Any CPU
+		{FD52B782-4E07-41B2-8EA9-DE2347DEB9E2}.Release|x64.Build.0 = Release|Any CPU
+		{FD52B782-4E07-41B2-8EA9-DE2347DEB9E2}.Release|x86.ActiveCfg = Release|Any CPU
+		{FD52B782-4E07-41B2-8EA9-DE2347DEB9E2}.Release|x86.Build.0 = Release|Any CPU
+		{E9D21865-C31B-49AD-B9CE-A8A9491789D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E9D21865-C31B-49AD-B9CE-A8A9491789D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E9D21865-C31B-49AD-B9CE-A8A9491789D5}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{E9D21865-C31B-49AD-B9CE-A8A9491789D5}.Debug|arm64.Build.0 = Debug|Any CPU
+		{E9D21865-C31B-49AD-B9CE-A8A9491789D5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E9D21865-C31B-49AD-B9CE-A8A9491789D5}.Debug|x64.Build.0 = Debug|Any CPU
+		{E9D21865-C31B-49AD-B9CE-A8A9491789D5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E9D21865-C31B-49AD-B9CE-A8A9491789D5}.Debug|x86.Build.0 = Debug|Any CPU
+		{E9D21865-C31B-49AD-B9CE-A8A9491789D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E9D21865-C31B-49AD-B9CE-A8A9491789D5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E9D21865-C31B-49AD-B9CE-A8A9491789D5}.Release|arm64.ActiveCfg = Release|Any CPU
+		{E9D21865-C31B-49AD-B9CE-A8A9491789D5}.Release|arm64.Build.0 = Release|Any CPU
+		{E9D21865-C31B-49AD-B9CE-A8A9491789D5}.Release|x64.ActiveCfg = Release|Any CPU
+		{E9D21865-C31B-49AD-B9CE-A8A9491789D5}.Release|x64.Build.0 = Release|Any CPU
+		{E9D21865-C31B-49AD-B9CE-A8A9491789D5}.Release|x86.ActiveCfg = Release|Any CPU
+		{E9D21865-C31B-49AD-B9CE-A8A9491789D5}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -539,6 +593,9 @@ Global
 		{79C128B4-DD9D-4BAC-AA81-9BFAD02ECDD3} = {086CDAC6-2730-4F09-BA28-B41F737E6C4D}
 		{F56308B3-01B8-489B-ABE2-69F35FC5A7DE} = {F2ACE2B7-1599-4769-8FF4-41FA03B25D26}
 		{A9219707-C494-4D3B-8123-43652707B516} = {66BC1E2B-D99A-49E2-8B8F-EF7851493CB0}
+		{85FE77EA-9F89-4F42-BD79-26C82F847DDC} = {086CDAC6-2730-4F09-BA28-B41F737E6C4D}
+		{FD52B782-4E07-41B2-8EA9-DE2347DEB9E2} = {086CDAC6-2730-4F09-BA28-B41F737E6C4D}
+		{E9D21865-C31B-49AD-B9CE-A8A9491789D5} = {086CDAC6-2730-4F09-BA28-B41F737E6C4D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A1906FD8-BB54-4688-BC0F-9ED7532D2CB0}

global.json

@@ -1,5 +1,5 @@
 {
   "msbuild-sdks": {
-    "Uno.Sdk": "6.0.96"
+    "Uno.Sdk": "6.5.31"
   }
 }

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

@@ -26,7 +26,6 @@ public static AesSiv128 CreateInstance(ReadOnlySpan<byte> dekKey, ReadOnlySpan<b
             macKey.CopyTo(longKeySpan.Slice(dekKey.Length));
 
             var aesCmacSiv = Aead.CreateAesCmacSiv(longKey);
-
             return new AesSiv128(aesCmacSiv);
         }
 

src/Core/SecureFolderFS.Core.Cryptography/Cipher/Argon2id.cs

@@ -2,10 +2,9 @@
 
 namespace SecureFolderFS.Core.Cryptography.Cipher
 {
-    /// TODO: Needs docs
     public static class Argon2id
     {
-        public static void Old_DeriveKey(ReadOnlySpan<byte> password, ReadOnlySpan<byte> salt, Span<byte> result)
+        public static void V2_DeriveKey(ReadOnlySpan<byte> password, ReadOnlySpan<byte> salt, Span<byte> result)
         {
             using var argon2id = new Konscious.Security.Cryptography.Argon2id(password.ToArray());
             argon2id.Salt = salt.ToArray();
@@ -16,7 +15,7 @@ public static void Old_DeriveKey(ReadOnlySpan<byte> password, ReadOnlySpan<byte>
             argon2id.GetBytes(Constants.KeyTraits.ARGON2_KEK_LENGTH).CopyTo(result);
         }
 
-        public static void V3_DeriveKey(ReadOnlySpan<byte> password, ReadOnlySpan<byte> salt, Span<byte> result)
+        public static void DeriveKey(ReadOnlySpan<byte> password, ReadOnlySpan<byte> salt, Span<byte> result)
         {
             using var argon2id = new Konscious.Security.Cryptography.Argon2id(password.ToArray());
             argon2id.Salt = salt.ToArray();

src/Core/SecureFolderFS.Core.Cryptography/Constants.cs

@@ -9,8 +9,11 @@ public static class KeyTraits
             public const int DEK_KEY_LENGTH = 32;
             public const int MAC_KEY_LENGTH = 32;
             public const int ARGON2_KEK_LENGTH = 32;
-            public const int CHALLENGE_KEY_PART_LENGTH = 128;
-            public const int ECIES_SHA256_AESGCM_STDX963_KEY_LENGTH = 32;
+            public const int CHALLENGE_KEY_PART_LENGTH_32 = 32;
+            public const int CHALLENGE_KEY_PART_LENGTH_64 = 64;
+            public const int CHALLENGE_KEY_PART_LENGTH_128 = 128;
+            public const int ECIES_SHA256_AESGCM_STDX963_KEY_LENGTH = CHALLENGE_KEY_PART_LENGTH_32;
+            public const int HMAC_SHA1_HASH_LENGTH = 20;
         }
 
         public static class CipherId

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

@@ -3,6 +3,7 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Security.Cryptography;
+using SecureFolderFS.Shared.ComponentModel;
 using static SecureFolderFS.Core.Cryptography.Constants.Crypto.Chunks.AesCtrHmac;
 using static SecureFolderFS.Core.Cryptography.Extensions.ContentCryptExtensions.AesCtrHmacContentExtensions;
 using static SecureFolderFS.Core.Cryptography.Extensions.HeaderCryptExtensions.AesCtrHmacHeaderExtensions;
@@ -12,7 +13,7 @@ namespace SecureFolderFS.Core.Cryptography.ContentCrypt
     /// <inheritdoc cref="IContentCrypt"/>
     internal sealed class AesCtrHmacContentCrypt : BaseContentCrypt
     {
-        private readonly SecretKey _macKey;
+        private readonly IKeyUsage _macKey;
 
         /// <inheritdoc/>
         public override int ChunkPlaintextSize { get; } = CHUNK_PLAINTEXT_SIZE;
@@ -23,16 +24,17 @@ internal sealed class AesCtrHmacContentCrypt : BaseContentCrypt
         /// <inheritdoc/>
         public override int ChunkFirstReservedSize { get; } = CHUNK_NONCE_SIZE;
 
-        public AesCtrHmacContentCrypt(SecretKey macKey)
+        public AesCtrHmacContentCrypt(IKeyUsage macKey)
         {
             _macKey = macKey;
         }
 
         /// <inheritdoc/>
-        public override void EncryptChunk(ReadOnlySpan<byte> plaintextChunk, long chunkNumber, ReadOnlySpan<byte> header, Span<byte> ciphertextChunk)
+        [SkipLocalsInit]
+        public override unsafe void EncryptChunk(ReadOnlySpan<byte> plaintextChunk, long chunkNumber, ReadOnlySpan<byte> header, Span<byte> ciphertextChunk)
         {
             // Chunk nonce
-            secureRandom.GetBytes(ciphertextChunk.Slice(0, CHUNK_NONCE_SIZE));
+            RandomNumberGenerator.Fill(ciphertextChunk.Slice(0, CHUNK_NONCE_SIZE));
 
             // Encrypt
             AesCtr128.Encrypt(
@@ -41,34 +43,75 @@ public override void EncryptChunk(ReadOnlySpan<byte> plaintextChunk, long chunkN
                 ciphertextChunk.Slice(0, CHUNK_NONCE_SIZE),
                 ciphertextChunk.Slice(CHUNK_NONCE_SIZE, plaintextChunk.Length));
 
-            // Calculate MAC
-            CalculateChunkMac(
-                header.GetHeaderNonce(),
-                ciphertextChunk.Slice(0, CHUNK_NONCE_SIZE),
-                ciphertextChunk.Slice(CHUNK_NONCE_SIZE, plaintextChunk.Length),
-                chunkNumber,
-                ciphertextChunk.Slice(CHUNK_NONCE_SIZE + plaintextChunk.Length, CHUNK_MAC_SIZE));
+            // Calculate MAC using UseKey pattern
+            fixed (byte* headerPtr = header)
+            fixed (byte* ciphertextPtr = ciphertextChunk)
+            {
+                var state = (
+                    headerPtr: (nint)headerPtr,
+                    headerLen: header.Length,
+                    ctPtr: (nint)ciphertextPtr,
+                    ctLen: ciphertextChunk.Length,
+                    ptLen: plaintextChunk.Length,
+                    chunkNumber
+                );
+
+                _macKey.UseKey(state, static (macKey, s) =>
+                {
+                    var hdr = new ReadOnlySpan<byte>((byte*)s.headerPtr, s.headerLen);
+                    var ct = new Span<byte>((byte*)s.ctPtr, s.ctLen);
+
+                    CalculateChunkMacStatic(
+                        macKey,
+                        hdr.GetHeaderNonce(),
+                        ct.Slice(0, CHUNK_NONCE_SIZE),
+                        ct.Slice(CHUNK_NONCE_SIZE, s.ptLen),
+                        s.chunkNumber,
+                        ct.Slice(CHUNK_NONCE_SIZE + s.ptLen, CHUNK_MAC_SIZE));
+                });
+            }
         }
 
         /// <inheritdoc/>
         [SkipLocalsInit]
-        public override bool DecryptChunk(ReadOnlySpan<byte> ciphertextChunk, long chunkNumber,
-            ReadOnlySpan<byte> header, Span<byte> plaintextChunk)
+        public override unsafe bool DecryptChunk(ReadOnlySpan<byte> ciphertextChunk, long chunkNumber, ReadOnlySpan<byte> header, Span<byte> plaintextChunk)
         {
-            // Allocate byte* for MAC
-            Span<byte> mac = stackalloc byte[CHUNK_MAC_SIZE];
-
-            // Calculate MAC
-            CalculateChunkMac(
-                header.GetHeaderNonce(),
-                ciphertextChunk.GetChunkNonce(),
-                ciphertextChunk.GetChunkPayload(),
-                chunkNumber,
-                mac);
-
-            // Check MAC
-            if (!mac.SequenceEqual(ciphertextChunk.GetChunkMac()))
-                return false;
+            // Verify MAC using UseKey pattern
+            fixed (byte* headerPtr = header)
+            fixed (byte* ciphertextPtr = ciphertextChunk)
+            {
+                var state = (
+                    headerPtr: (nint)headerPtr,
+                    headerLen: header.Length,
+                    ctPtr: (nint)ciphertextPtr,
+                    ctLen: ciphertextChunk.Length,
+                    chunkNumber
+                );
+
+                var macValid = _macKey.UseKey(state, static (macKey, s) =>
+                {
+                    var hdr = new ReadOnlySpan<byte>((byte*)s.headerPtr, s.headerLen);
+                    var ct = new ReadOnlySpan<byte>((byte*)s.ctPtr, s.ctLen);
+
+                    // Allocate byte* for MAC
+                    Span<byte> mac = stackalloc byte[CHUNK_MAC_SIZE];
+
+                    // Calculate MAC
+                    CalculateChunkMacStatic(
+                        macKey,
+                        hdr.GetHeaderNonce(),
+                        ct.GetChunkNonce(),
+                        ct.GetChunkPayload(),
+                        s.chunkNumber,
+                        mac);
+
+                    // Check MAC using constant-time comparison to prevent timing attacks
+                    return CryptographicOperations.FixedTimeEquals(mac, ct.GetChunkMac());
+                });
+
+                if (!macValid)
+                    return false;
+            }
 
             // Decrypt
             AesCtr128.Decrypt(
@@ -81,7 +124,7 @@ public override bool DecryptChunk(ReadOnlySpan<byte> ciphertextChunk, long chunk
         }
 
         [SkipLocalsInit]
-        private void CalculateChunkMac(ReadOnlySpan<byte> headerNonce, ReadOnlySpan<byte> chunkNonce, ReadOnlySpan<byte> ciphertextPayload, long chunkNumber, Span<byte> chunkMac)
+        private static void CalculateChunkMacStatic(ReadOnlySpan<byte> macKey, ReadOnlySpan<byte> headerNonce, ReadOnlySpan<byte> chunkNonce, ReadOnlySpan<byte> ciphertextPayload, long chunkNumber, Span<byte> chunkMac)
         {
             // Convert long to byte array
             Span<byte> beChunkNumber = stackalloc byte[sizeof(long)];
@@ -92,12 +135,12 @@ private void CalculateChunkMac(ReadOnlySpan<byte> headerNonce, ReadOnlySpan<byte
                 beChunkNumber.Reverse();
 
             // Initialize HMAC
-            using var hmacSha256 = IncrementalHash.CreateHMAC(HashAlgorithmName.SHA256, _macKey);
+            using var hmacSha256 = IncrementalHash.CreateHMAC(HashAlgorithmName.SHA256, macKey);
 
             hmacSha256.AppendData(headerNonce);         // headerNonce
             hmacSha256.AppendData(beChunkNumber);       // beChunkNumber
             hmacSha256.AppendData(chunkNonce);          // chunkNonce
-            hmacSha256.AppendData(ciphertextPayload);   // ciphertextPayload   
+            hmacSha256.AppendData(ciphertextPayload);   // ciphertextPayload
 
             hmacSha256.GetCurrentHash(chunkMac);
         }

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

@@ -2,6 +2,7 @@
 using SecureFolderFS.Core.Cryptography.Helpers;
 using System;
 using System.Runtime.CompilerServices;
+using System.Security.Cryptography;
 using static SecureFolderFS.Core.Cryptography.Constants.Crypto.Chunks.AesGcm;
 using static SecureFolderFS.Core.Cryptography.Constants.Crypto.Headers.AesGcm;
 using static SecureFolderFS.Core.Cryptography.Extensions.ContentCryptExtensions.AesGcmContentExtensions;
@@ -26,11 +27,11 @@ internal sealed class AesGcmContentCrypt : BaseContentCrypt
         public override void EncryptChunk(ReadOnlySpan<byte> plaintextChunk, long chunkNumber, ReadOnlySpan<byte> header, Span<byte> ciphertextChunk)
         {
             // Chunk nonce
-            secureRandom.GetBytes(ciphertextChunk.Slice(0, CHUNK_NONCE_SIZE));
+            RandomNumberGenerator.Fill(ciphertextChunk.Slice(0, CHUNK_NONCE_SIZE));
 
             // Big Endian chunk number and file header nonce
             Span<byte> associatedData = stackalloc byte[sizeof(long) + HEADER_NONCE_SIZE];
-            CryptHelpers.FillAssociatedDataBe(associatedData, header.GetHeaderNonce(), chunkNumber);
+            CryptHelpers.FillAssociatedDataBigEndian(associatedData, header.GetHeaderNonce(), chunkNumber);
 
             // Encrypt
             AesGcm128.Encrypt(
@@ -48,7 +49,7 @@ public override bool DecryptChunk(ReadOnlySpan<byte> ciphertextChunk, long chunk
         {
             // Big Endian chunk number and file header nonce
             Span<byte> associatedData = stackalloc byte[sizeof(long) + HEADER_NONCE_SIZE];
-            CryptHelpers.FillAssociatedDataBe(associatedData, header.GetHeaderNonce(), chunkNumber);
+            CryptHelpers.FillAssociatedDataBigEndian(associatedData, header.GetHeaderNonce(), chunkNumber);
 
             // Decrypt
             return AesGcm128.TryDecrypt(

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

@@ -6,8 +6,6 @@ namespace SecureFolderFS.Core.Cryptography.ContentCrypt
     /// <inheritdoc cref="IContentCrypt"/>
     internal abstract class BaseContentCrypt : IContentCrypt
     {
-        protected readonly RandomNumberGenerator secureRandom;
-
         /// <inheritdoc/>
         public abstract int ChunkPlaintextSize { get; }
 
@@ -17,11 +15,6 @@ internal abstract class BaseContentCrypt : IContentCrypt
         /// <inheritdoc/>
         public abstract int ChunkFirstReservedSize { get; }
 
-        protected BaseContentCrypt()
-        {
-            secureRandom = RandomNumberGenerator.Create();
-        }
-
         /// <inheritdoc/>
         public abstract void EncryptChunk(ReadOnlySpan<byte> plaintextChunk, long chunkNumber, ReadOnlySpan<byte> header, Span<byte> ciphertextChunk);
 
@@ -61,7 +54,6 @@ public virtual long CalculatePlaintextSize(long ciphertextSize)
         /// <inheritdoc/>
         public virtual void Dispose()
         {
-            secureRandom.Dispose();
         }
     }
 }