Removed FormC normalization

Author: d2dyno1

src/Core/SecureFolderFS.Core.FileSystem/Helpers/Paths/Abstract/AbstractPathHelpers.Names.cs

@@ -47,7 +47,7 @@ public static async Task<string> EncryptNameAsync(string plaintextName, IFolder
                 var directoryId = AllocateDirectoryId(specifics.Security, ciphertextName);
                 var result = await GetDirectoryIdAsync(ciphertextParentFolder, specifics, directoryId, cancellationToken);
 
-                var normalizedName = NoCipherExtensionNormalizedName(ciphertextName);
+                var normalizedName = RemoveCiphertextExtension(ciphertextName);
                 return specifics.Security.NameCrypt.DecryptName(normalizedName, result ? directoryId : ReadOnlySpan<byte>.Empty);
             }
             catch (Exception)

src/Core/SecureFolderFS.Core.FileSystem/Helpers/Paths/Abstract/AbstractPathHelpers.cs

@@ -1,7 +1,6 @@
-using SecureFolderFS.Core.Cryptography;
-using System;
+using System;
 using System.IO;
-using System.Text;
+using SecureFolderFS.Core.Cryptography;
 
 namespace SecureFolderFS.Core.FileSystem.Helpers.Paths.Abstract
 {
@@ -21,24 +20,15 @@ public static byte[] AllocateDirectoryId(Security security, string? path = null)
             return new byte[Constants.DIRECTORY_ID_SIZE];
         }
 
-        public static ReadOnlySpan<char> NoCipherExtensionNormalizedName(string ciphertextName)
+        public static ReadOnlySpan<char> RemoveCiphertextExtension(string ciphertextName)
         {
             // Do NOT use Path.GetFileNameWithoutExtension - after APFS or ContentProvider NFD-decomposes Base4K
             // codepoints, the string may contain spurious dot-like characters that confuse the
             // path parser, causing it to truncate mid-ciphertext.
             // Strip the known extension manually instead.
-            var nameWithoutExtension = ciphertextName.EndsWith(Constants.Names.ENCRYPTED_FILE_EXTENSION, StringComparison.Ordinal)
+            return ciphertextName.EndsWith(Constants.Names.ENCRYPTED_FILE_EXTENSION, StringComparison.Ordinal)
                 ? ciphertextName.AsSpan(0, ciphertextName.Length - Constants.Names.ENCRYPTED_FILE_EXTENSION.Length)
                 : ciphertextName.AsSpan();
-
-            var normalizedLength = nameWithoutExtension.GetNormalizedLength(NormalizationForm.FormC);
-            var normalized = new char[normalizedLength];
-
-            // NFC-normalize before decoding
-            if (nameWithoutExtension.TryNormalize(normalized, out var written, NormalizationForm.FormC))
-                return normalized.AsSpan(0, written);
-
-            return nameWithoutExtension;
         }
     }
 }

src/Core/SecureFolderFS.Core.FileSystem/Helpers/Paths/Native/NativePathHelpers.Names.cs

@@ -42,7 +42,7 @@ public static string EncryptName(string plaintextName, string plaintextParentFol
                 return ciphertextName;
 
             var result = GetDirectoryId(ciphertextParentFolder, specifics, expendableDirectoryId);
-            var normalizedName = AbstractPathHelpers.NoCipherExtensionNormalizedName(ciphertextName);
+            var normalizedName = AbstractPathHelpers.RemoveCiphertextExtension(ciphertextName);
 
             return specifics.Security.NameCrypt.DecryptName(normalizedName, result ? expendableDirectoryId : ReadOnlySpan<byte>.Empty);
         }

src/Core/SecureFolderFS.Core.FileSystem/Helpers/RecycleBin/Abstract/AbstractRecycleBinHelpers.Operational.cs

@@ -90,7 +90,7 @@ public static async Task RestoreAsync(IStorableChild recycleBinItem, IModifiable
             {
                 // Destination folder is the same as the original destination
                 // The same name could be used since the Directory IDs match
-                var ciphertextName = Path.ChangeExtension(await AbstractPathHelpers.EncryptNameAsync(plaintextOriginalName, ciphertextDestinationFolder, specifics, cancellationToken), Constants.Names.ENCRYPTED_FILE_EXTENSION);
+                var ciphertextName = await AbstractPathHelpers.EncryptNameAsync(plaintextOriginalName, ciphertextDestinationFolder, specifics, cancellationToken);
 
                 // Get an available name if the destination already exists
                 ciphertextName = await GetAvailableDestinationNameAsync(ciphertextDestinationFolder, ciphertextName, plaintextOriginalName, specifics, cancellationToken);
@@ -235,7 +235,7 @@ private static async Task<string> GetAvailableDestinationNameAsync(IFolder ciphe
                 do
                 {
                     var newPlaintextName = $"{nameWithoutExtension} ({suffix}){extension}";
-                    ciphertextName = Path.ChangeExtension(await AbstractPathHelpers.EncryptNameAsync(newPlaintextName, ciphertextDestinationFolder, specifics, cancellationToken), Constants.Names.ENCRYPTED_FILE_EXTENSION);
+                    ciphertextName = await AbstractPathHelpers.EncryptNameAsync(newPlaintextName, ciphertextDestinationFolder, specifics, cancellationToken);
                     existing = await ciphertextDestinationFolder.TryGetFirstByNameAsync(ciphertextName, cancellationToken);
                     suffix++;
                 } while (existing is not null);