summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Dettman <peter.dettman@bouncycastle.org>2022-11-09 16:58:20 +0700
committerPeter Dettman <peter.dettman@bouncycastle.org>2022-11-09 16:58:20 +0700
commit79d20e683c8391ffb3e311c8f252be26f2c8412c (patch)
tree73ffd676c174660a495f7d83fd24ab42ce8f85b3
parentVarious Close/Dispose cleanup (diff)
downloadBouncyCastle.NET-ed25519-79d20e683c8391ffb3e311c8f252be26f2c8412c.tar.xz
Remove NET7_0 directive for now
-rw-r--r--crypto/src/crypto/engines/AesEngine_X86.cs12
1 files changed, 0 insertions, 12 deletions
diff --git a/crypto/src/crypto/engines/AesEngine_X86.cs b/crypto/src/crypto/engines/AesEngine_X86.cs
index e61deb174..bd7143cd1 100644
--- a/crypto/src/crypto/engines/AesEngine_X86.cs
+++ b/crypto/src/crypto/engines/AesEngine_X86.cs
@@ -780,9 +780,6 @@ namespace Org.BouncyCastle.Crypto.Engines
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private static Vector128<byte> Load128(ReadOnlySpan<byte> t)
         {
-#if NET7_0_OR_GREATER
-            return Vector128.Create<byte>(t);
-#else
             if (BitConverter.IsLittleEndian && Unsafe.SizeOf<Vector128<byte>>() == 16)
                 return MemoryMarshal.Read<Vector128<byte>>(t);
 
@@ -790,30 +787,22 @@ namespace Org.BouncyCastle.Crypto.Engines
                 BinaryPrimitives.ReadUInt64LittleEndian(t[..8]),
                 BinaryPrimitives.ReadUInt64LittleEndian(t[8..])
             ).AsByte();
-#endif
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private static Vector64<byte> Load64(ReadOnlySpan<byte> t)
         {
-#if NET7_0_OR_GREATER
-            return Vector64.Create<byte>(t);
-#else
             if (BitConverter.IsLittleEndian && Unsafe.SizeOf<Vector64<byte>>() == 8)
                 return MemoryMarshal.Read<Vector64<byte>>(t);
 
             return Vector64.Create(
                 BinaryPrimitives.ReadUInt64LittleEndian(t[..8])
             ).AsByte();
-#endif
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private static void Store128(Vector128<byte> s, Span<byte> t)
         {
-#if NET7_0_OR_GREATER
-            Vector128.CopyTo(s, t);
-#else
             if (BitConverter.IsLittleEndian && Unsafe.SizeOf<Vector128<byte>>() == 16)
             {
                 MemoryMarshal.Write(t, ref s);
@@ -823,7 +812,6 @@ namespace Org.BouncyCastle.Crypto.Engines
             var u = s.AsUInt64();
             BinaryPrimitives.WriteUInt64LittleEndian(t[..8], u.GetElement(0));
             BinaryPrimitives.WriteUInt64LittleEndian(t[8..], u.GetElement(1));
-#endif
         }
     }
 }