summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--crypto/src/pqc/crypto/saber/Poly.cs62
-rw-r--r--crypto/src/pqc/crypto/saber/SABEREngine.cs119
-rw-r--r--crypto/src/pqc/crypto/saber/SABERKEMExtractor.cs13
-rw-r--r--crypto/src/pqc/crypto/saber/SABERKEMGenerator.cs16
-rw-r--r--crypto/src/pqc/crypto/saber/SABERKeyGenerationParameters.cs9
-rw-r--r--crypto/src/pqc/crypto/saber/SABERKeyPairGenerator.cs7
-rw-r--r--crypto/src/pqc/crypto/saber/SABERKeyParameters.cs16
-rw-r--r--crypto/src/pqc/crypto/saber/SABERParameters.cs19
-rw-r--r--crypto/src/pqc/crypto/saber/SABERPrivateKeyParameters.cs16
-rw-r--r--crypto/src/pqc/crypto/saber/SABERPublicKeyParameters.cs19
-rw-r--r--crypto/src/pqc/crypto/saber/SaberUtilities.cs (renamed from crypto/src/pqc/crypto/saber/Utils.cs)31
-rw-r--r--crypto/src/pqc/crypto/utils/PrivateKeyInfoFactory.cs23
-rw-r--r--crypto/src/pqc/crypto/utils/SubjectPublicKeyInfoFactory.cs24
-rw-r--r--crypto/test/src/pqc/crypto/test/SaberVectorTest.cs2
14 files changed, 165 insertions, 211 deletions
diff --git a/crypto/src/pqc/crypto/saber/Poly.cs b/crypto/src/pqc/crypto/saber/Poly.cs
index 021f1d0e3..eaae6c9a5 100644
--- a/crypto/src/pqc/crypto/saber/Poly.cs
+++ b/crypto/src/pqc/crypto/saber/Poly.cs
@@ -1,65 +1,59 @@
-
 using Org.BouncyCastle.Crypto;
 using Org.BouncyCastle.Crypto.Digests;
 
 namespace Org.BouncyCastle.Pqc.Crypto.Saber
 {
-
-    class Poly
+    internal class Poly
     {
-        private static int KARATSUBA_N = 64;
-
-        private static int SCHB_N = 16;
-
-        private int N_RES;
-        private int N_SB;
-        private int N_SB_RES;
-        private int SABER_N;
-        private int SABER_L;
+        private const int KARATSUBA_N = 64;
 
-        private SABEREngine engine;
-        private Utils utils;
+        //private readonly int N_RES;
+        private readonly int N_SB;
+        private readonly int N_SB_RES;
+        private readonly int SABER_N;
+        private readonly int SABER_L;
 
+        private readonly SaberEngine engine;
+        private readonly SaberUtilities utils;
 
-        public Poly(SABEREngine engine)
+        public Poly(SaberEngine engine)
         {
             this.engine = engine;
-            this.SABER_L = engine.getSABER_L();
-            this.SABER_N = engine.getSABER_N();
-            this.N_RES = (SABER_N << 1);
-            this.N_SB = (SABER_N >> 2);
-            this.N_SB_RES = (2 * N_SB - 1);
-            this.utils = engine.GetUtils();
+            this.SABER_L = engine.L;
+            this.SABER_N = engine.N;
+            //this.N_RES = SABER_N << 1;
+            this.N_SB = SABER_N >> 2;
+            this.N_SB_RES = 2 * N_SB - 1;
+            this.utils = engine.Utilities;
         }
 
         public void GenMatrix(short[][][] A, byte[] seed)
         {
-            byte[] buf = new byte[SABER_L * engine.getSABER_POLYVECBYTES()];
+            byte[] buf = new byte[SABER_L * engine.PolyVecBytes];
             int i;
 
             IXof digest = new ShakeDigest(128);
-            digest.BlockUpdate(seed, 0, engine.getSABER_SEEDBYTES());
+            digest.BlockUpdate(seed, 0, engine.SeedBytes);
             digest.OutputFinal(buf, 0, buf.Length);
 
             for (i = 0; i < SABER_L; i++)
             {
-                utils.BS2POLVECq(buf, i * engine.getSABER_POLYVECBYTES(), A[i]);
+                utils.BS2POLVECq(buf, i * engine.PolyVecBytes, A[i]);
             }
         }
 
         public void GenSecret(short[][] s, byte[] seed)
         {
-            byte[] buf = new byte[SABER_L * engine.getSABER_POLYCOINBYTES()];
-            int i;
+            byte[] buf = new byte[SABER_L * engine.PolyCoinBytes];
+
             IXof digest = new ShakeDigest(128);
-            digest.BlockUpdate(seed, 0, engine.getSABER_NOISE_SEEDBYTES());
+            digest.BlockUpdate(seed, 0, engine.NoiseSeedBytes);
             digest.OutputFinal(buf, 0, buf.Length);
 
-            for (i = 0; i < SABER_L; i++)
+            for (int i = 0; i < SABER_L; i++)
             {
-                Cbd(s[i], buf, i * engine.getSABER_POLYCOINBYTES());
+                Cbd(s[i], buf, i * engine.PolyCoinBytes);
             }
-
         }
 
         private long LoadLittleEndian(byte[] x, int offset, int bytes)
@@ -78,7 +72,7 @@ namespace Org.BouncyCastle.Pqc.Crypto.Saber
         {
             int[] a = new int[4], b = new int[4];
             int i, j;
-            if (engine.getSABER_MU() == 6)
+            if (engine.MU == 6)
             {
                 int t, d;
                 for (i = 0; i < SABER_N / 4; i++)
@@ -103,7 +97,7 @@ namespace Org.BouncyCastle.Pqc.Crypto.Saber
                     s[4 * i + 3] = (short) (a[3] - b[3]);
                 }
             }
-            else if (engine.getSABER_MU() == 8)
+            else if (engine.MU == 8)
             {
                 int t, d;
                 for (i = 0; i < SABER_N / 4; i++)
@@ -129,7 +123,7 @@ namespace Org.BouncyCastle.Pqc.Crypto.Saber
                     s[4 * i + 3] = (short) (a[3] - b[3]);
                 }
             }
-            else if (engine.getSABER_MU() == 10)
+            else if (engine.MU == 10)
             {
                 long t, d;
                 for (i = 0; i < SABER_N / 4; i++)
@@ -435,4 +429,4 @@ namespace Org.BouncyCastle.Pqc.Crypto.Saber
 
 
     }
-}
\ No newline at end of file
+}
diff --git a/crypto/src/pqc/crypto/saber/SABEREngine.cs b/crypto/src/pqc/crypto/saber/SABEREngine.cs
index a7c8d3ff9..c17efb123 100644
--- a/crypto/src/pqc/crypto/saber/SABEREngine.cs
+++ b/crypto/src/pqc/crypto/saber/SABEREngine.cs
@@ -1,5 +1,5 @@
-
 using System;
+
 using Org.BouncyCastle.Crypto;
 using Org.BouncyCastle.Crypto.Digests;
 using Org.BouncyCastle.Security;
@@ -7,103 +7,66 @@ using Org.BouncyCastle.Utilities;
 
 namespace Org.BouncyCastle.Pqc.Crypto.Saber
 {
-    internal class SABEREngine
+    internal sealed class SaberEngine
     {
         // constant parameters
-        public static int SABER_EQ = 13;
-        public static int SABER_EP = 10;
-        public static int SABER_N = 256;
-
-        private static int SABER_SEEDBYTES = 32;
-        private static int SABER_NOISE_SEEDBYTES = 32;
-        private static int SABER_KEYBYTES = 32;
-        private static int SABER_HASHBYTES = 32;
+        internal const int SABER_EQ = 13;
+        internal const int SABER_EP = 10;
+        internal const int SABER_N = 256;
 
+        private const int SABER_SEEDBYTES = 32;
+        private const int SABER_NOISE_SEEDBYTES = 32;
+        private const int SABER_KEYBYTES = 32;
+        private const int SABER_HASHBYTES = 32;
 
         // parameters for SABER{n}
-        private int SABER_L;
-        private int SABER_MU;
-        private int SABER_ET;
-
-        private int SABER_POLYCOINBYTES;
-        private int SABER_POLYBYTES;
-        private int SABER_POLYVECBYTES;
-        private int SABER_POLYCOMPRESSEDBYTES;
-        private int SABER_POLYVECCOMPRESSEDBYTES;
-        private int SABER_SCALEBYTES_KEM;
-        private int SABER_INDCPA_PUBLICKEYBYTES;
-        private int SABER_INDCPA_SECRETKEYBYTES;
-        private int SABER_PUBLICKEYBYTES;
-        private int SABER_SECRETKEYBYTES;
-        private int SABER_BYTES_CCA_DEC;
-        private int defaultKeySize;
+        private readonly int SABER_L;
+        private readonly int SABER_MU;
+        private readonly int SABER_ET;
+
+        private readonly int SABER_POLYCOINBYTES;
+        private readonly int SABER_POLYBYTES;
+        private readonly int SABER_POLYVECBYTES;
+        private readonly int SABER_POLYCOMPRESSEDBYTES;
+        private readonly int SABER_POLYVECCOMPRESSEDBYTES;
+        private readonly int SABER_SCALEBYTES_KEM;
+        private readonly int SABER_INDCPA_PUBLICKEYBYTES;
+        private readonly int SABER_INDCPA_SECRETKEYBYTES;
+        private readonly int SABER_PUBLICKEYBYTES;
+        private readonly int SABER_SECRETKEYBYTES;
+        private readonly int SABER_BYTES_CCA_DEC;
+        private readonly int defaultKeySize;
 
         //
         private int h1;
         private int h2;
 
-        private Utils utils;
+        private SaberUtilities utils;
         private Poly poly;
 
-        public int getSABER_N()
-        {
-            return SABER_N;
-        }
+        public int N => SABER_N;
 
-        public int getSABER_EP()
-        {
-            return SABER_EP;
-        }
+        public int EP => SABER_EP;
 
-        public int getSABER_KEYBYTES()
-        {
-            return SABER_KEYBYTES;
-        }
+        public int KeyBytes => SABER_KEYBYTES;
 
-        public int getSABER_L()
-        {
-            return SABER_L;
-        }
+        public int L => SABER_L;
 
-        public int getSABER_ET()
-        {
-            return SABER_ET;
-        }
+        public int ET => SABER_ET;
 
-        public int getSABER_POLYBYTES()
-        {
-            return SABER_POLYBYTES;
-        }
+        public int PolyBytes => SABER_POLYBYTES;
 
-        public int getSABER_POLYVECBYTES()
-        {
-            return SABER_POLYVECBYTES;
-        }
+        public int PolyVecBytes => SABER_POLYVECBYTES;
 
-        public int getSABER_SEEDBYTES()
-        {
-            return SABER_SEEDBYTES;
-        }
+        public int SeedBytes => SABER_SEEDBYTES;
 
-        public int getSABER_POLYCOINBYTES()
-        {
-            return SABER_POLYCOINBYTES;
-        }
+        public int PolyCoinBytes => SABER_POLYCOINBYTES;
 
-        public int getSABER_NOISE_SEEDBYTES()
-        {
-            return SABER_NOISE_SEEDBYTES;
-        }
+        public int NoiseSeedBytes => SABER_NOISE_SEEDBYTES;
 
-        public int getSABER_MU()
-        {
-            return SABER_MU;
-        }
+        public int MU => SABER_MU;
 
-        public Utils GetUtils()
-        {
-            return utils;
-        }
+        public SaberUtilities Utilities => utils;
 
         public int GetSessionKeySize()
         {
@@ -126,7 +89,7 @@ namespace Org.BouncyCastle.Pqc.Crypto.Saber
             return SABER_SECRETKEYBYTES;
         }
 
-        public SABEREngine(int l, int defaultKeySize)
+        internal SaberEngine(int l, int defaultKeySize)
         {
             this.defaultKeySize = defaultKeySize;
 
@@ -162,7 +125,7 @@ namespace Org.BouncyCastle.Pqc.Crypto.Saber
 
             this.h1 = (1 << (SABER_EQ - SABER_EP - 1));
             this.h2 = ((1 << (SABER_EP - 2)) - (1 << (SABER_EP - SABER_ET - 1)) + (1 << (SABER_EQ - SABER_EP - 1)));
-            utils = new Utils(this);
+            utils = new SaberUtilities(this);
             poly = new Poly(this);
         }
 
@@ -461,4 +424,4 @@ namespace Org.BouncyCastle.Pqc.Crypto.Saber
 
 
     }
-}
\ No newline at end of file
+}
diff --git a/crypto/src/pqc/crypto/saber/SABERKEMExtractor.cs b/crypto/src/pqc/crypto/saber/SABERKEMExtractor.cs
index 7199b9dab..ce0b374f3 100644
--- a/crypto/src/pqc/crypto/saber/SABERKEMExtractor.cs
+++ b/crypto/src/pqc/crypto/saber/SABERKEMExtractor.cs
@@ -1,24 +1,23 @@
-
 using Org.BouncyCastle.Crypto;
 
 namespace Org.BouncyCastle.Pqc.Crypto.Saber
 {
-    public class SaberKemExtractor
+    public sealed class SaberKemExtractor
         : IEncapsulatedSecretExtractor
     {
-        private SABEREngine engine;
+        private readonly SaberKeyParameters key;
 
-        private SaberKeyParameters key;
+        private SaberEngine engine;
 
         public SaberKemExtractor(SaberKeyParameters privParams)
         {
             this.key = privParams;
-            InitCipher(key.GetParameters());
+            InitCipher(key.Parameters);
         }
 
         private void InitCipher(SaberParameters param)
         {
-            engine = param.GetEngine();
+            engine = param.Engine;
         }
 
         public byte[] ExtractSecret(byte[] encapsulation)
@@ -30,4 +29,4 @@ namespace Org.BouncyCastle.Pqc.Crypto.Saber
 
         public int EncapsulationLength => engine.GetCipherTextSize();
     }
-}
\ No newline at end of file
+}
diff --git a/crypto/src/pqc/crypto/saber/SABERKEMGenerator.cs b/crypto/src/pqc/crypto/saber/SABERKEMGenerator.cs
index 0919b4dea..f948717b1 100644
--- a/crypto/src/pqc/crypto/saber/SABERKEMGenerator.cs
+++ b/crypto/src/pqc/crypto/saber/SABERKEMGenerator.cs
@@ -1,13 +1,10 @@
-
-using System;
 using Org.BouncyCastle.Crypto;
 using Org.BouncyCastle.Pqc.Crypto.Utilities;
 using Org.BouncyCastle.Security;
-using Org.BouncyCastle.Utilities;
 
 namespace Org.BouncyCastle.Pqc.Crypto.Saber
 {
-    public class SaberKemGenerator
+    public sealed class SaberKemGenerator
         : IEncapsulatedSecretGenerator
     {
         // the source of randomness
@@ -15,18 +12,17 @@ namespace Org.BouncyCastle.Pqc.Crypto.Saber
 
         public SaberKemGenerator(SecureRandom random)
         {
-            this.sr = random;
+            this.sr = CryptoServicesRegistrar.GetSecureRandom(random);
         }
 
         public ISecretWithEncapsulation GenerateEncapsulated(AsymmetricKeyParameter recipientKey)
         {
-            SaberPublicKeyParameters key = (SaberPublicKeyParameters) recipientKey;
-            SABEREngine engine = key.GetParameters().GetEngine();
+            SaberPublicKeyParameters key = (SaberPublicKeyParameters)recipientKey;
+            SaberEngine engine = key.Parameters.Engine;
             byte[] cipher_text = new byte[engine.GetCipherTextSize()];
             byte[] sessionKey = new byte[engine.GetSessionKeySize()];
-            engine.crypto_kem_enc(cipher_text, sessionKey, key.PublicKey, sr);
+            engine.crypto_kem_enc(cipher_text, sessionKey, key.GetPublicKey(), sr);
             return new SecretWithEncapsulationImpl(sessionKey, cipher_text);
         }
-        
     }
-}
\ No newline at end of file
+}
diff --git a/crypto/src/pqc/crypto/saber/SABERKeyGenerationParameters.cs b/crypto/src/pqc/crypto/saber/SABERKeyGenerationParameters.cs
index 038c191ef..c76ec6234 100644
--- a/crypto/src/pqc/crypto/saber/SABERKeyGenerationParameters.cs
+++ b/crypto/src/pqc/crypto/saber/SABERKeyGenerationParameters.cs
@@ -1,17 +1,14 @@
-
 using Org.BouncyCastle.Crypto;
 using Org.BouncyCastle.Security;
 
 namespace Org.BouncyCastle.Pqc.Crypto.Saber
 {
-    public class SaberKeyGenerationParameters
+    public sealed class SaberKeyGenerationParameters
         : KeyGenerationParameters
     {
         private SaberParameters parameters;
 
-        public SaberKeyGenerationParameters(
-            SecureRandom random,
-            SaberParameters saberParameters)
+        public SaberKeyGenerationParameters(SecureRandom random, SaberParameters saberParameters)
             : base(random, 256)
         {
             this.parameters = saberParameters;
@@ -19,4 +16,4 @@ namespace Org.BouncyCastle.Pqc.Crypto.Saber
 
         public SaberParameters Parameters => parameters;
     }
-}
\ No newline at end of file
+}
diff --git a/crypto/src/pqc/crypto/saber/SABERKeyPairGenerator.cs b/crypto/src/pqc/crypto/saber/SABERKeyPairGenerator.cs
index 73209b18b..1407f74a3 100644
--- a/crypto/src/pqc/crypto/saber/SABERKeyPairGenerator.cs
+++ b/crypto/src/pqc/crypto/saber/SABERKeyPairGenerator.cs
@@ -1,4 +1,3 @@
-
 using Org.BouncyCastle.Crypto;
 using Org.BouncyCastle.Security;
 
@@ -16,7 +15,7 @@ namespace Org.BouncyCastle.Pqc.Crypto.Saber
         private void Initialize(
             KeyGenerationParameters param)
         {
-            this.saberParams = (SaberKeyGenerationParameters) param;
+            this.saberParams = (SaberKeyGenerationParameters)param;
             this.random = param.Random;
 
             this.l = this.saberParams.Parameters.L;
@@ -24,7 +23,7 @@ namespace Org.BouncyCastle.Pqc.Crypto.Saber
 
         private AsymmetricCipherKeyPair GenKeyPair()
         {
-            SABEREngine engine = saberParams.Parameters.GetEngine();
+            SaberEngine engine = saberParams.Parameters.Engine;
             byte[] sk = new byte[engine.GetPrivateKeySize()];
             byte[] pk = new byte[engine.GetPublicKeySize()];
             engine.crypto_kem_keypair(pk, sk, random);
@@ -44,4 +43,4 @@ namespace Org.BouncyCastle.Pqc.Crypto.Saber
             return GenKeyPair();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/crypto/src/pqc/crypto/saber/SABERKeyParameters.cs b/crypto/src/pqc/crypto/saber/SABERKeyParameters.cs
index e5a9e767e..d83d2e3ea 100644
--- a/crypto/src/pqc/crypto/saber/SABERKeyParameters.cs
+++ b/crypto/src/pqc/crypto/saber/SABERKeyParameters.cs
@@ -1,24 +1,18 @@
-
 using Org.BouncyCastle.Crypto;
 
 namespace Org.BouncyCastle.Pqc.Crypto.Saber
 {
-    public class SaberKeyParameters
+    public abstract class SaberKeyParameters
         : AsymmetricKeyParameter
     {
-        private SaberParameters parameters;
+        private readonly SaberParameters parameters;
 
-        public SaberKeyParameters(
-            bool isPrivate,
-            SaberParameters parameters)
+        public SaberKeyParameters(bool isPrivate, SaberParameters parameters)
             : base(isPrivate)
         {
             this.parameters = parameters;
         }
 
-        public SaberParameters GetParameters()
-        {
-            return parameters;
-        }
+        public SaberParameters Parameters => parameters;
     }
-}
\ No newline at end of file
+}
diff --git a/crypto/src/pqc/crypto/saber/SABERParameters.cs b/crypto/src/pqc/crypto/saber/SABERParameters.cs
index 357430d50..8cc9b468c 100644
--- a/crypto/src/pqc/crypto/saber/SABERParameters.cs
+++ b/crypto/src/pqc/crypto/saber/SABERParameters.cs
@@ -1,5 +1,3 @@
-
-using System;
 using Org.BouncyCastle.Crypto;
 
 namespace Org.BouncyCastle.Pqc.Crypto.Saber
@@ -19,17 +17,17 @@ namespace Org.BouncyCastle.Pqc.Crypto.Saber
         public static SaberParameters saberkem256r3 = new SaberParameters("saberkem256r3", 3, 256);
         public static SaberParameters firesaberkem256r3 = new SaberParameters("firesaberkem256r3", 4, 256);
 
-        private string name;
-        private int l;
-        private int defaultKeySize;
-        private SABEREngine engine;
+        private readonly string name;
+        private readonly int l;
+        private readonly int defaultKeySize;
+        private readonly SaberEngine engine;
 
-        public SaberParameters(string name, int l, int defaultKeySize)
+        private SaberParameters(string name, int l, int defaultKeySize)
         {
             this.name = name;
             this.l = l;
             this.defaultKeySize = defaultKeySize;
-            this.engine = new SABEREngine(l, defaultKeySize);
+            this.engine = new SaberEngine(l, defaultKeySize);
         }
 
         public string Name => name;
@@ -38,9 +36,6 @@ namespace Org.BouncyCastle.Pqc.Crypto.Saber
 
         public int DefaultKeySize => defaultKeySize;
 
-        internal SABEREngine GetEngine()
-        {
-            return engine;
-        }
+        internal SaberEngine Engine => engine;
     }
 }
diff --git a/crypto/src/pqc/crypto/saber/SABERPrivateKeyParameters.cs b/crypto/src/pqc/crypto/saber/SABERPrivateKeyParameters.cs
index ec4add8b5..6b708af73 100644
--- a/crypto/src/pqc/crypto/saber/SABERPrivateKeyParameters.cs
+++ b/crypto/src/pqc/crypto/saber/SABERPrivateKeyParameters.cs
@@ -2,15 +2,10 @@ using Org.BouncyCastle.Utilities;
 
 namespace Org.BouncyCastle.Pqc.Crypto.Saber
 {
-    public class SaberPrivateKeyParameters
+    public sealed class SaberPrivateKeyParameters
         : SaberKeyParameters
     {
-        private byte[] privateKey;
-
-        public byte[] GetPrivateKey()
-        {
-            return Arrays.Clone(privateKey);
-        }
+        private readonly byte[] privateKey;
 
         public SaberPrivateKeyParameters(SaberParameters parameters, byte[] privateKey)
             : base(true, parameters)
@@ -22,5 +17,10 @@ namespace Org.BouncyCastle.Pqc.Crypto.Saber
         {
             return Arrays.Clone(privateKey);
         }
+
+        public byte[] GetPrivateKey()
+        {
+            return Arrays.Clone(privateKey);
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/crypto/src/pqc/crypto/saber/SABERPublicKeyParameters.cs b/crypto/src/pqc/crypto/saber/SABERPublicKeyParameters.cs
index dcac1ec3c..573ca2661 100644
--- a/crypto/src/pqc/crypto/saber/SABERPublicKeyParameters.cs
+++ b/crypto/src/pqc/crypto/saber/SABERPublicKeyParameters.cs
@@ -2,22 +2,25 @@ using Org.BouncyCastle.Utilities;
 
 namespace Org.BouncyCastle.Pqc.Crypto.Saber
 {
-    public class SaberPublicKeyParameters
+    public sealed class SaberPublicKeyParameters
         : SaberKeyParameters
     {
-        public byte[] publicKey;
+        public readonly byte[] publicKey;
 
-        public byte[] PublicKey => Arrays.Clone(publicKey);
+        public SaberPublicKeyParameters(SaberParameters parameters, byte[] publicKey)
+            : base(false, parameters)
+        {
+            this.publicKey = Arrays.Clone(publicKey);
+        }
 
         public byte[] GetEncoded()
         {
-            return PublicKey;
+            return Arrays.Clone(publicKey);
         }
 
-        public SaberPublicKeyParameters(SaberParameters parameters, byte[] publicKey)
-            : base(false, parameters)
+        public byte[] GetPublicKey()
         {
-            this.publicKey = Arrays.Clone(publicKey);
+            return Arrays.Clone(publicKey);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/crypto/src/pqc/crypto/saber/Utils.cs b/crypto/src/pqc/crypto/saber/SaberUtilities.cs
index ff74ef1cb..d25eb8d2d 100644
--- a/crypto/src/pqc/crypto/saber/Utils.cs
+++ b/crypto/src/pqc/crypto/saber/SaberUtilities.cs
@@ -1,23 +1,22 @@
 namespace Org.BouncyCastle.Pqc.Crypto.Saber
 {
-    internal class Utils
+    internal class SaberUtilities
     {
+        private readonly int SABER_N;
+        private readonly int SABER_L;
+        private readonly int SABER_ET;
+        private readonly int SABER_POLYBYTES;
+        private readonly int SABER_EP;
+        private readonly int SABER_KEYBYTES;
 
-        private int SABER_N;
-        private int SABER_L;
-        private int SABER_ET;
-        private int SABER_POLYBYTES;
-        private int SABER_EP;
-        private int SABER_KEYBYTES;
-
-        internal Utils(SABEREngine engine)
+        internal SaberUtilities(SaberEngine engine)
         {
-            this.SABER_N = engine.getSABER_N();
-            this.SABER_L = engine.getSABER_L();
-            this.SABER_ET = engine.getSABER_ET();
-            this.SABER_POLYBYTES = engine.getSABER_POLYBYTES();
-            this.SABER_EP = engine.getSABER_EP();
-            this.SABER_KEYBYTES = engine.getSABER_KEYBYTES();
+            this.SABER_N = engine.N;
+            this.SABER_L = engine.L;
+            this.SABER_ET = engine.ET;
+            this.SABER_POLYBYTES = engine.PolyBytes;
+            this.SABER_EP = engine.EP;
+            this.SABER_KEYBYTES = engine.KeyBytes;
         }
 
         public void POLT2BS(byte[] bytes, int byteIndex, short[] data)
@@ -271,4 +270,4 @@ namespace Org.BouncyCastle.Pqc.Crypto.Saber
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/crypto/src/pqc/crypto/utils/PrivateKeyInfoFactory.cs b/crypto/src/pqc/crypto/utils/PrivateKeyInfoFactory.cs
index be2807b19..5e09beccc 100644
--- a/crypto/src/pqc/crypto/utils/PrivateKeyInfoFactory.cs
+++ b/crypto/src/pqc/crypto/utils/PrivateKeyInfoFactory.cs
@@ -85,7 +85,8 @@ namespace Org.BouncyCastle.Pqc.Crypto.Utilities
 
                 byte[] encoding = parameters.GetEncoded();
 
-                AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(PqcUtilities.SaberOidLookup(parameters.GetParameters()));
+                AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(
+                    PqcUtilities.SaberOidLookup(parameters.Parameters));
 
                 return new PrivateKeyInfo(algorithmIdentifier, new DerOctetString(encoding), attributes);
             }
@@ -95,7 +96,8 @@ namespace Org.BouncyCastle.Pqc.Crypto.Utilities
 
                 byte[] encoding = parameters.GetEncoded();
 
-                AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(PqcUtilities.PicnicOidLookup(parameters.Parameters));
+                AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(
+                    PqcUtilities.PicnicOidLookup(parameters.Parameters));
                 return new PrivateKeyInfo(algorithmIdentifier, new DerOctetString(encoding), attributes);
             }
             if (privateKey is SIKEPrivateKeyParameters)
@@ -104,7 +106,8 @@ namespace Org.BouncyCastle.Pqc.Crypto.Utilities
 
                 byte[] encoding = parameters.GetEncoded();
 
-                AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(PqcUtilities.SikeOidLookup(parameters.GetParameters()));
+                AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(
+                    PqcUtilities.SikeOidLookup(parameters.GetParameters()));
                 return new PrivateKeyInfo(algorithmIdentifier, new DerOctetString(encoding), attributes);
             }
             if (privateKey is FalconPrivateKeyParameters)
@@ -118,7 +121,8 @@ namespace Org.BouncyCastle.Pqc.Crypto.Utilities
                 v.Add(new DerOctetString(parameters.GetG()));
                 v.Add(new DerOctetString(parameters.GetSpolyF()));
 
-                AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(PqcUtilities.FalconOidLookup(parameters.Parameters));
+                AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(
+                    PqcUtilities.FalconOidLookup(parameters.Parameters));
 
                 return new PrivateKeyInfo(algorithmIdentifier, new DerSequence(v), attributes, parameters.GetPublicKey());
             }
@@ -133,7 +137,8 @@ namespace Org.BouncyCastle.Pqc.Crypto.Utilities
                 v.Add(new DerOctetString(parameters.Hpk));
                 v.Add(new DerOctetString(parameters.Nonce));
 
-                AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(PqcUtilities.KyberOidLookup(parameters.Parameters));
+                AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(
+                    PqcUtilities.KyberOidLookup(parameters.Parameters));
 
                 Asn1EncodableVector vPub = new Asn1EncodableVector();
                 vPub.Add(new DerOctetString(parameters.T));
@@ -155,13 +160,15 @@ namespace Org.BouncyCastle.Pqc.Crypto.Utilities
                 v.Add(new DerBitString(parameters.S2));
                 v.Add(new DerBitString(parameters.T0));
 
-                AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(PqcUtilities.DilithiumOidLookup(parameters.Parameters));
+                AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(
+                    PqcUtilities.DilithiumOidLookup(parameters.Parameters));
 
                 Asn1EncodableVector vPub = new Asn1EncodableVector();
                 vPub.Add(new DerOctetString(parameters.Rho));
                 vPub.Add(new DerOctetString(parameters.T1));
 
-                return new PrivateKeyInfo(algorithmIdentifier, new DerSequence(v), attributes, new DerSequence(vPub).GetEncoded());
+                return new PrivateKeyInfo(algorithmIdentifier, new DerSequence(v), attributes,
+                    new DerSequence(vPub).GetEncoded());
             }
             if (privateKey is BikePrivateKeyParameters bikePrivateKeyParameters)
             {
@@ -182,4 +189,4 @@ namespace Org.BouncyCastle.Pqc.Crypto.Utilities
             throw new ArgumentException("Class provided is not convertible: " + Platform.GetTypeName(privateKey));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/crypto/src/pqc/crypto/utils/SubjectPublicKeyInfoFactory.cs b/crypto/src/pqc/crypto/utils/SubjectPublicKeyInfoFactory.cs
index e44a91a26..4c527d283 100644
--- a/crypto/src/pqc/crypto/utils/SubjectPublicKeyInfoFactory.cs
+++ b/crypto/src/pqc/crypto/utils/SubjectPublicKeyInfoFactory.cs
@@ -71,7 +71,8 @@ namespace Org.BouncyCastle.Pqc.Crypto.Utilities
 
                 byte[] encoding = key.GetEncoded();
 
-                AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(PqcUtilities.McElieceOidLookup(key.Parameters));
+                AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(
+                    PqcUtilities.McElieceOidLookup(key.Parameters));
 
                 // https://datatracker.ietf.org/doc/draft-uni-qsckeys/
                 return new SubjectPublicKeyInfo(algorithmIdentifier, new CmcePublicKey(encoding));
@@ -82,7 +83,8 @@ namespace Org.BouncyCastle.Pqc.Crypto.Utilities
 
                 byte[] encoding = parameters.GetEncoded();
 
-                AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(PqcUtilities.SaberOidLookup(parameters.GetParameters()));
+                AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(
+                    PqcUtilities.SaberOidLookup(parameters.Parameters));
 
                 // https://datatracker.ietf.org/doc/draft-uni-qsckeys/
                 return new SubjectPublicKeyInfo(algorithmIdentifier, new DerSequence(new DerOctetString(encoding)));
@@ -93,7 +95,8 @@ namespace Org.BouncyCastle.Pqc.Crypto.Utilities
 
                 byte[] encoding = parameters.GetEncoded();
 
-                AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(PqcUtilities.PicnicOidLookup(parameters.Parameters));
+                AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(
+                    PqcUtilities.PicnicOidLookup(parameters.Parameters));
                 return new SubjectPublicKeyInfo(algorithmIdentifier, new DerOctetString(encoding));
             }
             if (publicKey is SIKEPublicKeyParameters)
@@ -102,7 +105,8 @@ namespace Org.BouncyCastle.Pqc.Crypto.Utilities
 
                 byte[] encoding = parameters.GetEncoded();
 
-                AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(PqcUtilities.SikeOidLookup(parameters.GetParameters()));
+                AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(
+                    PqcUtilities.SikeOidLookup(parameters.GetParameters()));
                 return new SubjectPublicKeyInfo(algorithmIdentifier, new DerOctetString(encoding));
             }
             if (publicKey is FalconPublicKeyParameters)
@@ -110,7 +114,8 @@ namespace Org.BouncyCastle.Pqc.Crypto.Utilities
                 FalconPublicKeyParameters parameters = (FalconPublicKeyParameters)publicKey;
 
                 byte[] encoding = parameters.GetEncoded();
-                AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(PqcUtilities.FalconOidLookup(parameters.Parameters));
+                AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(
+                    PqcUtilities.FalconOidLookup(parameters.Parameters));
 
                 return new SubjectPublicKeyInfo(algorithmIdentifier, new DerSequence(new DerOctetString(encoding)));
             }
@@ -118,7 +123,8 @@ namespace Org.BouncyCastle.Pqc.Crypto.Utilities
             {
                 KyberPublicKeyParameters parameters = (KyberPublicKeyParameters)publicKey;
 
-                AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(PqcUtilities.KyberOidLookup(parameters.Parameters));
+                AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(
+                    PqcUtilities.KyberOidLookup(parameters.Parameters));
                 Asn1EncodableVector v = new Asn1EncodableVector();
                 v.Add(new DerOctetString(parameters.T));
                 v.Add(new DerOctetString(parameters.Rho));
@@ -128,9 +134,11 @@ namespace Org.BouncyCastle.Pqc.Crypto.Utilities
             {
                 DilithiumPublicKeyParameters parameters = (DilithiumPublicKeyParameters)publicKey;
 
-                AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(PqcUtilities.DilithiumOidLookup(parameters.Parameters));
+                AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(
+                    PqcUtilities.DilithiumOidLookup(parameters.Parameters));
             
-                return new SubjectPublicKeyInfo(algorithmIdentifier, new DerOctetString(Arrays.Concatenate(parameters.Rho, parameters.T1)));
+                return new SubjectPublicKeyInfo(algorithmIdentifier,
+                    new DerOctetString(Arrays.Concatenate(parameters.Rho, parameters.T1)));
             }
             if (publicKey is BikePublicKeyParameters bikePublicKeyParameters)
             { 
diff --git a/crypto/test/src/pqc/crypto/test/SaberVectorTest.cs b/crypto/test/src/pqc/crypto/test/SaberVectorTest.cs
index 5da8828cc..45a14d965 100644
--- a/crypto/test/src/pqc/crypto/test/SaberVectorTest.cs
+++ b/crypto/test/src/pqc/crypto/test/SaberVectorTest.cs
@@ -88,7 +88,7 @@ namespace Org.BouncyCastle.Pqc.Crypto.Tests
             SaberPrivateKeyParameters privParams = (SaberPrivateKeyParameters)PrivateKeyFactory.CreateKey(
                     PrivateKeyInfoFactory.CreatePrivateKeyInfo((SaberPrivateKeyParameters)kp.Private));
 
-            Assert.True(Arrays.AreEqual(pk, pubParams.PublicKey), name + " " + count + ": public key");
+            Assert.True(Arrays.AreEqual(pk, pubParams.GetPublicKey()), name + " " + count + ": public key");
             Assert.True(Arrays.AreEqual(sk, privParams.GetPrivateKey()), name + " " + count + ": secret key");
 
             // KEM Enc
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-09-19 17:05:18 +0000