Skip to content

Commit 017ebcc

Browse files
peterdettmanpeterdettman
committed
Add support for ARIA
1 parent c9efa52 commit 017ebcc

File tree

12 files changed

+837
-40
lines changed

12 files changed

+837
-40
lines changed

‎crypto/BouncyCastle.Android.csproj

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
<Compile Include="bzip2\src\CBZip2InputStream.cs" />
5757
<Compile Include="bzip2\src\CBZip2OutputStream.cs" />
5858
<Compile Include="bzip2\src\CRC.cs" />
59-
<Compile Include="src\asn1\BERBitString.cs" />
6059
<Compile Include="src\AssemblyInfo.cs" />
6160
<Compile Include="src\asn1\ASN1Generator.cs" />
6261
<Compile Include="src\asn1\ASN1OctetStringParser.cs" />
@@ -77,6 +76,7 @@
7776
<Compile Include="src\asn1\Asn1Set.cs" />
7877
<Compile Include="src\asn1\Asn1TaggedObject.cs" />
7978
<Compile Include="src\asn1\Asn1Tags.cs" />
79+
<Compile Include="src\asn1\BERBitString.cs" />
8080
<Compile Include="src\asn1\BERGenerator.cs" />
8181
<Compile Include="src\asn1\BEROctetStringGenerator.cs" />
8282
<Compile Include="src\asn1\BEROctetStringParser.cs" />
@@ -329,6 +329,7 @@
329329
<Compile Include="src\asn1\nist\KMACwithSHAKE256_params.cs" />
330330
<Compile Include="src\asn1\nist\NISTNamedCurves.cs" />
331331
<Compile Include="src\asn1\nist\NISTObjectIdentifiers.cs" />
332+
<Compile Include="src\asn1\nsri\NsriObjectIdentifiers.cs" />
332333
<Compile Include="src\asn1\ntt\NTTObjectIdentifiers.cs" />
333334
<Compile Include="src\asn1\ocsp\BasicOCSPResponse.cs" />
334335
<Compile Include="src\asn1\ocsp\CertID.cs" />
@@ -670,12 +671,6 @@
670671
<Compile Include="src\crypto\CipherKeyGenerator.cs" />
671672
<Compile Include="src\crypto\CryptoException.cs" />
672673
<Compile Include="src\crypto\DataLengthException.cs" />
673-
<Compile Include="src\crypto\digests\NonMemoableDigest.cs" />
674-
<Compile Include="src\crypto\engines\SerpentEngineBase.cs" />
675-
<Compile Include="src\crypto\engines\TnepresEngine.cs" />
676-
<Compile Include="src\crypto\generators\BCrypt.cs" />
677-
<Compile Include="src\crypto\generators\HKDFBytesGenerator.cs" />
678-
<Compile Include="src\crypto\generators\OpenBsdBCrypt.cs" />
679674
<Compile Include="src\crypto\IAsymmetricBlockCipher.cs" />
680675
<Compile Include="src\crypto\IAsymmetricCipherKeyPairGenerator.cs" />
681676
<Compile Include="src\crypto\IBasicAgreement.cs" />
@@ -762,6 +757,7 @@
762757
<Compile Include="src\crypto\digests\MD2Digest.cs" />
763758
<Compile Include="src\crypto\digests\MD4Digest.cs" />
764759
<Compile Include="src\crypto\digests\MD5Digest.cs" />
760+
<Compile Include="src\crypto\digests\NonMemoableDigest.cs" />
765761
<Compile Include="src\crypto\digests\NullDigest.cs" />
766762
<Compile Include="src\crypto\digests\RipeMD128Digest.cs" />
767763
<Compile Include="src\crypto\digests\RipeMD160Digest.cs" />
@@ -790,6 +786,7 @@
790786
<Compile Include="src\crypto\engines\AesFastEngine.cs" />
791787
<Compile Include="src\crypto\engines\AesLightEngine.cs" />
792788
<Compile Include="src\crypto\engines\AesWrapEngine.cs" />
789+
<Compile Include="src\crypto\engines\AriaEngine.cs" />
793790
<Compile Include="src\crypto\engines\BlowfishEngine.cs" />
794791
<Compile Include="src\crypto\engines\CamelliaEngine.cs" />
795792
<Compile Include="src\crypto\engines\CamelliaLightEngine.cs" />
@@ -830,17 +827,20 @@
830827
<Compile Include="src\crypto\engines\SEEDWrapEngine.cs" />
831828
<Compile Include="src\crypto\engines\Salsa20Engine.cs" />
832829
<Compile Include="src\crypto\engines\SerpentEngine.cs" />
830+
<Compile Include="src\crypto\engines\SerpentEngineBase.cs" />
833831
<Compile Include="src\crypto\engines\SkipjackEngine.cs" />
834832
<Compile Include="src\crypto\engines\SM2Engine.cs" />
835833
<Compile Include="src\crypto\engines\SM4Engine.cs" />
836834
<Compile Include="src\crypto\engines\TEAEngine.cs" />
837835
<Compile Include="src\crypto\engines\ThreefishEngine.cs" />
836+
<Compile Include="src\crypto\engines\TnepresEngine.cs" />
838837
<Compile Include="src\crypto\engines\TwofishEngine.cs" />
839838
<Compile Include="src\crypto\engines\VMPCEngine.cs" />
840839
<Compile Include="src\crypto\engines\VMPCKSA3Engine.cs" />
841840
<Compile Include="src\crypto\engines\XSalsa20Engine.cs" />
842841
<Compile Include="src\crypto\engines\XTEAEngine.cs" />
843842
<Compile Include="src\crypto\generators\BaseKdfBytesGenerator.cs" />
843+
<Compile Include="src\crypto\generators\BCrypt.cs" />
844844
<Compile Include="src\crypto\generators\DHBasicKeyPairGenerator.cs" />
845845
<Compile Include="src\crypto\generators\DHKeyGeneratorHelper.cs" />
846846
<Compile Include="src\crypto\generators\DHKeyPairGenerator.cs" />
@@ -857,13 +857,15 @@
857857
<Compile Include="src\crypto\generators\ElGamalParametersGenerator.cs" />
858858
<Compile Include="src\crypto\generators\GOST3410KeyPairGenerator.cs" />
859859
<Compile Include="src\crypto\generators\GOST3410ParametersGenerator.cs" />
860+
<Compile Include="src\crypto\generators\HKDFBytesGenerator.cs" />
860861
<Compile Include="src\crypto\generators\Kdf1BytesGenerator.cs" />
861862
<Compile Include="src\crypto\generators\Kdf2BytesGenerator.cs" />
862863
<Compile Include="src\crypto\generators\KDFCounterBytesGenerator.cs" />
863864
<Compile Include="src\crypto\generators\KDFDoublePipelineIterationBytesGenerator.cs" />
864865
<Compile Include="src\crypto\generators\KDFFeedbackBytesGenerator.cs" />
865866
<Compile Include="src\crypto\generators\Mgf1BytesGenerator.cs" />
866867
<Compile Include="src\crypto\generators\NaccacheSternKeyPairGenerator.cs" />
868+
<Compile Include="src\crypto\generators\OpenBsdBCrypt.cs" />
867869
<Compile Include="src\crypto\generators\OpenSSLPBEParametersGenerator.cs" />
868870
<Compile Include="src\crypto\generators\Pkcs12ParametersGenerator.cs" />
869871
<Compile Include="src\crypto\generators\Pkcs5S1ParametersGenerator.cs" />

‎crypto/BouncyCastle.csproj

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
<Compile Include="bzip2\src\CBZip2InputStream.cs" />
5151
<Compile Include="bzip2\src\CBZip2OutputStream.cs" />
5252
<Compile Include="bzip2\src\CRC.cs" />
53-
<Compile Include="src\asn1\BERBitString.cs" />
5453
<Compile Include="src\AssemblyInfo.cs" />
5554
<Compile Include="src\asn1\ASN1Generator.cs" />
5655
<Compile Include="src\asn1\ASN1OctetStringParser.cs" />
@@ -71,6 +70,7 @@
7170
<Compile Include="src\asn1\Asn1Set.cs" />
7271
<Compile Include="src\asn1\Asn1TaggedObject.cs" />
7372
<Compile Include="src\asn1\Asn1Tags.cs" />
73+
<Compile Include="src\asn1\BERBitString.cs" />
7474
<Compile Include="src\asn1\BERGenerator.cs" />
7575
<Compile Include="src\asn1\BEROctetStringGenerator.cs" />
7676
<Compile Include="src\asn1\BEROctetStringParser.cs" />
@@ -323,6 +323,7 @@
323323
<Compile Include="src\asn1\nist\KMACwithSHAKE256_params.cs" />
324324
<Compile Include="src\asn1\nist\NISTNamedCurves.cs" />
325325
<Compile Include="src\asn1\nist\NISTObjectIdentifiers.cs" />
326+
<Compile Include="src\asn1\nsri\NsriObjectIdentifiers.cs" />
326327
<Compile Include="src\asn1\ntt\NTTObjectIdentifiers.cs" />
327328
<Compile Include="src\asn1\ocsp\BasicOCSPResponse.cs" />
328329
<Compile Include="src\asn1\ocsp\CertID.cs" />
@@ -664,12 +665,6 @@
664665
<Compile Include="src\crypto\CipherKeyGenerator.cs" />
665666
<Compile Include="src\crypto\CryptoException.cs" />
666667
<Compile Include="src\crypto\DataLengthException.cs" />
667-
<Compile Include="src\crypto\digests\NonMemoableDigest.cs" />
668-
<Compile Include="src\crypto\engines\SerpentEngineBase.cs" />
669-
<Compile Include="src\crypto\engines\TnepresEngine.cs" />
670-
<Compile Include="src\crypto\generators\BCrypt.cs" />
671-
<Compile Include="src\crypto\generators\HKDFBytesGenerator.cs" />
672-
<Compile Include="src\crypto\generators\OpenBsdBCrypt.cs" />
673668
<Compile Include="src\crypto\IAsymmetricBlockCipher.cs" />
674669
<Compile Include="src\crypto\IAsymmetricCipherKeyPairGenerator.cs" />
675670
<Compile Include="src\crypto\IBasicAgreement.cs" />
@@ -756,6 +751,7 @@
756751
<Compile Include="src\crypto\digests\MD2Digest.cs" />
757752
<Compile Include="src\crypto\digests\MD4Digest.cs" />
758753
<Compile Include="src\crypto\digests\MD5Digest.cs" />
754+
<Compile Include="src\crypto\digests\NonMemoableDigest.cs" />
759755
<Compile Include="src\crypto\digests\NullDigest.cs" />
760756
<Compile Include="src\crypto\digests\RipeMD128Digest.cs" />
761757
<Compile Include="src\crypto\digests\RipeMD160Digest.cs" />
@@ -784,6 +780,7 @@
784780
<Compile Include="src\crypto\engines\AesFastEngine.cs" />
785781
<Compile Include="src\crypto\engines\AesLightEngine.cs" />
786782
<Compile Include="src\crypto\engines\AesWrapEngine.cs" />
783+
<Compile Include="src\crypto\engines\AriaEngine.cs" />
787784
<Compile Include="src\crypto\engines\BlowfishEngine.cs" />
788785
<Compile Include="src\crypto\engines\CamelliaEngine.cs" />
789786
<Compile Include="src\crypto\engines\CamelliaLightEngine.cs" />
@@ -824,17 +821,20 @@
824821
<Compile Include="src\crypto\engines\SEEDWrapEngine.cs" />
825822
<Compile Include="src\crypto\engines\Salsa20Engine.cs" />
826823
<Compile Include="src\crypto\engines\SerpentEngine.cs" />
824+
<Compile Include="src\crypto\engines\SerpentEngineBase.cs" />
827825
<Compile Include="src\crypto\engines\SkipjackEngine.cs" />
828826
<Compile Include="src\crypto\engines\SM2Engine.cs" />
829827
<Compile Include="src\crypto\engines\SM4Engine.cs" />
830828
<Compile Include="src\crypto\engines\TEAEngine.cs" />
831829
<Compile Include="src\crypto\engines\ThreefishEngine.cs" />
830+
<Compile Include="src\crypto\engines\TnepresEngine.cs" />
832831
<Compile Include="src\crypto\engines\TwofishEngine.cs" />
833832
<Compile Include="src\crypto\engines\VMPCEngine.cs" />
834833
<Compile Include="src\crypto\engines\VMPCKSA3Engine.cs" />
835834
<Compile Include="src\crypto\engines\XSalsa20Engine.cs" />
836835
<Compile Include="src\crypto\engines\XTEAEngine.cs" />
837836
<Compile Include="src\crypto\generators\BaseKdfBytesGenerator.cs" />
837+
<Compile Include="src\crypto\generators\BCrypt.cs" />
838838
<Compile Include="src\crypto\generators\DHBasicKeyPairGenerator.cs" />
839839
<Compile Include="src\crypto\generators\DHKeyGeneratorHelper.cs" />
840840
<Compile Include="src\crypto\generators\DHKeyPairGenerator.cs" />
@@ -851,13 +851,15 @@
851851
<Compile Include="src\crypto\generators\ElGamalParametersGenerator.cs" />
852852
<Compile Include="src\crypto\generators\GOST3410KeyPairGenerator.cs" />
853853
<Compile Include="src\crypto\generators\GOST3410ParametersGenerator.cs" />
854+
<Compile Include="src\crypto\generators\HKDFBytesGenerator.cs" />
854855
<Compile Include="src\crypto\generators\Kdf1BytesGenerator.cs" />
855856
<Compile Include="src\crypto\generators\Kdf2BytesGenerator.cs" />
856857
<Compile Include="src\crypto\generators\KDFCounterBytesGenerator.cs" />
857858
<Compile Include="src\crypto\generators\KDFDoublePipelineIterationBytesGenerator.cs" />
858859
<Compile Include="src\crypto\generators\KDFFeedbackBytesGenerator.cs" />
859860
<Compile Include="src\crypto\generators\Mgf1BytesGenerator.cs" />
860861
<Compile Include="src\crypto\generators\NaccacheSternKeyPairGenerator.cs" />
862+
<Compile Include="src\crypto\generators\OpenBsdBCrypt.cs" />
861863
<Compile Include="src\crypto\generators\OpenSSLPBEParametersGenerator.cs" />
862864
<Compile Include="src\crypto\generators\Pkcs12ParametersGenerator.cs" />
863865
<Compile Include="src\crypto\generators\Pkcs5S1ParametersGenerator.cs" />
@@ -1670,4 +1672,4 @@
16701672
<None Include="checklist.txt" />
16711673
</ItemGroup>
16721674
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
1673-
</Project>
1675+
</Project>

‎crypto/BouncyCastle.iOS.csproj

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
<Compile Include="bzip2\src\CBZip2InputStream.cs" />
5252
<Compile Include="bzip2\src\CBZip2OutputStream.cs" />
5353
<Compile Include="bzip2\src\CRC.cs" />
54-
<Compile Include="src\asn1\BERBitString.cs" />
5554
<Compile Include="src\AssemblyInfo.cs" />
5655
<Compile Include="src\asn1\ASN1Generator.cs" />
5756
<Compile Include="src\asn1\ASN1OctetStringParser.cs" />
@@ -72,6 +71,7 @@
7271
<Compile Include="src\asn1\Asn1Set.cs" />
7372
<Compile Include="src\asn1\Asn1TaggedObject.cs" />
7473
<Compile Include="src\asn1\Asn1Tags.cs" />
74+
<Compile Include="src\asn1\BERBitString.cs" />
7575
<Compile Include="src\asn1\BERGenerator.cs" />
7676
<Compile Include="src\asn1\BEROctetStringGenerator.cs" />
7777
<Compile Include="src\asn1\BEROctetStringParser.cs" />
@@ -324,6 +324,7 @@
324324
<Compile Include="src\asn1\nist\KMACwithSHAKE256_params.cs" />
325325
<Compile Include="src\asn1\nist\NISTNamedCurves.cs" />
326326
<Compile Include="src\asn1\nist\NISTObjectIdentifiers.cs" />
327+
<Compile Include="src\asn1\nsri\NsriObjectIdentifiers.cs" />
327328
<Compile Include="src\asn1\ntt\NTTObjectIdentifiers.cs" />
328329
<Compile Include="src\asn1\ocsp\BasicOCSPResponse.cs" />
329330
<Compile Include="src\asn1\ocsp\CertID.cs" />
@@ -665,12 +666,6 @@
665666
<Compile Include="src\crypto\CipherKeyGenerator.cs" />
666667
<Compile Include="src\crypto\CryptoException.cs" />
667668
<Compile Include="src\crypto\DataLengthException.cs" />
668-
<Compile Include="src\crypto\digests\NonMemoableDigest.cs" />
669-
<Compile Include="src\crypto\engines\SerpentEngineBase.cs" />
670-
<Compile Include="src\crypto\engines\TnepresEngine.cs" />
671-
<Compile Include="src\crypto\generators\BCrypt.cs" />
672-
<Compile Include="src\crypto\generators\HKDFBytesGenerator.cs" />
673-
<Compile Include="src\crypto\generators\OpenBsdBCrypt.cs" />
674669
<Compile Include="src\crypto\IAsymmetricBlockCipher.cs" />
675670
<Compile Include="src\crypto\IAsymmetricCipherKeyPairGenerator.cs" />
676671
<Compile Include="src\crypto\IBasicAgreement.cs" />
@@ -757,6 +752,7 @@
757752
<Compile Include="src\crypto\digests\MD2Digest.cs" />
758753
<Compile Include="src\crypto\digests\MD4Digest.cs" />
759754
<Compile Include="src\crypto\digests\MD5Digest.cs" />
755+
<Compile Include="src\crypto\digests\NonMemoableDigest.cs" />
760756
<Compile Include="src\crypto\digests\NullDigest.cs" />
761757
<Compile Include="src\crypto\digests\RipeMD128Digest.cs" />
762758
<Compile Include="src\crypto\digests\RipeMD160Digest.cs" />
@@ -785,6 +781,7 @@
785781
<Compile Include="src\crypto\engines\AesFastEngine.cs" />
786782
<Compile Include="src\crypto\engines\AesLightEngine.cs" />
787783
<Compile Include="src\crypto\engines\AesWrapEngine.cs" />
784+
<Compile Include="src\crypto\engines\AriaEngine.cs" />
788785
<Compile Include="src\crypto\engines\BlowfishEngine.cs" />
789786
<Compile Include="src\crypto\engines\CamelliaEngine.cs" />
790787
<Compile Include="src\crypto\engines\CamelliaLightEngine.cs" />
@@ -825,17 +822,20 @@
825822
<Compile Include="src\crypto\engines\SEEDWrapEngine.cs" />
826823
<Compile Include="src\crypto\engines\Salsa20Engine.cs" />
827824
<Compile Include="src\crypto\engines\SerpentEngine.cs" />
825+
<Compile Include="src\crypto\engines\SerpentEngineBase.cs" />
828826
<Compile Include="src\crypto\engines\SkipjackEngine.cs" />
829827
<Compile Include="src\crypto\engines\SM2Engine.cs" />
830828
<Compile Include="src\crypto\engines\SM4Engine.cs" />
831829
<Compile Include="src\crypto\engines\TEAEngine.cs" />
832830
<Compile Include="src\crypto\engines\ThreefishEngine.cs" />
831+
<Compile Include="src\crypto\engines\TnepresEngine.cs" />
833832
<Compile Include="src\crypto\engines\TwofishEngine.cs" />
834833
<Compile Include="src\crypto\engines\VMPCEngine.cs" />
835834
<Compile Include="src\crypto\engines\VMPCKSA3Engine.cs" />
836835
<Compile Include="src\crypto\engines\XSalsa20Engine.cs" />
837836
<Compile Include="src\crypto\engines\XTEAEngine.cs" />
838837
<Compile Include="src\crypto\generators\BaseKdfBytesGenerator.cs" />
838+
<Compile Include="src\crypto\generators\BCrypt.cs" />
839839
<Compile Include="src\crypto\generators\DHBasicKeyPairGenerator.cs" />
840840
<Compile Include="src\crypto\generators\DHKeyGeneratorHelper.cs" />
841841
<Compile Include="src\crypto\generators\DHKeyPairGenerator.cs" />
@@ -852,13 +852,15 @@
852852
<Compile Include="src\crypto\generators\ElGamalParametersGenerator.cs" />
853853
<Compile Include="src\crypto\generators\GOST3410KeyPairGenerator.cs" />
854854
<Compile Include="src\crypto\generators\GOST3410ParametersGenerator.cs" />
855+
<Compile Include="src\crypto\generators\HKDFBytesGenerator.cs" />
855856
<Compile Include="src\crypto\generators\Kdf1BytesGenerator.cs" />
856857
<Compile Include="src\crypto\generators\Kdf2BytesGenerator.cs" />
857858
<Compile Include="src\crypto\generators\KDFCounterBytesGenerator.cs" />
858859
<Compile Include="src\crypto\generators\KDFDoublePipelineIterationBytesGenerator.cs" />
859860
<Compile Include="src\crypto\generators\KDFFeedbackBytesGenerator.cs" />
860861
<Compile Include="src\crypto\generators\Mgf1BytesGenerator.cs" />
861862
<Compile Include="src\crypto\generators\NaccacheSternKeyPairGenerator.cs" />
863+
<Compile Include="src\crypto\generators\OpenBsdBCrypt.cs" />
862864
<Compile Include="src\crypto\generators\OpenSSLPBEParametersGenerator.cs" />
863865
<Compile Include="src\crypto\generators\Pkcs12ParametersGenerator.cs" />
864866
<Compile Include="src\crypto\generators\Pkcs5S1ParametersGenerator.cs" />

‎crypto/crypto.csproj

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1503,6 +1503,11 @@
15031503
SubType = "Code"
15041504
BuildAction = "Compile"
15051505
/>
1506+
<File
1507+
RelPath = "src\asn1\nsri\NsriObjectIdentifiers.cs"
1508+
SubType = "Code"
1509+
BuildAction = "Compile"
1510+
/>
15061511
<File
15071512
RelPath = "src\asn1\ntt\NTTObjectIdentifiers.cs"
15081513
SubType = "Code"
@@ -3778,6 +3783,11 @@
37783783
SubType = "Code"
37793784
BuildAction = "Compile"
37803785
/>
3786+
<File
3787+
RelPath = "src\crypto\engines\AriaEngine.cs"
3788+
SubType = "Code"
3789+
BuildAction = "Compile"
3790+
/>
37813791
<File
37823792
RelPath = "src\crypto\engines\BlowfishEngine.cs"
37833793
SubType = "Code"
@@ -12176,6 +12186,11 @@
1217612186
SubType = "Code"
1217712187
BuildAction = "Compile"
1217812188
/>
12189+
<File
12190+
RelPath = "test\src\crypto\test\AriaTest.cs"
12191+
SubType = "Code"
12192+
BuildAction = "Compile"
12193+
/>
1217912194
<File
1218012195
RelPath = "test\src\crypto\test\Blake2bDigestTest.cs"
1218112196
SubType = "Code"
@@ -13780,4 +13795,3 @@
1378013795
</Files>
1378113796
</CSHARP>
1378213797
</VisualStudioProject>
13783-

0 commit comments

Comments
 (0)