diff options
26 files changed, 29 insertions, 53 deletions
diff --git a/crypto/src/pqc/crypto/sike/Fpx.cs b/crypto/src/pqc/crypto/sike/Fpx.cs index 35e0ae204..232d29406 100644 --- a/crypto/src/pqc/crypto/sike/Fpx.cs +++ b/crypto/src/pqc/crypto/sike/Fpx.cs @@ -2,7 +2,7 @@ using System; using Org.BouncyCastle.Crypto.Utilities; -namespace Org.Bouncycastle.Pqc.Crypto.Sike +namespace Org.BouncyCastle.Pqc.Crypto.Sike { public class Fpx { diff --git a/crypto/src/pqc/crypto/sike/Internal.cs b/crypto/src/pqc/crypto/sike/Internal.cs index 9bf288cd5..edd551a2b 100644 --- a/crypto/src/pqc/crypto/sike/Internal.cs +++ b/crypto/src/pqc/crypto/sike/Internal.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using Org.BouncyCastle.Crypto.Utilities; using Org.BouncyCastle.Utilities.Encoders; -namespace Org.Bouncycastle.Pqc.Crypto.Sike +namespace Org.BouncyCastle.Pqc.Crypto.Sike { public abstract class Internal diff --git a/crypto/src/pqc/crypto/sike/Isogeny.cs b/crypto/src/pqc/crypto/sike/Isogeny.cs index e927746d4..ace6e20b9 100644 --- a/crypto/src/pqc/crypto/sike/Isogeny.cs +++ b/crypto/src/pqc/crypto/sike/Isogeny.cs @@ -1,7 +1,5 @@ -namespace Org.Bouncycastle.Pqc.Crypto.Sike +namespace Org.BouncyCastle.Pqc.Crypto.Sike { - - public class Isogeny { SIKEEngine engine; diff --git a/crypto/src/pqc/crypto/sike/P434.cs b/crypto/src/pqc/crypto/sike/P434.cs index 5520063c9..2d4139927 100644 --- a/crypto/src/pqc/crypto/sike/P434.cs +++ b/crypto/src/pqc/crypto/sike/P434.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; using System.IO; -namespace Org.Bouncycastle.Pqc.Crypto.Sike +namespace Org.BouncyCastle.Pqc.Crypto.Sike { - public class P434 : Internal { diff --git a/crypto/src/pqc/crypto/sike/P503.cs b/crypto/src/pqc/crypto/sike/P503.cs index 2b432e005..31b735873 100644 --- a/crypto/src/pqc/crypto/sike/P503.cs +++ b/crypto/src/pqc/crypto/sike/P503.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.IO; -namespace Org.Bouncycastle.Pqc.Crypto.Sike +namespace Org.BouncyCastle.Pqc.Crypto.Sike { public class P503 diff --git a/crypto/src/pqc/crypto/sike/P610.cs b/crypto/src/pqc/crypto/sike/P610.cs index 2a901b1d0..33f9956c7 100644 --- a/crypto/src/pqc/crypto/sike/P610.cs +++ b/crypto/src/pqc/crypto/sike/P610.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; using System.IO; -namespace Org.Bouncycastle.Pqc.Crypto.Sike +namespace Org.BouncyCastle.Pqc.Crypto.Sike { - public class P610 : Internal { diff --git a/crypto/src/pqc/crypto/sike/P751.cs b/crypto/src/pqc/crypto/sike/P751.cs index a68012321..b8d48d3aa 100644 --- a/crypto/src/pqc/crypto/sike/P751.cs +++ b/crypto/src/pqc/crypto/sike/P751.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; using System.IO; -namespace Org.Bouncycastle.Pqc.Crypto.Sike +namespace Org.BouncyCastle.Pqc.Crypto.Sike { - public class P751 : Internal { diff --git a/crypto/src/pqc/crypto/sike/PointProj.cs b/crypto/src/pqc/crypto/sike/PointProj.cs index e4e039ad0..92b982d4f 100644 --- a/crypto/src/pqc/crypto/sike/PointProj.cs +++ b/crypto/src/pqc/crypto/sike/PointProj.cs @@ -1,7 +1,5 @@ -namespace Org.Bouncycastle.Pqc.Crypto.Sike +namespace Org.BouncyCastle.Pqc.Crypto.Sike { - - public class PointProj { internal PointProj(uint nwords_field) diff --git a/crypto/src/pqc/crypto/sike/PointProjFull.cs b/crypto/src/pqc/crypto/sike/PointProjFull.cs index b951dc3c0..f5d4598a8 100644 --- a/crypto/src/pqc/crypto/sike/PointProjFull.cs +++ b/crypto/src/pqc/crypto/sike/PointProjFull.cs @@ -1,7 +1,5 @@ -namespace Org.Bouncycastle.Pqc.Crypto.Sike +namespace Org.BouncyCastle.Pqc.Crypto.Sike { - - public class PointProjFull { internal PointProjFull(uint nwords_field) @@ -14,5 +12,4 @@ public class PointProjFull public ulong[][] Y; public ulong[][] Z; } - -} \ No newline at end of file +} diff --git a/crypto/src/pqc/crypto/sike/SIDH.cs b/crypto/src/pqc/crypto/sike/SIDH.cs index bafd0b393..d2e4b4929 100644 --- a/crypto/src/pqc/crypto/sike/SIDH.cs +++ b/crypto/src/pqc/crypto/sike/SIDH.cs @@ -1,11 +1,7 @@ -namespace Org.Bouncycastle.Pqc.Crypto.Sike +namespace Org.BouncyCastle.Pqc.Crypto.Sike { - - - public class SIDH { - private SIKEEngine engine; public SIDH(SIKEEngine engine) diff --git a/crypto/src/pqc/crypto/sike/SIDH_Compressed.cs b/crypto/src/pqc/crypto/sike/SIDH_Compressed.cs index c50b9a973..f701aea60 100644 --- a/crypto/src/pqc/crypto/sike/SIDH_Compressed.cs +++ b/crypto/src/pqc/crypto/sike/SIDH_Compressed.cs @@ -2,9 +2,8 @@ using System; using Org.BouncyCastle.Security; using Org.BouncyCastle.Utilities; -namespace Org.Bouncycastle.Pqc.Crypto.Sike +namespace Org.BouncyCastle.Pqc.Crypto.Sike { - public class SIDH_Compressed { private SIKEEngine engine; diff --git a/crypto/src/pqc/crypto/sike/SIKEEngine.cs b/crypto/src/pqc/crypto/sike/SIKEEngine.cs index ca9df67d8..e5cd4e4f6 100644 --- a/crypto/src/pqc/crypto/sike/SIKEEngine.cs +++ b/crypto/src/pqc/crypto/sike/SIKEEngine.cs @@ -2,7 +2,7 @@ using Org.BouncyCastle.Crypto; using Org.BouncyCastle.Crypto.Digests; using Org.BouncyCastle.Security; -namespace Org.Bouncycastle.Pqc.Crypto.Sike +namespace Org.BouncyCastle.Pqc.Crypto.Sike { public class SIKEEngine diff --git a/crypto/src/pqc/crypto/sike/SIKEKEMExtractor.cs b/crypto/src/pqc/crypto/sike/SIKEKEMExtractor.cs index 027b623b5..1d2bab871 100644 --- a/crypto/src/pqc/crypto/sike/SIKEKEMExtractor.cs +++ b/crypto/src/pqc/crypto/sike/SIKEKEMExtractor.cs @@ -1,6 +1,6 @@ using Org.BouncyCastle.Crypto; -namespace Org.Bouncycastle.Pqc.Crypto.Sike +namespace Org.BouncyCastle.Pqc.Crypto.Sike { public class SIKEKEMExtractor : IEncapsulatedSecretExtractor diff --git a/crypto/src/pqc/crypto/sike/SIKEKEMGenerator.cs b/crypto/src/pqc/crypto/sike/SIKEKEMGenerator.cs index 09dac015b..83c08ef56 100644 --- a/crypto/src/pqc/crypto/sike/SIKEKEMGenerator.cs +++ b/crypto/src/pqc/crypto/sike/SIKEKEMGenerator.cs @@ -2,10 +2,8 @@ using Org.BouncyCastle.Crypto; using Org.BouncyCastle.Pqc.Crypto.Utilities; using Org.BouncyCastle.Security; -namespace Org.Bouncycastle.Pqc.Crypto.Sike +namespace Org.BouncyCastle.Pqc.Crypto.Sike { - - public class SIKEKEMGenerator : IEncapsulatedSecretGenerator { diff --git a/crypto/src/pqc/crypto/sike/SIKEKeyGenerationParameters.cs b/crypto/src/pqc/crypto/sike/SIKEKeyGenerationParameters.cs index eb7668e8a..669a417b2 100644 --- a/crypto/src/pqc/crypto/sike/SIKEKeyGenerationParameters.cs +++ b/crypto/src/pqc/crypto/sike/SIKEKeyGenerationParameters.cs @@ -1,9 +1,8 @@ using Org.BouncyCastle.Crypto; using Org.BouncyCastle.Security; -namespace Org.Bouncycastle.Pqc.Crypto.Sike +namespace Org.BouncyCastle.Pqc.Crypto.Sike { - public class SIKEKeyGenerationParameters : KeyGenerationParameters { diff --git a/crypto/src/pqc/crypto/sike/SIKEKeyPairGenerator.cs b/crypto/src/pqc/crypto/sike/SIKEKeyPairGenerator.cs index ba3a181ad..3945fe8c8 100644 --- a/crypto/src/pqc/crypto/sike/SIKEKeyPairGenerator.cs +++ b/crypto/src/pqc/crypto/sike/SIKEKeyPairGenerator.cs @@ -1,10 +1,8 @@ using Org.BouncyCastle.Crypto; using Org.BouncyCastle.Security; -namespace Org.Bouncycastle.Pqc.Crypto.Sike +namespace Org.BouncyCastle.Pqc.Crypto.Sike { - - public class SIKEKeyPairGenerator : IAsymmetricCipherKeyPairGenerator { diff --git a/crypto/src/pqc/crypto/sike/SIKEKeyParameters.cs b/crypto/src/pqc/crypto/sike/SIKEKeyParameters.cs index 90ec6f304..29ef6114d 100644 --- a/crypto/src/pqc/crypto/sike/SIKEKeyParameters.cs +++ b/crypto/src/pqc/crypto/sike/SIKEKeyParameters.cs @@ -1,8 +1,7 @@ using Org.BouncyCastle.Crypto; -namespace Org.Bouncycastle.Pqc.Crypto.Sike +namespace Org.BouncyCastle.Pqc.Crypto.Sike { - public class SIKEKeyParameters : AsymmetricKeyParameter { diff --git a/crypto/src/pqc/crypto/sike/SIKEParameters.cs b/crypto/src/pqc/crypto/sike/SIKEParameters.cs index 738abb0c1..5c1b162f8 100644 --- a/crypto/src/pqc/crypto/sike/SIKEParameters.cs +++ b/crypto/src/pqc/crypto/sike/SIKEParameters.cs @@ -1,7 +1,5 @@ -namespace Org.Bouncycastle.Pqc.Crypto.Sike +namespace Org.BouncyCastle.Pqc.Crypto.Sike { - - public class SIKEParameters { diff --git a/crypto/src/pqc/crypto/sike/SIKEPrivateKeyParameters.cs b/crypto/src/pqc/crypto/sike/SIKEPrivateKeyParameters.cs index da80cdb3d..e3e791e71 100644 --- a/crypto/src/pqc/crypto/sike/SIKEPrivateKeyParameters.cs +++ b/crypto/src/pqc/crypto/sike/SIKEPrivateKeyParameters.cs @@ -1,8 +1,7 @@ using Org.BouncyCastle.Utilities; -namespace Org.Bouncycastle.Pqc.Crypto.Sike +namespace Org.BouncyCastle.Pqc.Crypto.Sike { - public class SIKEPrivateKeyParameters : SIKEKeyParameters { diff --git a/crypto/src/pqc/crypto/sike/SIKEPublicKeyParameters.cs b/crypto/src/pqc/crypto/sike/SIKEPublicKeyParameters.cs index 02c68e196..a777d7896 100644 --- a/crypto/src/pqc/crypto/sike/SIKEPublicKeyParameters.cs +++ b/crypto/src/pqc/crypto/sike/SIKEPublicKeyParameters.cs @@ -1,8 +1,7 @@ using Org.BouncyCastle.Utilities; -namespace Org.Bouncycastle.Pqc.Crypto.Sike +namespace Org.BouncyCastle.Pqc.Crypto.Sike { - public class SIKEPublicKeyParameters : SIKEKeyParameters { diff --git a/crypto/src/pqc/crypto/sike/Utils.cs b/crypto/src/pqc/crypto/sike/Utils.cs index 8462630f8..33f1f8696 100644 --- a/crypto/src/pqc/crypto/sike/Utils.cs +++ b/crypto/src/pqc/crypto/sike/Utils.cs @@ -1,4 +1,4 @@ -namespace Org.Bouncycastle.Pqc.Crypto.Sike +namespace Org.BouncyCastle.Pqc.Crypto.Sike { public class Utils { diff --git a/crypto/src/pqc/crypto/utils/PqcUtilities.cs b/crypto/src/pqc/crypto/utils/PqcUtilities.cs index b7afe1d89..a1fb04340 100644 --- a/crypto/src/pqc/crypto/utils/PqcUtilities.cs +++ b/crypto/src/pqc/crypto/utils/PqcUtilities.cs @@ -6,7 +6,7 @@ using Org.BouncyCastle.Asn1.BC; using Org.BouncyCastle.Pqc.Crypto.Cmce; using Org.BouncyCastle.Pqc.Crypto.Picnic; using Org.BouncyCastle.Pqc.Crypto.Saber; -using Org.Bouncycastle.Pqc.Crypto.Sike; +using Org.BouncyCastle.Pqc.Crypto.Sike; using Org.BouncyCastle.Pqc.Crypto.SphincsPlus; namespace Org.BouncyCastle.Pqc.Crypto.Utilities diff --git a/crypto/src/pqc/crypto/utils/PrivateKeyInfoFactory.cs b/crypto/src/pqc/crypto/utils/PrivateKeyInfoFactory.cs index 9d4a739b5..2069ba5c3 100644 --- a/crypto/src/pqc/crypto/utils/PrivateKeyInfoFactory.cs +++ b/crypto/src/pqc/crypto/utils/PrivateKeyInfoFactory.cs @@ -9,7 +9,7 @@ using Org.BouncyCastle.Pqc.Crypto.Cmce; using Org.BouncyCastle.Pqc.Crypto.Lms; using Org.BouncyCastle.Pqc.Crypto.Picnic; using Org.BouncyCastle.Pqc.Crypto.Saber; -using Org.Bouncycastle.Pqc.Crypto.Sike; +using Org.BouncyCastle.Pqc.Crypto.Sike; using Org.BouncyCastle.Pqc.Crypto.SphincsPlus; using Org.BouncyCastle.Utilities; diff --git a/crypto/src/pqc/crypto/utils/PublicKeyFactory.cs b/crypto/src/pqc/crypto/utils/PublicKeyFactory.cs index 7d2f1b8ef..3610711ff 100644 --- a/crypto/src/pqc/crypto/utils/PublicKeyFactory.cs +++ b/crypto/src/pqc/crypto/utils/PublicKeyFactory.cs @@ -12,7 +12,7 @@ using Org.BouncyCastle.Pqc.Asn1; using Org.BouncyCastle.Pqc.Crypto.Cmce; using Org.BouncyCastle.Pqc.Crypto.Picnic; using Org.BouncyCastle.Pqc.Crypto.Saber; -using Org.Bouncycastle.Pqc.Crypto.Sike; +using Org.BouncyCastle.Pqc.Crypto.Sike; using Org.BouncyCastle.Pqc.Crypto.SphincsPlus; using Org.BouncyCastle.Utilities; diff --git a/crypto/src/pqc/crypto/utils/SubjectPublicKeyInfoFactory.cs b/crypto/src/pqc/crypto/utils/SubjectPublicKeyInfoFactory.cs index 99b67d2f7..9242ee936 100644 --- a/crypto/src/pqc/crypto/utils/SubjectPublicKeyInfoFactory.cs +++ b/crypto/src/pqc/crypto/utils/SubjectPublicKeyInfoFactory.cs @@ -8,7 +8,7 @@ using Org.BouncyCastle.Pqc.Asn1; using Org.BouncyCastle.Pqc.Crypto.Cmce; using Org.BouncyCastle.Pqc.Crypto.Picnic; using Org.BouncyCastle.Pqc.Crypto.Saber; -using Org.Bouncycastle.Pqc.Crypto.Sike; +using Org.BouncyCastle.Pqc.Crypto.Sike; using Org.BouncyCastle.Pqc.Crypto.SphincsPlus; using Org.BouncyCastle.Utilities; diff --git a/crypto/test/src/pqc/crypto/test/SikeVectorTest.cs b/crypto/test/src/pqc/crypto/test/SikeVectorTest.cs index 29305149d..af8187a2d 100644 --- a/crypto/test/src/pqc/crypto/test/SikeVectorTest.cs +++ b/crypto/test/src/pqc/crypto/test/SikeVectorTest.cs @@ -1,10 +1,11 @@ using System; using System.Collections.Generic; using System.IO; + using NUnit.Framework; + using Org.BouncyCastle.Crypto; -using Org.Bouncycastle.Pqc.Crypto.Sike; -using Org.BouncyCastle.Pqc.Crypto.Utilities; +using Org.BouncyCastle.Pqc.Crypto.Sike; using Org.BouncyCastle.Utilities; using Org.BouncyCastle.Utilities.Encoders; using Org.BouncyCastle.Utilities.Test; |