?

Author: TianMengLucky

Directory.Build.props

@@ -1,10 +1,13 @@
 <Project>
     <PropertyGroup>
+        <TargetFrameworks>net9.0;net8.0;net6.0</TargetFrameworks>
+        <LangVersion>latest</LangVersion>
         <Authors>Impostor,Next-Fast</Authors>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <RepositoryUrl>https://github.com/Next-Fast/Impostor.Hazel</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
         <VersionPrefix>1.0.1</VersionPrefix>
         <VersionSuffix>dev</VersionSuffix>
+        <PackageLicense>MIT</PackageLicense>
     </PropertyGroup>
 </Project>

Impostor.Hazel.Tests/Impostor.Hazel.Tests.csproj

@@ -1,10 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 

Next.Hazel.Abstractions/Next.Hazel.Abstractions.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <RootNamespace>Next.Hazel.Abstractions</RootNamespace>
         <AssemblyName>Next.Hazel.Abstractions</AssemblyName>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+        <PackageId>Next.Hazel.Abstractions</PackageId>
     </PropertyGroup>
 
 </Project>

Next.Hazel/ByteSpanExtensions.cs

@@ -119,7 +119,7 @@ public static uint ReadLittleEndian32(this ByteSpan input, int offset = 0)
     /// <param name="requiredSize">Required size (bytes)</param>
     public static ByteSpan ReuseSpanIfPossible(this ByteSpan source, int requiredSize)
     {
-        if (source.Length >= requiredSize) return source.Slice(0, requiredSize);
+        if (source.Length >= requiredSize) return source[..requiredSize];
 
         return new byte[requiredSize];
     }

Next.Hazel/Crypto/AesGcm.cs

@@ -41,7 +41,7 @@ public Aes128Gcm(ByteSpan key)
 
         // Allocate scratch space
         ByteSpan scratchSpace = new byte[96];
-        hashSubkey_ = scratchSpace.Slice(0, 16);
+        hashSubkey_ = scratchSpace[..16];
         blockJ_ = scratchSpace.Slice(16, 16);
         blockS_ = scratchSpace.Slice(32, 16);
         blockZ_ = scratchSpace.Slice(48, 16);
@@ -89,7 +89,7 @@ public void Seal(ByteSpan output, ByteSpan nonce, ByteSpan plaintext, ByteSpan a
 
         // Generate and append the authentication tag
         var tagOffset = plaintext.Length;
-        GenerateAuthenticationTag(output.Slice(tagOffset), output.Slice(0, tagOffset), associatedData);
+        GenerateAuthenticationTag(output[tagOffset..], output[..tagOffset], associatedData);
     }
 
     /// <summary>
@@ -126,8 +126,8 @@ public bool Open(ByteSpan output, ByteSpan nonce, ByteSpan ciphertext, ByteSpan
 
         // Split ciphertext into actual ciphertext and authentication
         // tag components.
-        var authenticationTag = ciphertext.Slice(ciphertext.Length - TagSize);
-        ciphertext = ciphertext.Slice(0, ciphertext.Length - TagSize);
+        var authenticationTag = ciphertext[^TagSize..];
+        ciphertext = ciphertext[..^TagSize];
 
         // Create the initial counter block
         nonce.CopyTo(blockJ_);
@@ -158,7 +158,7 @@ private void GenerateAuthenticationTag(ByteSpan output, ByteSpan ciphertext, Byt
             if (fullBlocks * 16 < associatedData.Length)
             {
                 SetSpanToZeros(blockScratch_);
-                associatedData.Slice(fullBlocks * 16).CopyTo(blockScratch_);
+                associatedData[(fullBlocks * 16)..].CopyTo(blockScratch_);
                 GHASH(blockS_, blockScratch_, 1);
             }
 
@@ -168,7 +168,7 @@ private void GenerateAuthenticationTag(ByteSpan output, ByteSpan ciphertext, Byt
             if (fullBlocks * 16 < ciphertext.Length)
             {
                 SetSpanToZeros(blockScratch_);
-                ciphertext.Slice(fullBlocks * 16).CopyTo(blockScratch_);
+                ciphertext[(fullBlocks * 16)..].CopyTo(blockScratch_);
                 GHASH(blockS_, blockScratch_, 1);
             }
 
@@ -205,7 +205,7 @@ private void GCTR(ByteSpan output, ByteSpan counterBlock, uint counter, ByteSpan
             ++counter;
 
             // CIPH[k](CB[i])
-            encryptor_.EncryptBlock(counterBlock.Slice(0, 16), blockScratch_);
+            encryptor_.EncryptBlock(counterBlock[..16], blockScratch_);
 
             // Y[i] = X[i] xor CIPH[k](CB[i])
             for (var jj = 0; jj != 16 && writeIndex < data.Length; ++jj, ++writeIndex)

Next.Hazel/Crypto/Sha256Stream.cs

@@ -50,7 +50,7 @@ public void AddData(ByteSpan data)
         while (data.Length > 0)
         {
             var offset = hash.TransformBlock(data.GetUnderlyingArray(), data.Offset, data.Length, null, 0);
-            data = data.Slice(offset);
+            data = data[offset..];
         }
     }
 

Next.Hazel/Dtls/AesGcmRecordProtection.cs

@@ -27,7 +27,7 @@ public Aes128GcmRecordProtection(ByteSpan masterSecret, ByteSpan serverRandom, B
     {
         ByteSpan combinedRandom = new byte[serverRandom.Length + clientRandom.Length];
         serverRandom.CopyTo(combinedRandom);
-        clientRandom.CopyTo(combinedRandom.Slice(serverRandom.Length));
+        clientRandom.CopyTo(combinedRandom[serverRandom.Length..]);
 
         // Expand master_secret to encryption keys
         const int ExpandedSize = 0
@@ -42,7 +42,7 @@ public Aes128GcmRecordProtection(ByteSpan masterSecret, ByteSpan serverRandom, B
         ByteSpan expandedKey = new byte[ExpandedSize];
         PrfSha256.ExpandSecret(expandedKey, masterSecret, PrfLabel.KEY_EXPANSION, combinedRandom);
 
-        var clientWriteKey = expandedKey.Slice(0, Aes128Gcm.KeySize);
+        var clientWriteKey = expandedKey[..Aes128Gcm.KeySize];
         var serverWriteKey = expandedKey.Slice(Aes128Gcm.KeySize, Aes128Gcm.KeySize);
         clientWriteIV = expandedKey.Slice(2 * Aes128Gcm.KeySize, ImplicitNonceSize);
         serverWriteIV = expandedKey.Slice(2 * Aes128Gcm.KeySize + ImplicitNonceSize, ImplicitNonceSize);