refactor: drop Xor

HMBSbige · Jan 14, 2024 · c4c4a3f · c4c4a3f
1 parent bcf703a
commit c4c4a3f
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 52 deletions.
diff --git a/src/CryptoBase/SymmetricCryptos/StreamCryptos/ChaCha20/ChaCha20CryptoSF.cs b/src/CryptoBase/SymmetricCryptos/StreamCryptos/ChaCha20/ChaCha20CryptoSF.cs
@@ -12,9 +12,4 @@ protected override void UpdateKeyStream()
 	{
 		ChaCha20Utils.UpdateKeyStream(Rounds, State, KeyStream);
 	}
-
-	protected override unsafe void Xor(byte* stream, byte* source, byte* destination, int length)
-	{
-		IntrinsicsUtils.Xor(stream, source, destination, length);
-	}
 }
diff --git a/src/CryptoBase/SymmetricCryptos/StreamCryptos/ChaCha20/ChaCha20CryptoX86.cs b/src/CryptoBase/SymmetricCryptos/StreamCryptos/ChaCha20/ChaCha20CryptoX86.cs
@@ -49,9 +49,4 @@ protected override unsafe void UpdateKeyStream()
 			ChaCha20Utils.UpdateKeyStream(x, s, Rounds);
 		}
 	}
-
-	protected override unsafe void Xor(byte* stream, byte* source, byte* destination, int length)
-	{
-		IntrinsicsUtils.Xor(stream, source, destination, length);
-	}
 }
diff --git a/src/CryptoBase/SymmetricCryptos/StreamCryptos/ChaCha20Original/ChaCha20OriginalCryptoSF.cs b/src/CryptoBase/SymmetricCryptos/StreamCryptos/ChaCha20Original/ChaCha20OriginalCryptoSF.cs
@@ -10,9 +10,4 @@ protected override void UpdateKeyStream()
 	{
 		ChaCha20Utils.UpdateKeyStream(Rounds, State, KeyStream);
 	}
-
-	protected override unsafe void Xor(byte* stream, byte* source, byte* destination, int length)
-	{
-		IntrinsicsUtils.Xor(stream, source, destination, length);
-	}
 }
diff --git a/src/CryptoBase/SymmetricCryptos/StreamCryptos/ChaCha20Original/ChaCha20OriginalCryptoX86.cs b/src/CryptoBase/SymmetricCryptos/StreamCryptos/ChaCha20Original/ChaCha20OriginalCryptoX86.cs
@@ -49,9 +49,4 @@ protected override unsafe void UpdateKeyStream()
 			ChaCha20Utils.UpdateKeyStream(x, s, Rounds);
 		}
 	}
-
-	protected override unsafe void Xor(byte* stream, byte* source, byte* destination, int length)
-	{
-		IntrinsicsUtils.Xor(stream, source, destination, length);
-	}
 }
diff --git a/src/CryptoBase/SymmetricCryptos/StreamCryptos/Salsa20/Salsa20CryptoSF.cs b/src/CryptoBase/SymmetricCryptos/StreamCryptos/Salsa20/Salsa20CryptoSF.cs
@@ -10,9 +10,4 @@ protected override void UpdateKeyStream()
 	{
 		Salsa20Utils.UpdateKeyStream(Rounds, State, KeyStream);
 	}
-
-	protected override unsafe void Xor(byte* stream, byte* source, byte* destination, int length)
-	{
-		IntrinsicsUtils.Xor(stream, source, destination, length);
-	}
 }
diff --git a/src/CryptoBase/SymmetricCryptos/StreamCryptos/Salsa20/Salsa20CryptoX86.cs b/src/CryptoBase/SymmetricCryptos/StreamCryptos/Salsa20/Salsa20CryptoX86.cs
@@ -105,9 +105,4 @@ protected override unsafe void UpdateKeyStream()
 			Salsa20Utils.UpdateKeyStream(x, s, Rounds);
 		}
 	}
-
-	protected override unsafe void Xor(byte* stream, byte* source, byte* destination, int length)
-	{
-		IntrinsicsUtils.Xor(stream, source, destination, length);
-	}
 }
diff --git a/src/CryptoBase/SymmetricCryptos/StreamCryptos/SnuffleCrypto.cs b/src/CryptoBase/SymmetricCryptos/StreamCryptos/SnuffleCrypto.cs
@@ -60,7 +60,7 @@ private unsafe void Update(int length, uint* state, byte* stream, byte* source,
 			}
 
 			var r = 64 - Index;
-			Xor(stream + Index, source, destination, Math.Min(r, length));
+			IntrinsicsUtils.Xor(stream + Index, source, destination, Math.Min(r, length));
 
 			if (length < r)
 			{
@@ -78,7 +78,6 @@ private unsafe void Update(int length, uint* state, byte* stream, byte* source,
 	protected abstract unsafe void UpdateBlocks(ref uint* state, ref byte* source, ref byte* destination, ref int length);
 	protected abstract void UpdateKeyStream();
 	protected abstract unsafe void IncrementCounter(uint* state);
-	protected abstract unsafe void Xor(byte* stream, byte* source, byte* destination, int length);
 
 	public override void Dispose()
 	{

diff --git a/src/CryptoBase/SymmetricCryptos/StreamCryptos/XChaCha20/XChaCha20CryptoSF.cs b/src/CryptoBase/SymmetricCryptos/StreamCryptos/XChaCha20/XChaCha20CryptoSF.cs
@@ -15,9 +15,4 @@ protected override void UpdateKeyStream()
 	{
 		ChaCha20Utils.UpdateKeyStream(Rounds, State, KeyStream);
 	}
-
-	protected override unsafe void Xor(byte* stream, byte* source, byte* destination, int length)
-	{
-		IntrinsicsUtils.Xor(stream, source, destination, length);
-	}
 }
diff --git a/src/CryptoBase/SymmetricCryptos/StreamCryptos/XChaCha20/XChaCha20CryptoX86.cs b/src/CryptoBase/SymmetricCryptos/StreamCryptos/XChaCha20/XChaCha20CryptoX86.cs
@@ -57,9 +57,4 @@ protected override unsafe void UpdateKeyStream()
 			ChaCha20Utils.UpdateKeyStream(x, s, Rounds);
 		}
 	}
-
-	protected override unsafe void Xor(byte* stream, byte* source, byte* destination, int length)
-	{
-		IntrinsicsUtils.Xor(stream, source, destination, length);
-	}
 }
diff --git a/src/CryptoBase/SymmetricCryptos/StreamCryptos/XSalsa20/XSalsa20CryptoSF.cs b/src/CryptoBase/SymmetricCryptos/StreamCryptos/XSalsa20/XSalsa20CryptoSF.cs
@@ -15,9 +15,4 @@ protected override void UpdateKeyStream()
 	{
 		Salsa20Utils.UpdateKeyStream(Rounds, State, KeyStream);
 	}
-
-	protected override unsafe void Xor(byte* stream, byte* source, byte* destination, int length)
-	{
-		IntrinsicsUtils.Xor(stream, source, destination, length);
-	}
 }
diff --git a/src/CryptoBase/SymmetricCryptos/StreamCryptos/XSalsa20/XSalsa20CryptoX86.cs b/src/CryptoBase/SymmetricCryptos/StreamCryptos/XSalsa20/XSalsa20CryptoX86.cs
@@ -113,9 +113,4 @@ protected override unsafe void UpdateKeyStream()
 			Salsa20Utils.UpdateKeyStream(x, s, Rounds);
 		}
 	}
-
-	protected override unsafe void Xor(byte* stream, byte* source, byte* destination, int length)
-	{
-		IntrinsicsUtils.Xor(stream, source, destination, length);
-	}
 }