Finalize Release Candidate 1

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/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,29 @@ 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.
+                return AesSiv256.CreateInstance(dekKey.ToArray(), macKey.ToArray()); // Note: AesSiv128 requires a byte[] key.
             });
         }
 
         /// <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 +41,7 @@ protected override byte[] EncryptFileName(ReadOnlySpan<byte> plaintextFileNameBu
         /// <inheritdoc/>
         public override void Dispose()
         {
-            _aesSiv128.Dispose();
+            _aesSiv256.Dispose();
         }
     }
 }

src/Core/SecureFolderFS.Core.FileSystem/Helpers/Health/HealthHelpers.Directory.cs

@@ -38,7 +38,7 @@ public static async Task<IResult> RepairDirectoryAsync(IFolder affected, Securit
                     if (PathHelpers.IsCoreName(item.Name))
                         continue;
 
-                    // Encrypt new name
+                    // Encrypt a new name
                     var encryptedName = security.NameCrypt.EncryptName(item.Name, directoryId);
                     encryptedName = $"{encryptedName}{Constants.Names.ENCRYPTED_FILE_EXTENSION}";
 

src/Core/SecureFolderFS.Core.FileSystem/Helpers/Health/HealthHelpers.Name.cs

@@ -8,21 +8,37 @@
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using SecureFolderFS.Core.FileSystem.Helpers.Paths.Abstract;
+using SecureFolderFS.Shared.Helpers;
 
 namespace SecureFolderFS.Core.FileSystem.Helpers.Health
 {
     public static partial class HealthHelpers
     {
         public static async Task<IResult> RepairNameAsync(IStorableChild affected, FileSystemSpecifics specifics, string newName, CancellationToken cancellationToken)
         {
-            return await RepairNameAsync(affected, specifics.Security, specifics.ContentFolder, newName, cancellationToken);
+            var repairResult = await RepairNameAsync(affected, specifics.Security, specifics.ContentFolder, newName, cancellationToken);
+            if (!repairResult.Successful || !specifics.CiphertextFileNameCache.IsAvailable)
+                return repairResult;
 
-            // TODO: Update caches in FileSystemSpecifics
+            // Update cache
+            await SafetyHelpers.NoFailureAsync(async () =>
+            {
+                var parent = await affected.GetParentAsync(cancellationToken);
+                if (parent is null)
+                    return;
+
+                var directoryId = AbstractPathHelpers.AllocateDirectoryId(specifics.Security);
+                var isAllocated = await AbstractPathHelpers.GetDirectoryIdAsync(parent, specifics, directoryId, cancellationToken);
+                specifics.CiphertextFileNameCache.CacheRemove(new(isAllocated ? directoryId : [], affected.Name));
+            });
+
+            return repairResult;
         }
 
-        public static async Task<IResult> RepairNameAsync(IStorableChild affected, Security security, IFolder contentFolder, string newName, CancellationToken cancellationToken)
+        private static async Task<IResult> RepairNameAsync(IStorableChild affected, Security security, IFolder contentFolder, string newName, CancellationToken cancellationToken)
         {
-            // Return success, if no encryption is used
+            // Return success if no encryption is used
             if (security.NameCrypt is null)
                 return Result.Success;
 

src/Platforms/SecureFolderFS.Maui/Popups/PropertiesPopup.xaml

@@ -124,6 +124,25 @@
                     IsLastItem="True"
                     Subtitle="{Binding ViewModel.DateModifiedText, Mode=OneWay}" />
 
+                <!--  Path  -->
+                <uc:ItemProperty
+                    Title="{l:ResourceString Rid=Path}"
+                    Command="{Binding ViewModel.CopyPropertyCommand, Mode=OneWay}"
+                    CommandParameter="Path"
+                    IsLastItem="True"
+                    IsVisible="{Binding ViewModel.Id, Mode=OneWay, Converter={StaticResource NullToBoolConverter}}"
+                    Subtitle="{Binding ViewModel.Id, Mode=OneWay}" />
+
+                <!--  Encrypted Path  -->
+                <uc:ItemProperty
+                    Title="{l:ResourceString Rid=EncryptedPath}"
+                    Command="{Binding ViewModel.CopyPropertyCommand, Mode=OneWay}"
+                    CommandParameter="EncryptedPath"
+                    IsLastItem="True"
+                    IsVisible="{Binding ViewModel.CiphertextId, Mode=OneWay, Converter={StaticResource NullToBoolConverter}}"
+                    Subtitle="{Binding ViewModel.CiphertextId, Mode=OneWay}"
+                    SubtitleTruncation="HeadTruncation" />
+
             </VerticalStackLayout>
         </VerticalStackLayout>
     </Border>

src/Platforms/SecureFolderFS.Maui/UserControls/Browser/ItemProperty.xaml

@@ -26,7 +26,7 @@
                 <Label
                     FontAttributes="Bold"
                     FontSize="15"
-                    LineBreakMode="TailTruncation"
+                    LineBreakMode="{Binding SubtitleTruncation, Mode=OneWay, Source={x:Reference ThisControl}}"
                     Text="{Binding Subtitle, Mode=OneWay, Source={x:Reference ThisControl}}" />
             </VerticalStackLayout>
 

src/Platforms/SecureFolderFS.Maui/UserControls/Browser/ItemProperty.xaml.cs

@@ -16,6 +16,14 @@ public bool IsLastItem
         }
         public static readonly BindableProperty IsLastItemProperty =
             BindableProperty.Create(nameof(IsLastItem), typeof(bool), typeof(ItemProperty), false);
+
+        public LineBreakMode SubtitleTruncation
+        {
+            get => (LineBreakMode)GetValue(SubtitleTruncationProperty);
+            set => SetValue(SubtitleTruncationProperty, value);
+        }
+        public static readonly BindableProperty SubtitleTruncationProperty =
+            BindableProperty.Create(nameof(SubtitleTruncation), typeof(LineBreakMode), typeof(ItemProperty), LineBreakMode.TailTruncation);
 
         public string? Title
         {

src/Platforms/SecureFolderFS.UI/Assets/Licenses/SvgSkia LICENSE → src/Platforms/SecureFolderFS.UI/Assets/Licenses/AcrylicViewMaui LICENSE

@@ -1,11 +1,11 @@
-Svg.Skia
-https://github.com/wieslawsoltes/Svg.Skia/blob/master/LICENSE.TXT
+AcrylicView.Maui
+https://github.com/sswi/AcrylicView.MAUI/blob/master/LICENSE.txt
 MIT
-https://github.com/wieslawsoltes/Svg.Skia
+https://github.com/sswi/AcrylicView.MAUI
 
 MIT License
 
-Copyright (c) 2020 Wiesław Šoltés
+Copyright (c) [2023] [XECC]
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

src/Platforms/SecureFolderFS.UI/Assets/Licenses/AndroidLibraries LICENSE

@@ -0,0 +1,28 @@
+Android Libraries
+https://github.com/dotnet/android-libraries/blob/main/LICENSE.TXT
+MIT
+https://github.com/dotnet/android-libraries
+
+The MIT License (MIT)
+
+Copyright (c) .NET Foundation and Contributors
+
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.