diff --git a/crypto/BouncyCastle.Android.csproj b/crypto/BouncyCastle.Android.csproj
index c5eb8e6f5..8936ecbc1 100644
--- a/crypto/BouncyCastle.Android.csproj
+++ b/crypto/BouncyCastle.Android.csproj
@@ -801,6 +801,7 @@
<Compile Include="src\crypto\engines\SerpentEngine.cs" />
<Compile Include="src\crypto\engines\SkipjackEngine.cs" />
<Compile Include="src\crypto\engines\SM2Engine.cs" />
+ <Compile Include="src\crypto\engines\SM4Engine.cs" />
<Compile Include="src\crypto\engines\TEAEngine.cs" />
<Compile Include="src\crypto\engines\ThreefishEngine.cs" />
<Compile Include="src\crypto\engines\TwofishEngine.cs" />
diff --git a/crypto/BouncyCastle.csproj b/crypto/BouncyCastle.csproj
index 76da30095..e66bb4e5d 100644
--- a/crypto/BouncyCastle.csproj
+++ b/crypto/BouncyCastle.csproj
@@ -795,6 +795,7 @@
<Compile Include="src\crypto\engines\SerpentEngine.cs" />
<Compile Include="src\crypto\engines\SkipjackEngine.cs" />
<Compile Include="src\crypto\engines\SM2Engine.cs" />
+ <Compile Include="src\crypto\engines\SM4Engine.cs" />
<Compile Include="src\crypto\engines\TEAEngine.cs" />
<Compile Include="src\crypto\engines\ThreefishEngine.cs" />
<Compile Include="src\crypto\engines\TwofishEngine.cs" />
diff --git a/crypto/BouncyCastle.iOS.csproj b/crypto/BouncyCastle.iOS.csproj
index 52dae0f4f..ad433e3dc 100644
--- a/crypto/BouncyCastle.iOS.csproj
+++ b/crypto/BouncyCastle.iOS.csproj
@@ -796,6 +796,7 @@
<Compile Include="src\crypto\engines\SerpentEngine.cs" />
<Compile Include="src\crypto\engines\SkipjackEngine.cs" />
<Compile Include="src\crypto\engines\SM2Engine.cs" />
+ <Compile Include="src\crypto\engines\SM4Engine.cs" />
<Compile Include="src\crypto\engines\TEAEngine.cs" />
<Compile Include="src\crypto\engines\ThreefishEngine.cs" />
<Compile Include="src\crypto\engines\TwofishEngine.cs" />
diff --git a/crypto/crypto.csproj b/crypto/crypto.csproj
index 2ffb66d8c..d0f672e8e 100644
--- a/crypto/crypto.csproj
+++ b/crypto/crypto.csproj
@@ -3769,6 +3769,11 @@
BuildAction = "Compile"
/>
<File
+ RelPath = "src\crypto\engines\SM4Engine.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
RelPath = "src\crypto\engines\TEAEngine.cs"
SubType = "Code"
BuildAction = "Compile"
@@ -12230,6 +12235,11 @@
BuildAction = "Compile"
/>
<File
+ RelPath = "test\src\crypto\test\SM4Test.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
RelPath = "test\src\crypto\test\SRP6Test.cs"
SubType = "Code"
BuildAction = "Compile"
@@ -13040,6 +13050,11 @@
BuildAction = "Compile"
/>
<File
+ RelPath = "test\src\test\SM4Test.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
RelPath = "test\src\test\TestUtilities.cs"
SubType = "Code"
BuildAction = "Compile"
diff --git a/crypto/src/crypto/engines/SM4Engine.cs b/crypto/src/crypto/engines/SM4Engine.cs
new file mode 100644
index 000000000..7477b070e
--- /dev/null
+++ b/crypto/src/crypto/engines/SM4Engine.cs
@@ -0,0 +1,189 @@
+using System;
+
+using Org.BouncyCastle.Crypto.Parameters;
+using Org.BouncyCastle.Crypto.Utilities;
+using Org.BouncyCastle.Utilities;
+
+namespace Org.BouncyCastle.Crypto.Engines
+{
+ /// <summary>SM4 Block Cipher - SM4 is a 128 bit block cipher with a 128 bit key.</summary>
+ /// <remarks>
+ /// The implementation here is based on the document <a href="http://eprint.iacr.org/2008/329.pdf">http://eprint.iacr.org/2008/329.pdf</a>
+ /// by Whitfield Diffie and George Ledin, which is a translation of Prof. LU Shu-wang's original standard.
+ /// </remarks>
+ public class SM4Engine
+ : IBlockCipher
+ {
+ private const int BlockSize = 16;
+
+ private static readonly byte[] Sbox =
+ {
+ 0xd6, 0x90, 0xe9, 0xfe, 0xcc, 0xe1, 0x3d, 0xb7, 0x16, 0xb6, 0x14, 0xc2, 0x28, 0xfb, 0x2c, 0x05,
+ 0x2b, 0x67, 0x9a, 0x76, 0x2a, 0xbe, 0x04, 0xc3, 0xaa, 0x44, 0x13, 0x26, 0x49, 0x86, 0x06, 0x99,
+ 0x9c, 0x42, 0x50, 0xf4, 0x91, 0xef, 0x98, 0x7a, 0x33, 0x54, 0x0b, 0x43, 0xed, 0xcf, 0xac, 0x62,
+ 0xe4, 0xb3, 0x1c, 0xa9, 0xc9, 0x08, 0xe8, 0x95, 0x80, 0xdf, 0x94, 0xfa, 0x75, 0x8f, 0x3f, 0xa6,
+ 0x47, 0x07, 0xa7, 0xfc, 0xf3, 0x73, 0x17, 0xba, 0x83, 0x59, 0x3c, 0x19, 0xe6, 0x85, 0x4f, 0xa8,
+ 0x68, 0x6b, 0x81, 0xb2, 0x71, 0x64, 0xda, 0x8b, 0xf8, 0xeb, 0x0f, 0x4b, 0x70, 0x56, 0x9d, 0x35,
+ 0x1e, 0x24, 0x0e, 0x5e, 0x63, 0x58, 0xd1, 0xa2, 0x25, 0x22, 0x7c, 0x3b, 0x01, 0x21, 0x78, 0x87,
+ 0xd4, 0x00, 0x46, 0x57, 0x9f, 0xd3, 0x27, 0x52, 0x4c, 0x36, 0x02, 0xe7, 0xa0, 0xc4, 0xc8, 0x9e,
+ 0xea, 0xbf, 0x8a, 0xd2, 0x40, 0xc7, 0x38, 0xb5, 0xa3, 0xf7, 0xf2, 0xce, 0xf9, 0x61, 0x15, 0xa1,
+ 0xe0, 0xae, 0x5d, 0xa4, 0x9b, 0x34, 0x1a, 0x55, 0xad, 0x93, 0x32, 0x30, 0xf5, 0x8c, 0xb1, 0xe3,
+ 0x1d, 0xf6, 0xe2, 0x2e, 0x82, 0x66, 0xca, 0x60, 0xc0, 0x29, 0x23, 0xab, 0x0d, 0x53, 0x4e, 0x6f,
+ 0xd5, 0xdb, 0x37, 0x45, 0xde, 0xfd, 0x8e, 0x2f, 0x03, 0xff, 0x6a, 0x72, 0x6d, 0x6c, 0x5b, 0x51,
+ 0x8d, 0x1b, 0xaf, 0x92, 0xbb, 0xdd, 0xbc, 0x7f, 0x11, 0xd9, 0x5c, 0x41, 0x1f, 0x10, 0x5a, 0xd8,
+ 0x0a, 0xc1, 0x31, 0x88, 0xa5, 0xcd, 0x7b, 0xbd, 0x2d, 0x74, 0xd0, 0x12, 0xb8, 0xe5, 0xb4, 0xb0,
+ 0x89, 0x69, 0x97, 0x4a, 0x0c, 0x96, 0x77, 0x7e, 0x65, 0xb9, 0xf1, 0x09, 0xc5, 0x6e, 0xc6, 0x84,
+ 0x18, 0xf0, 0x7d, 0xec, 0x3a, 0xdc, 0x4d, 0x20, 0x79, 0xee, 0x5f, 0x3e, 0xd7, 0xcb, 0x39, 0x48
+ };
+
+ private static readonly uint[] CK =
+ {
+ 0x00070e15, 0x1c232a31, 0x383f464d, 0x545b6269,
+ 0x70777e85, 0x8c939aa1, 0xa8afb6bd, 0xc4cbd2d9,
+ 0xe0e7eef5, 0xfc030a11, 0x181f262d, 0x343b4249,
+ 0x50575e65, 0x6c737a81, 0x888f969d, 0xa4abb2b9,
+ 0xc0c7ced5, 0xdce3eaf1, 0xf8ff060d, 0x141b2229,
+ 0x30373e45, 0x4c535a61, 0x686f767d, 0x848b9299,
+ 0xa0a7aeb5, 0xbcc3cad1, 0xd8dfe6ed, 0xf4fb0209,
+ 0x10171e25, 0x2c333a41, 0x484f565d, 0x646b7279
+ };
+
+ private static readonly uint[] FK =
+ {
+ 0xa3b1bac6, 0x56aa3350, 0x677d9197, 0xb27022dc
+ };
+
+ private uint[] rk;
+
+ // non-linear substitution tau.
+ private static uint tau(uint A)
+ {
+ uint b0 = Sbox[A >> 24];
+ uint b1 = Sbox[(A >> 16) & 0xFF];
+ uint b2 = Sbox[(A >> 8) & 0xFF];
+ uint b3 = Sbox[A & 0xFF];
+
+ return (b0 << 24) | (b1 << 16) | (b2 << 8) | b3;
+ }
+
+ private static uint L_ap(uint B)
+ {
+ return B ^ Integers.RotateLeft(B, 13) ^ Integers.RotateLeft(B, 23);
+ }
+
+ private uint T_ap(uint Z)
+ {
+ return L_ap(tau(Z));
+ }
+
+ // Key expansion
+ private void ExpandKey(bool forEncryption, byte[] key)
+ {
+ uint K0 = Pack.BE_To_UInt32(key, 0) ^ FK[0];
+ uint K1 = Pack.BE_To_UInt32(key, 4) ^ FK[1];
+ uint K2 = Pack.BE_To_UInt32(key, 8) ^ FK[2];
+ uint K3 = Pack.BE_To_UInt32(key, 12) ^ FK[3];
+
+ if (forEncryption)
+ {
+ rk[0] = K0 ^ T_ap(K1 ^ K2 ^ K3 ^ CK[0]);
+ rk[1] = K1 ^ T_ap(K2 ^ K3 ^ rk[0] ^ CK[1]);
+ rk[2] = K2 ^ T_ap(K3 ^ rk[0] ^ rk[1] ^ CK[2]);
+ rk[3] = K3 ^ T_ap(rk[0] ^ rk[1] ^ rk[2] ^ CK[3]);
+ for (int i = 4; i < 32; ++i)
+ {
+ rk[i] = rk[i - 4] ^ T_ap(rk[i - 3] ^ rk[i - 2] ^ rk[i - 1] ^ CK[i]);
+ }
+ }
+ else
+ {
+ rk[31] = K0 ^ T_ap(K1 ^ K2 ^ K3 ^ CK[0]);
+ rk[30] = K1 ^ T_ap(K2 ^ K3 ^ rk[31] ^ CK[1]);
+ rk[29] = K2 ^ T_ap(K3 ^ rk[31] ^ rk[30] ^ CK[2]);
+ rk[28] = K3 ^ T_ap(rk[31] ^ rk[30] ^ rk[29] ^ CK[3]);
+ for (int i = 27; i >= 0; --i)
+ {
+ rk[i] = rk[i + 4] ^ T_ap(rk[i + 3] ^ rk[i + 2] ^ rk[i + 1] ^ CK[31 - i]);
+ }
+ }
+ }
+
+ // Linear substitution L
+ private static uint L(uint B)
+ {
+ return B ^ Integers.RotateLeft(B, 2) ^ Integers.RotateLeft(B, 10) ^ Integers.RotateLeft(B, 18) ^ Integers.RotateLeft(B, 24);
+ }
+
+ // Mixer-substitution T
+ private static uint T(uint Z)
+ {
+ return L(tau(Z));
+ }
+
+ public virtual void Init(bool forEncryption, ICipherParameters parameters)
+ {
+ KeyParameter keyParameter = parameters as KeyParameter;
+ if (null == keyParameter)
+ throw new ArgumentException("invalid parameter passed to SM4 init - " + Platform.GetTypeName(parameters), "parameters");
+
+ byte[] key = keyParameter.GetKey();
+ if (key.Length != 16)
+ throw new ArgumentException("SM4 requires a 128 bit key", "parameters");
+
+ if (null == rk)
+ {
+ rk = new uint[32];
+ }
+
+ ExpandKey(forEncryption, key);
+ }
+
+ public virtual string AlgorithmName
+ {
+ get { return "SM4"; }
+ }
+
+ public virtual bool IsPartialBlockOkay
+ {
+ get { return false; }
+ }
+
+ public virtual int GetBlockSize()
+ {
+ return BlockSize;
+ }
+
+ public virtual int ProcessBlock(byte[] input, int inOff, byte[] output, int outOff)
+ {
+ if (null == rk)
+ throw new InvalidOperationException("SM4 not initialised");
+
+ Check.DataLength(input, inOff, BlockSize, "input buffer too short");
+ Check.OutputLength(output, outOff, BlockSize, "output buffer too short");
+
+ uint X0 = Pack.BE_To_UInt32(input, inOff);
+ uint X1 = Pack.BE_To_UInt32(input, inOff + 4);
+ uint X2 = Pack.BE_To_UInt32(input, inOff + 8);
+ uint X3 = Pack.BE_To_UInt32(input, inOff + 12);
+
+ for (int i = 0; i < 32; i += 4)
+ {
+ X0 ^= T(X1 ^ X2 ^ X3 ^ rk[i ]); // F0
+ X1 ^= T(X2 ^ X3 ^ X0 ^ rk[i + 1]); // F1
+ X2 ^= T(X3 ^ X0 ^ X1 ^ rk[i + 2]); // F2
+ X3 ^= T(X0 ^ X1 ^ X2 ^ rk[i + 3]); // F3
+ }
+
+ Pack.UInt32_To_BE(X3, output, outOff);
+ Pack.UInt32_To_BE(X2, output, outOff + 4);
+ Pack.UInt32_To_BE(X1, output, outOff + 8);
+ Pack.UInt32_To_BE(X0, output, outOff + 12);
+
+ return BlockSize;
+ }
+
+ public virtual void Reset()
+ {
+ }
+ }
+}
diff --git a/crypto/src/security/CipherUtilities.cs b/crypto/src/security/CipherUtilities.cs
index de05bc9ef..eb10baec8 100644
--- a/crypto/src/security/CipherUtilities.cs
+++ b/crypto/src/security/CipherUtilities.cs
@@ -53,6 +53,7 @@ namespace Org.BouncyCastle.Security
SEED,
SERPENT,
SKIPJACK,
+ SM4,
TEA,
THREEFISH_256,
THREEFISH_512,
@@ -433,6 +434,9 @@ namespace Org.BouncyCastle.Security
case CipherAlgorithm.SKIPJACK:
blockCipher = new SkipjackEngine();
break;
+ case CipherAlgorithm.SM4:
+ blockCipher = new SM4Engine();
+ break;
case CipherAlgorithm.TEA:
blockCipher = new TeaEngine();
break;
@@ -740,6 +744,7 @@ namespace Org.BouncyCastle.Security
case CipherAlgorithm.SEED: return new SeedEngine();
case CipherAlgorithm.SERPENT: return new SerpentEngine();
case CipherAlgorithm.SKIPJACK: return new SkipjackEngine();
+ case CipherAlgorithm.SM4: return new SM4Engine();
case CipherAlgorithm.TEA: return new TeaEngine();
case CipherAlgorithm.THREEFISH_256: return new ThreefishEngine(ThreefishEngine.BLOCKSIZE_256);
case CipherAlgorithm.THREEFISH_512: return new ThreefishEngine(ThreefishEngine.BLOCKSIZE_512);
diff --git a/crypto/src/security/GeneratorUtilities.cs b/crypto/src/security/GeneratorUtilities.cs
index 26ddb396b..08281493a 100644
--- a/crypto/src/security/GeneratorUtilities.cs
+++ b/crypto/src/security/GeneratorUtilities.cs
@@ -110,6 +110,7 @@ namespace Org.BouncyCastle.Security
KisaObjectIdentifiers.IdSeedCbc);
AddKgAlgorithm("SERPENT");
AddKgAlgorithm("SKIPJACK");
+ AddKgAlgorithm("SM4");
AddKgAlgorithm("TEA");
AddKgAlgorithm("THREEFISH-256");
AddKgAlgorithm("THREEFISH-512");
@@ -203,7 +204,7 @@ namespace Org.BouncyCastle.Security
AddDefaultKeySizeEntries(80, "SKIPJACK");
AddDefaultKeySizeEntries(128, "AES128", "BLOWFISH", "CAMELLIA128", "CAST5", "DESEDE",
"HC128", "HMACMD2", "HMACMD4", "HMACMD5", "HMACRIPEMD128", "IDEA", "NOEKEON",
- "RC2", "RC4", "RC5", "SALSA20", "SEED", "TEA", "XTEA", "VMPC", "VMPC-KSA3");
+ "RC2", "RC4", "RC5", "SALSA20", "SEED", "SM4", "TEA", "XTEA", "VMPC", "VMPC-KSA3");
AddDefaultKeySizeEntries(160, "HMACRIPEMD160", "HMACSHA1");
AddDefaultKeySizeEntries(192, "AES", "AES192", "CAMELLIA192", "DESEDE3", "HMACTIGER",
"RIJNDAEL", "SERPENT", "TNEPRES");
diff --git a/crypto/src/security/ParameterUtilities.cs b/crypto/src/security/ParameterUtilities.cs
index c12155878..792067bba 100644
--- a/crypto/src/security/ParameterUtilities.cs
+++ b/crypto/src/security/ParameterUtilities.cs
@@ -103,6 +103,7 @@ namespace Org.BouncyCastle.Security
KisaObjectIdentifiers.IdSeedCbc);
AddAlgorithm("SERPENT");
AddAlgorithm("SKIPJACK");
+ AddAlgorithm("SM4");
AddAlgorithm("TEA");
AddAlgorithm("THREEFISH-256");
AddAlgorithm("THREEFISH-512");
@@ -115,7 +116,8 @@ namespace Org.BouncyCastle.Security
AddBasicIVSizeEntries(8, "BLOWFISH", "DES", "DESEDE", "DESEDE3");
AddBasicIVSizeEntries(16, "AES", "AES128", "AES192", "AES256",
- "CAMELLIA", "CAMELLIA128", "CAMELLIA192", "CAMELLIA256", "NOEKEON", "SEED");
+ "CAMELLIA", "CAMELLIA128", "CAMELLIA192", "CAMELLIA256",
+ "NOEKEON", "SEED", "SM4");
// TODO These algorithms support an IV
// but JCE doesn't seem to provide an AlgorithmParametersGenerator for them
diff --git a/crypto/src/util/Integers.cs b/crypto/src/util/Integers.cs
index ccbf872c4..e746b0ef4 100644
--- a/crypto/src/util/Integers.cs
+++ b/crypto/src/util/Integers.cs
@@ -9,9 +9,21 @@ namespace Org.BouncyCastle.Utilities
return (i << distance) ^ (int)((uint)i >> -distance);
}
+ [CLSCompliantAttribute(false)]
+ public static uint RotateLeft(uint i, int distance)
+ {
+ return (i << distance) ^ (i >> -distance);
+ }
+
public static int RotateRight(int i, int distance)
{
return (int)((uint)i >> distance) ^ (i << -distance);
}
+
+ [CLSCompliantAttribute(false)]
+ public static uint RotateRight(uint i, int distance)
+ {
+ return (i >> distance) ^ (i << -distance);
+ }
}
}
diff --git a/crypto/test/UnitTests.csproj b/crypto/test/UnitTests.csproj
index bb046c2b6..d89cd6d56 100644
--- a/crypto/test/UnitTests.csproj
+++ b/crypto/test/UnitTests.csproj
@@ -265,6 +265,7 @@
<Compile Include="src\crypto\test\SM2KeyExchangeTest.cs" />
<Compile Include="src\crypto\test\SM2SignerTest.cs" />
<Compile Include="src\crypto\test\SM3DigestTest.cs" />
+ <Compile Include="src\crypto\test\SM4Test.cs" />
<Compile Include="src\crypto\test\SkeinDigestTest.cs" />
<Compile Include="src\crypto\test\SkeinMacTest.cs" />
<Compile Include="src\crypto\test\StreamCipherResetTest.cs" />
@@ -434,6 +435,7 @@
<Compile Include="src\test\RegressionTest.cs" />
<Compile Include="src\test\SEEDTest.cs" />
<Compile Include="src\test\SigTest.cs" />
+ <Compile Include="src\test\SM4Test.cs" />
<Compile Include="src\test\TestUtilities.cs" />
<Compile Include="src\test\WrapTest.cs" />
<Compile Include="src\test\X509CertificatePairTest.cs" />
diff --git a/crypto/test/src/crypto/test/RegressionTest.cs b/crypto/test/src/crypto/test/RegressionTest.cs
index 18aa62d97..f8b5c3c79 100644
--- a/crypto/test/src/crypto/test/RegressionTest.cs
+++ b/crypto/test/src/crypto/test/RegressionTest.cs
@@ -133,6 +133,7 @@ namespace Org.BouncyCastle.Crypto.Tests
new SM2EngineTest(),
new SM2KeyExchangeTest(),
new SM2SignerTest(),
+ new SM4Test(),
new X25519Test(),
new X448Test(),
new Ed25519Test(),
diff --git a/crypto/test/src/crypto/test/SM4Test.cs b/crypto/test/src/crypto/test/SM4Test.cs
new file mode 100644
index 000000000..ae2f18b00
--- /dev/null
+++ b/crypto/test/src/crypto/test/SM4Test.cs
@@ -0,0 +1,93 @@
+using System;
+
+using NUnit.Framework;
+
+using Org.BouncyCastle.Crypto.Engines;
+using Org.BouncyCastle.Crypto.Parameters;
+using Org.BouncyCastle.Utilities.Encoders;
+using Org.BouncyCastle.Utilities.Test;
+
+namespace Org.BouncyCastle.Crypto.Tests
+{
+ /**
+ * SM4 tester, vectors from <a href="http://eprint.iacr.org/2008/329.pdf">http://eprint.iacr.org/2008/329.pdf</a>
+ */
+ [TestFixture]
+ public class SM4Test
+ : CipherTest
+ {
+ static SimpleTest[] tests =
+ {
+ new BlockCipherVectorTest(0, new SM4Engine(),
+ new KeyParameter(Hex.Decode("0123456789abcdeffedcba9876543210")),
+ "0123456789abcdeffedcba9876543210",
+ "681edf34d206965e86b3e94f536e4246")
+ };
+
+ public SM4Test()
+ : base(tests, new SM4Engine(), new KeyParameter(new byte[16]))
+ {
+ }
+
+ public override void PerformTest()
+ {
+ base.PerformTest();
+
+ DoTest1000000();
+ }
+
+ private void DoTest1000000()
+ {
+ byte[] plain = Hex.Decode("0123456789abcdeffedcba9876543210");
+ byte[] key = Hex.Decode("0123456789abcdeffedcba9876543210");
+ byte[] cipher = Hex.Decode("595298c7c6fd271f0402f804c33d3f66");
+ byte[] buf = new byte[16];
+
+ IBlockCipher engine = new SM4Engine();
+
+ engine.Init(true, new KeyParameter(key));
+
+ Array.Copy(plain, 0, buf, 0, buf.Length);
+
+ for (int i = 0; i != 1000000; i++)
+ {
+ engine.ProcessBlock(buf, 0, buf, 0);
+ }
+
+ if (!AreEqual(cipher, buf))
+ {
+ Fail("1000000 encryption test failed");
+ }
+
+ engine.Init(false, new KeyParameter(key));
+
+ for (int i = 0; i != 1000000; i++)
+ {
+ engine.ProcessBlock(buf, 0, buf, 0);
+ }
+
+ if (!AreEqual(plain, buf))
+ {
+ Fail("1000000 decryption test failed");
+ }
+ }
+
+ public override string Name
+ {
+ get { return "SM4"; }
+ }
+
+ public static void Main(string[] args)
+ {
+ RunTest(new SM4Test());
+ }
+
+ [Test]
+ public void TestFunction()
+ {
+ string resultText = Perform().ToString();
+
+ Assert.AreEqual(Name + ": Okay", resultText);
+ }
+ }
+}
diff --git a/crypto/test/src/test/RegressionTest.cs b/crypto/test/src/test/RegressionTest.cs
index 0ffde72e4..7f4f38f00 100644
--- a/crypto/test/src/test/RegressionTest.cs
+++ b/crypto/test/src/test/RegressionTest.cs
@@ -64,6 +64,7 @@ namespace Org.BouncyCastle.Tests
new MqvTest(),
new CMacTest(),
new Crl5Test(),
+ new SM4Test()
};
public static void Main(
diff --git a/crypto/test/src/test/SM4Test.cs b/crypto/test/src/test/SM4Test.cs
new file mode 100644
index 000000000..5d36b3431
--- /dev/null
+++ b/crypto/test/src/test/SM4Test.cs
@@ -0,0 +1,149 @@
+using System;
+using System.IO;
+
+using NUnit.Framework;
+
+using Org.BouncyCastle.Crypto;
+using Org.BouncyCastle.Crypto.IO;
+using Org.BouncyCastle.Crypto.Parameters;
+using Org.BouncyCastle.Security;
+using Org.BouncyCastle.Utilities.Encoders;
+
+namespace Org.BouncyCastle.Tests
+{
+ /**
+ * basic test class for SM4
+ */
+ [TestFixture]
+ public class SM4Test
+ : BaseBlockCipherTest
+ {
+ internal static readonly string[] cipherTests =
+ {
+ "128",
+ "0123456789abcdeffedcba9876543210",
+ "0123456789abcdeffedcba9876543210",
+ "681edf34d206965e86b3e94f536e4246"
+ };
+
+ public SM4Test()
+ : base("SM4")
+ {
+ }
+
+ public void DoTest(
+ int strength,
+ byte[] keyBytes,
+ byte[] input,
+ byte[] output)
+ {
+ KeyParameter key = ParameterUtilities.CreateKeyParameter("SM4", keyBytes);
+
+ IBufferedCipher inCipher = CipherUtilities.GetCipher("SM4/ECB/NoPadding");
+ IBufferedCipher outCipher = CipherUtilities.GetCipher("SM4/ECB/NoPadding");
+
+ try
+ {
+ outCipher.Init(true, key);
+ }
+ catch (Exception e)
+ {
+ Fail("SM4 failed initialisation - " + e, e);
+ }
+
+ try
+ {
+ inCipher.Init(false, key);
+ }
+ catch (Exception e)
+ {
+ Fail("SM4 failed initialisation - " + e, e);
+ }
+
+ //
+ // encryption pass
+ //
+ MemoryStream bOut = new MemoryStream();
+
+ CipherStream cOut = new CipherStream(bOut, null, outCipher);
+
+ try
+ {
+ for (int i = 0; i != input.Length / 2; i++)
+ {
+ cOut.WriteByte(input[i]);
+ }
+ cOut.Write(input, input.Length / 2, input.Length - input.Length / 2);
+ cOut.Close();
+ }
+ catch (IOException e)
+ {
+ Fail("SM4 failed encryption - " + e, e);
+ }
+
+ byte[] bytes = bOut.ToArray();
+
+ if (!AreEqual(bytes, output))
+ {
+ Fail("SM4 failed encryption - expected "
+ + Hex.ToHexString(output) + " got "
+ + Hex.ToHexString(bytes));
+ }
+
+ //
+ // decryption pass
+ //
+ MemoryStream bIn = new MemoryStream(bytes, false);
+
+ CipherStream cIn = new CipherStream(bIn, inCipher, null);
+
+ try
+ {
+// DataInputStream dIn = new DataInputStream(cIn);
+ BinaryReader dIn = new BinaryReader(cIn);
+
+ bytes = new byte[input.Length];
+
+ for (int i = 0; i != input.Length / 2; i++)
+ {
+// bytes[i] = (byte)dIn.read();
+ bytes[i] = dIn.ReadByte();
+ }
+
+ int remaining = bytes.Length - input.Length / 2;
+// dIn.readFully(bytes, input.Length / 2, remaining);
+ byte[] extra = dIn.ReadBytes(remaining);
+ if (extra.Length < remaining)
+ throw new EndOfStreamException();
+ extra.CopyTo(bytes, input.Length / 2);
+ }
+ catch (Exception e)
+ {
+ Fail("SM4 failed encryption - " + e, e);
+ }
+
+ if (!AreEqual(bytes, input))
+ {
+ Fail("SM4 failed decryption - expected "
+ + Hex.ToHexString(input) + " got "
+ + Hex.ToHexString(bytes));
+ }
+ }
+
+ public override void PerformTest()
+ {
+ for (int i = 0; i != cipherTests.Length; i += 4)
+ {
+ DoTest(int.Parse(cipherTests[i]),
+ Hex.Decode(cipherTests[i + 1]),
+ Hex.Decode(cipherTests[i + 2]),
+ Hex.Decode(cipherTests[i + 3]));
+ }
+ }
+
+ public static void Main(string[] args)
+ {
+ RunTest(new SM4Test());
+ }
+ }
+}
|
