summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Dettman <peter.dettman@bouncycastle.org>2020-10-30 20:51:15 +0700
committerPeter Dettman <peter.dettman@bouncycastle.org>2020-10-30 20:51:15 +0700
commit771dc69f56fdf4a00b083a1c1ebc169bf7f6c765 (patch)
tree581d0d19b1e0bdb9f1cc2f6559cda7379e0762a0
parentAdded KMAC Params and test (diff)
downloadBouncyCastle.NET-ed25519-771dc69f56fdf4a00b083a1c1ebc169bf7f6c765.tar.xz
Add new files to projects
-rw-r--r--crypto/BouncyCastle.Android.csproj5
-rw-r--r--crypto/BouncyCastle.csproj5
-rw-r--r--crypto/BouncyCastle.iOS.csproj5
-rw-r--r--crypto/crypto.csproj48
-rw-r--r--crypto/test/UnitTests.csproj3
5 files changed, 62 insertions, 4 deletions
diff --git a/crypto/BouncyCastle.Android.csproj b/crypto/BouncyCastle.Android.csproj
index 7b40965f7..11ff7d951 100644
--- a/crypto/BouncyCastle.Android.csproj
+++ b/crypto/BouncyCastle.Android.csproj
@@ -325,6 +325,8 @@
     <Compile Include="src\asn1\misc\NetscapeRevocationURL.cs" />
     <Compile Include="src\asn1\misc\VerisignCzagExtension.cs" />
     <Compile Include="src\asn1\mozilla\PublicKeyAndChallenge.cs" />
+    <Compile Include="src\asn1\nist\KMACwithSHAKE128_params.cs" />
+    <Compile Include="src\asn1\nist\KMACwithSHAKE256_params.cs" />
     <Compile Include="src\asn1\nist\NISTNamedCurves.cs" />
     <Compile Include="src\asn1\nist\NISTObjectIdentifiers.cs" />
     <Compile Include="src\asn1\ntt\NTTObjectIdentifiers.cs" />
@@ -748,6 +750,7 @@
     <Compile Include="src\crypto\agreement\srp\SRP6VerifierGenerator.cs" />
     <Compile Include="src\crypto\digests\Blake2bDigest.cs" />
     <Compile Include="src\crypto\digests\Blake2sDigest.cs" />
+    <Compile Include="src\crypto\digests\CSHAKEDigest.cs" />
     <Compile Include="src\crypto\digests\DSTU7564Digest.cs" />
     <Compile Include="src\crypto\digests\GeneralDigest.cs" />
     <Compile Include="src\crypto\digests\GOST3411Digest.cs" />
@@ -778,6 +781,7 @@
     <Compile Include="src\crypto\digests\SkeinEngine.cs" />
     <Compile Include="src\crypto\digests\TigerDigest.cs" />
     <Compile Include="src\crypto\digests\WhirlpoolDigest.cs" />
+    <Compile Include="src\crypto\digests\XofUtils.cs" />
     <Compile Include="src\crypto\ec\CustomNamedCurves.cs" />
     <Compile Include="src\crypto\encodings\ISO9796d1Encoding.cs" />
     <Compile Include="src\crypto\encodings\OaepEncoding.cs" />
@@ -886,6 +890,7 @@
     <Compile Include="src\crypto\macs\GOST28147Mac.cs" />
     <Compile Include="src\crypto\macs\HMac.cs" />
     <Compile Include="src\crypto\macs\ISO9797Alg3Mac.cs" />
+    <Compile Include="src\crypto\macs\KMac.cs" />
     <Compile Include="src\crypto\macs\Poly1305.cs" />
     <Compile Include="src\crypto\macs\SipHash.cs" />
     <Compile Include="src\crypto\macs\SkeinMac.cs" />
diff --git a/crypto/BouncyCastle.csproj b/crypto/BouncyCastle.csproj
index 099c57d87..30077e1ef 100644
--- a/crypto/BouncyCastle.csproj
+++ b/crypto/BouncyCastle.csproj
@@ -319,6 +319,8 @@
     <Compile Include="src\asn1\misc\NetscapeRevocationURL.cs" />
     <Compile Include="src\asn1\misc\VerisignCzagExtension.cs" />
     <Compile Include="src\asn1\mozilla\PublicKeyAndChallenge.cs" />
+    <Compile Include="src\asn1\nist\KMACwithSHAKE128_params.cs" />
+    <Compile Include="src\asn1\nist\KMACwithSHAKE256_params.cs" />
     <Compile Include="src\asn1\nist\NISTNamedCurves.cs" />
     <Compile Include="src\asn1\nist\NISTObjectIdentifiers.cs" />
     <Compile Include="src\asn1\ntt\NTTObjectIdentifiers.cs" />
@@ -742,6 +744,7 @@
     <Compile Include="src\crypto\agreement\srp\SRP6VerifierGenerator.cs" />
     <Compile Include="src\crypto\digests\Blake2bDigest.cs" />
     <Compile Include="src\crypto\digests\Blake2sDigest.cs" />
+    <Compile Include="src\crypto\digests\CSHAKEDigest.cs" />
     <Compile Include="src\crypto\digests\DSTU7564Digest.cs" />
     <Compile Include="src\crypto\digests\GeneralDigest.cs" />
     <Compile Include="src\crypto\digests\GOST3411Digest.cs" />
@@ -772,6 +775,7 @@
     <Compile Include="src\crypto\digests\SkeinEngine.cs" />
     <Compile Include="src\crypto\digests\TigerDigest.cs" />
     <Compile Include="src\crypto\digests\WhirlpoolDigest.cs" />
+    <Compile Include="src\crypto\digests\XofUtils.cs" />
     <Compile Include="src\crypto\ec\CustomNamedCurves.cs" />
     <Compile Include="src\crypto\encodings\ISO9796d1Encoding.cs" />
     <Compile Include="src\crypto\encodings\OaepEncoding.cs" />
@@ -880,6 +884,7 @@
     <Compile Include="src\crypto\macs\GOST28147Mac.cs" />
     <Compile Include="src\crypto\macs\HMac.cs" />
     <Compile Include="src\crypto\macs\ISO9797Alg3Mac.cs" />
+    <Compile Include="src\crypto\macs\KMac.cs" />
     <Compile Include="src\crypto\macs\Poly1305.cs" />
     <Compile Include="src\crypto\macs\SipHash.cs" />
     <Compile Include="src\crypto\macs\SkeinMac.cs" />
diff --git a/crypto/BouncyCastle.iOS.csproj b/crypto/BouncyCastle.iOS.csproj
index 95d9a0a14..451411bb2 100644
--- a/crypto/BouncyCastle.iOS.csproj
+++ b/crypto/BouncyCastle.iOS.csproj
@@ -320,6 +320,8 @@
     <Compile Include="src\asn1\misc\NetscapeRevocationURL.cs" />
     <Compile Include="src\asn1\misc\VerisignCzagExtension.cs" />
     <Compile Include="src\asn1\mozilla\PublicKeyAndChallenge.cs" />
+    <Compile Include="src\asn1\nist\KMACwithSHAKE128_params.cs" />
+    <Compile Include="src\asn1\nist\KMACwithSHAKE256_params.cs" />
     <Compile Include="src\asn1\nist\NISTNamedCurves.cs" />
     <Compile Include="src\asn1\nist\NISTObjectIdentifiers.cs" />
     <Compile Include="src\asn1\ntt\NTTObjectIdentifiers.cs" />
@@ -743,6 +745,7 @@
     <Compile Include="src\crypto\agreement\srp\SRP6VerifierGenerator.cs" />
     <Compile Include="src\crypto\digests\Blake2bDigest.cs" />
     <Compile Include="src\crypto\digests\Blake2sDigest.cs" />
+    <Compile Include="src\crypto\digests\CSHAKEDigest.cs" />
     <Compile Include="src\crypto\digests\DSTU7564Digest.cs" />
     <Compile Include="src\crypto\digests\GeneralDigest.cs" />
     <Compile Include="src\crypto\digests\GOST3411Digest.cs" />
@@ -773,6 +776,7 @@
     <Compile Include="src\crypto\digests\SkeinEngine.cs" />
     <Compile Include="src\crypto\digests\TigerDigest.cs" />
     <Compile Include="src\crypto\digests\WhirlpoolDigest.cs" />
+    <Compile Include="src\crypto\digests\XofUtils.cs" />
     <Compile Include="src\crypto\ec\CustomNamedCurves.cs" />
     <Compile Include="src\crypto\encodings\ISO9796d1Encoding.cs" />
     <Compile Include="src\crypto\encodings\OaepEncoding.cs" />
@@ -881,6 +885,7 @@
     <Compile Include="src\crypto\macs\GOST28147Mac.cs" />
     <Compile Include="src\crypto\macs\HMac.cs" />
     <Compile Include="src\crypto\macs\ISO9797Alg3Mac.cs" />
+    <Compile Include="src\crypto\macs\KMac.cs" />
     <Compile Include="src\crypto\macs\Poly1305.cs" />
     <Compile Include="src\crypto\macs\SipHash.cs" />
     <Compile Include="src\crypto\macs\SkeinMac.cs" />
diff --git a/crypto/crypto.csproj b/crypto/crypto.csproj
index 0ae1681fc..dd49214f8 100644
--- a/crypto/crypto.csproj
+++ b/crypto/crypto.csproj
@@ -1484,6 +1484,16 @@
                     BuildAction = "Compile"
                 />
                 <File
+                    RelPath = "src\asn1\nist\KMACwithSHAKE128_params.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "src\asn1\nist\KMACwithSHAKE256_params.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
                     RelPath = "src\asn1\nist\NISTNamedCurves.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
@@ -3564,6 +3574,11 @@
                     BuildAction = "Compile"
                 />
                 <File
+                    RelPath = "src\crypto\digests\CSHAKEDigest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
                     RelPath = "src\crypto\digests\DSTU7564Digest.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
@@ -3719,6 +3734,11 @@
                     BuildAction = "Compile"
                 />
                 <File
+                    RelPath = "src\crypto\digests\XofUtils.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
                     RelPath = "src\crypto\ec\CustomNamedCurves.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
@@ -4279,22 +4299,27 @@
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "src\crypto\macs\Poly1305.cs"
+                    RelPath = "src\crypto\macs\ISO9797Alg3Mac.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "src\crypto\macs\SipHash.cs"
+                    RelPath = "src\crypto\macs\KMac.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "src\crypto\macs\SkeinMac.cs"
+                    RelPath = "src\crypto\macs\Poly1305.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "src\crypto\macs\ISO9797Alg3Mac.cs"
+                    RelPath = "src\crypto\macs\SipHash.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "src\crypto\macs\SkeinMac.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
@@ -11763,6 +11788,11 @@
                     BuildAction = "Compile"
                 />
                 <File
+                    RelPath = "test\src\asn1\test\KMacParamsTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
                     RelPath = "test\src\asn1\test\LDSSecurityObjectUnitTest.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
@@ -12218,6 +12248,11 @@
                     BuildAction = "Compile"
                 />
                 <File
+                    RelPath = "test\src\crypto\test\CSHAKETest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
                     RelPath = "test\src\crypto\test\CTSTest.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
@@ -12343,6 +12378,11 @@
                     BuildAction = "Compile"
                 />
                 <File
+                    RelPath = "test\src\crypto\test\KMACTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
                     RelPath = "test\src\crypto\test\OCBTest.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
diff --git a/crypto/test/UnitTests.csproj b/crypto/test/UnitTests.csproj
index 8023884bb..c36ef087a 100644
--- a/crypto/test/UnitTests.csproj
+++ b/crypto/test/UnitTests.csproj
@@ -84,6 +84,7 @@
     <Compile Include="src\asn1\test\Iso4217CurrencyCodeUnitTest.cs" />
     <Compile Include="src\asn1\test\IssuingDistributionPointTest.cs" />
     <Compile Include="src\asn1\test\KeyUsageTest.cs" />
+    <Compile Include="src\asn1\test\KMacParamsTest.cs" />
     <Compile Include="src\asn1\test\LDSSecurityObjectUnitTest.cs" />
     <Compile Include="src\asn1\test\LinkedCertificateTest.cs" />
     <Compile Include="src\asn1\test\MiscTest.cs" />
@@ -171,6 +172,7 @@
     <Compile Include="src\crypto\test\ChaCha20Poly1305Test.cs" />
     <Compile Include="src\crypto\test\ChaChaTest.cs" />
     <Compile Include="src\crypto\test\CMacTest.cs" />
+    <Compile Include="src\crypto\test\CSHAKETest.cs" />
     <Compile Include="src\crypto\test\CTSTest.cs" />
     <Compile Include="src\crypto\test\CamelliaLightTest.cs" />
     <Compile Include="src\crypto\test\CamelliaTest.cs" />
@@ -216,6 +218,7 @@
     <Compile Include="src\crypto\test\KDF1GeneratorTest.cs" />
     <Compile Include="src\crypto\test\KDF2GeneratorTest.cs" />
     <Compile Include="src\crypto\test\KeccakDigestTest.cs" />
+    <Compile Include="src\crypto\test\KMACTest.cs" />
     <Compile Include="src\crypto\test\MD2DigestTest.cs" />
     <Compile Include="src\crypto\test\MD4DigestTest.cs" />
     <Compile Include="src\crypto\test\MD5DigestTest.cs" />