minor refactoring on names.

dghgit · dghgit · commit 2d58b9b5106a · 2024-10-25T12:17:23.000+11:00
fixed casing error in ML-DSA comaparison.
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/SLHDSA.java b/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/SLHDSA.java
@@ -134,14 +134,14 @@ public void configure(ConfigurableProvider provider)
                 {
                     NISTObjectIdentifiers.id_slh_dsa_sha2_128s,
                     NISTObjectIdentifiers.id_slh_dsa_sha2_128f,
-                    NISTObjectIdentifiers.id_slh_dsa_shake_128s,
-                    NISTObjectIdentifiers.id_slh_dsa_shake_128f,
                     NISTObjectIdentifiers.id_slh_dsa_sha2_192s,
                     NISTObjectIdentifiers.id_slh_dsa_sha2_192f,
-                    NISTObjectIdentifiers.id_slh_dsa_shake_192s,
-                    NISTObjectIdentifiers.id_slh_dsa_shake_192f,
                     NISTObjectIdentifiers.id_slh_dsa_sha2_256s,
                     NISTObjectIdentifiers.id_slh_dsa_sha2_256f,
+                    NISTObjectIdentifiers.id_slh_dsa_shake_128s,
+                    NISTObjectIdentifiers.id_slh_dsa_shake_128f,
+                    NISTObjectIdentifiers.id_slh_dsa_shake_192s,
+                    NISTObjectIdentifiers.id_slh_dsa_shake_192f,
                     NISTObjectIdentifiers.id_slh_dsa_shake_256s,
                     NISTObjectIdentifiers.id_slh_dsa_shake_256f
                 };
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/mldsa/BCMLDSAPrivateKey.java b/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/mldsa/BCMLDSAPrivateKey.java
@@ -31,7 +31,7 @@ public BCMLDSAPrivateKey(
             MLDSAPrivateKeyParameters params)
     {
         this.params = params;
-        this.algorithm = MLDSAParameterSpec.fromName(params.getParameters().getName()).getName().toUpperCase();
+        this.algorithm = Strings.toUpperCase(MLDSAParameterSpec.fromName(params.getParameters().getName()).getName());
     }
 
     public BCMLDSAPrivateKey(PrivateKeyInfo keyInfo)
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/mldsa/BCMLDSAPublicKey.java b/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/mldsa/BCMLDSAPublicKey.java
@@ -22,11 +22,13 @@ public class BCMLDSAPublicKey
     private static final long serialVersionUID = 1L;
 
     private transient MLDSAPublicKeyParameters params;
+    private transient String algorithm;
 
     public BCMLDSAPublicKey(
         MLDSAPublicKeyParameters params)
     {
         this.params = params;
+        this.algorithm = Strings.toUpperCase(MLDSAParameterSpec.fromName(params.getParameters().getName()).getName());
     }
 
     public BCMLDSAPublicKey(SubjectPublicKeyInfo keyInfo)
@@ -39,6 +41,7 @@ private void init(SubjectPublicKeyInfo keyInfo)
         throws IOException
     {
         this.params = (MLDSAPublicKeyParameters)PublicKeyFactory.createKey(keyInfo);
+        this.algorithm = Strings.toUpperCase(MLDSAParameterSpec.fromName(params.getParameters().getName()).getName());
     }
     
     /**
@@ -74,7 +77,7 @@ public int hashCode()
      */
     public final String getAlgorithm()
     {
-        return MLDSAParameterSpec.fromName(params.getParameters().getName()).getName();
+        return algorithm;
     }
 
     public byte[] getPublicData()
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/mldsa/SignatureSpi.java b/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/mldsa/SignatureSpi.java
@@ -13,6 +13,7 @@
 import org.bouncycastle.jcajce.spec.MLDSAParameterSpec;
 import org.bouncycastle.pqc.crypto.mldsa.MLDSAParameters;
 import org.bouncycastle.pqc.crypto.mldsa.MLDSASigner;
+import org.bouncycastle.util.Strings;
 
 public class SignatureSpi
     extends java.security.Signature
@@ -48,7 +49,7 @@ protected void engineInitVerify(PublicKey publicKey)
             if (parameters != null)
             {
                 String canonicalAlg = MLDSAParameterSpec.fromName(parameters.getName()).getName();
-                if (!canonicalAlg.equals(key.getAlgorithm()))
+                if (!canonicalAlg.equals(Strings.toLowerCase(key.getAlgorithm())))
                 {
                     throw new InvalidKeyException("signature configured for " + canonicalAlg);
                 }
@@ -81,7 +82,7 @@ protected void engineInitSign(PrivateKey privateKey)
             if (parameters != null)
             {
                 String canonicalAlg = MLDSAParameterSpec.fromName(parameters.getName()).getName();
-                if (!canonicalAlg.equals(key.getAlgorithm()))
+                if (!canonicalAlg.equals(Strings.toLowerCase(key.getAlgorithm())))
                 {
                     throw new InvalidKeyException("signature configured for " + canonicalAlg);
                 }
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/mlkem/BCMLKEMPrivateKey.java b/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/mlkem/BCMLKEMPrivateKey.java
@@ -30,7 +30,7 @@ public BCMLKEMPrivateKey(
             MLKEMPrivateKeyParameters params)
     {
         this.params = params;
-        this.algorithm = params.getParameters().getName();
+        this.algorithm = Strings.toUpperCase(params.getParameters().getName());
     }
 
     public BCMLKEMPrivateKey(PrivateKeyInfo keyInfo)
@@ -44,7 +44,7 @@ private void init(PrivateKeyInfo keyInfo)
     {
         this.attributes = keyInfo.getAttributes();;
         this.params = (MLKEMPrivateKeyParameters)PrivateKeyFactory.createKey(keyInfo);
-        this.algorithm = MLKEMParameterSpec.fromName(params.getParameters().getName()).getName().toUpperCase();
+        this.algorithm = Strings.toUpperCase(MLKEMParameterSpec.fromName(params.getParameters().getName()).getName());
     }
 
     /**
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/mlkem/BCMLKEMPublicKey.java b/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/mlkem/BCMLKEMPublicKey.java
@@ -40,13 +40,13 @@ private void init(SubjectPublicKeyInfo keyInfo)
         throws IOException
     {
         this.params = (MLKEMPublicKeyParameters)PublicKeyFactory.createKey(keyInfo);
-        this.algorithm = MLKEMParameterSpec.fromName(params.getParameters().getName()).getName().toUpperCase();
+        this.algorithm = Strings.toUpperCase(MLKEMParameterSpec.fromName(params.getParameters().getName()).getName());
     }
 
     private void init(MLKEMPublicKeyParameters params)
     {
         this.params = params;
-        this.algorithm = MLKEMParameterSpec.fromName(params.getParameters().getName()).getName().toUpperCase();
+        this.algorithm = Strings.toUpperCase(MLKEMParameterSpec.fromName(params.getParameters().getName()).getName());
     }
     /**
      * Compare this ML-KEM public key with another object.

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public BCMLDSAPrivateKey(`
`31`	`31`	`MLDSAPrivateKeyParameters params)`
`32`	`32`	`{`
`33`	`33`	`this.params = params;`
`34`		`- this.algorithm = MLDSAParameterSpec.fromName(params.getParameters().getName()).getName().toUpperCase();`
	`34`	`+ this.algorithm = Strings.toUpperCase(MLDSAParameterSpec.fromName(params.getParameters().getName()).getName());`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public BCMLDSAPrivateKey(PrivateKeyInfo keyInfo)`
Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,13 @@ public class BCMLDSAPublicKey`
`22`	`22`	`private static final long serialVersionUID = 1L;`
`23`	`23`
`24`	`24`	`private transient MLDSAPublicKeyParameters params;`
	`25`	`+ private transient String algorithm;`
`25`	`26`
`26`	`27`	`public BCMLDSAPublicKey(`
`27`	`28`	`MLDSAPublicKeyParameters params)`
`28`	`29`	`{`
`29`	`30`	`this.params = params;`
	`31`	`+ this.algorithm = Strings.toUpperCase(MLDSAParameterSpec.fromName(params.getParameters().getName()).getName());`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`public BCMLDSAPublicKey(SubjectPublicKeyInfo keyInfo)`
`@@ -39,6 +41,7 @@ private void init(SubjectPublicKeyInfo keyInfo)`
`39`	`41`	`throws IOException`
`40`	`42`	`{`
`41`	`43`	`this.params = (MLDSAPublicKeyParameters)PublicKeyFactory.createKey(keyInfo);`
	`44`	`+ this.algorithm = Strings.toUpperCase(MLDSAParameterSpec.fromName(params.getParameters().getName()).getName());`
`42`	`45`	`}`
`43`	`46`
`44`	`47`	`/**`
`@@ -74,7 +77,7 @@ public int hashCode()`
`74`	`77`	`*/`
`75`	`78`	`public final String getAlgorithm()`
`76`	`79`	`{`
`77`		`- return MLDSAParameterSpec.fromName(params.getParameters().getName()).getName();`
	`80`	`+ return algorithm;`
`78`	`81`	`}`
`79`	`82`
`80`	`83`	`public byte[] getPublicData()`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`import org.bouncycastle.jcajce.spec.MLDSAParameterSpec;`
`14`	`14`	`import org.bouncycastle.pqc.crypto.mldsa.MLDSAParameters;`
`15`	`15`	`import org.bouncycastle.pqc.crypto.mldsa.MLDSASigner;`
	`16`	`+import org.bouncycastle.util.Strings;`
`16`	`17`
`17`	`18`	`public class SignatureSpi`
`18`	`19`	`extends java.security.Signature`
`@@ -48,7 +49,7 @@ protected void engineInitVerify(PublicKey publicKey)`
`48`	`49`	`if (parameters != null)`
`49`	`50`	`{`
`50`	`51`	`String canonicalAlg = MLDSAParameterSpec.fromName(parameters.getName()).getName();`
`51`		`- if (!canonicalAlg.equals(key.getAlgorithm()))`
	`52`	`+ if (!canonicalAlg.equals(Strings.toLowerCase(key.getAlgorithm())))`
`52`	`53`	`{`
`53`	`54`	`throw new InvalidKeyException("signature configured for " + canonicalAlg);`
`54`	`55`	`}`
`@@ -81,7 +82,7 @@ protected void engineInitSign(PrivateKey privateKey)`
`81`	`82`	`if (parameters != null)`
`82`	`83`	`{`
`83`	`84`	`String canonicalAlg = MLDSAParameterSpec.fromName(parameters.getName()).getName();`
`84`		`- if (!canonicalAlg.equals(key.getAlgorithm()))`
	`85`	`+ if (!canonicalAlg.equals(Strings.toLowerCase(key.getAlgorithm())))`
`85`	`86`	`{`
`86`	`87`	`throw new InvalidKeyException("signature configured for " + canonicalAlg);`
`87`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public BCMLKEMPrivateKey(`
`30`	`30`	`MLKEMPrivateKeyParameters params)`
`31`	`31`	`{`
`32`	`32`	`this.params = params;`
`33`		`- this.algorithm = params.getParameters().getName();`
	`33`	`+ this.algorithm = Strings.toUpperCase(params.getParameters().getName());`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`public BCMLKEMPrivateKey(PrivateKeyInfo keyInfo)`
`@@ -44,7 +44,7 @@ private void init(PrivateKeyInfo keyInfo)`
`44`	`44`	`{`
`45`	`45`	`this.attributes = keyInfo.getAttributes();;`
`46`	`46`	`this.params = (MLKEMPrivateKeyParameters)PrivateKeyFactory.createKey(keyInfo);`
`47`		`- this.algorithm = MLKEMParameterSpec.fromName(params.getParameters().getName()).getName().toUpperCase();`
	`47`	`+ this.algorithm = Strings.toUpperCase(MLKEMParameterSpec.fromName(params.getParameters().getName()).getName());`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -40,13 +40,13 @@ private void init(SubjectPublicKeyInfo keyInfo)`
`40`	`40`	`throws IOException`
`41`	`41`	`{`
`42`	`42`	`this.params = (MLKEMPublicKeyParameters)PublicKeyFactory.createKey(keyInfo);`
`43`		`- this.algorithm = MLKEMParameterSpec.fromName(params.getParameters().getName()).getName().toUpperCase();`
	`43`	`+ this.algorithm = Strings.toUpperCase(MLKEMParameterSpec.fromName(params.getParameters().getName()).getName());`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`private void init(MLKEMPublicKeyParameters params)`
`47`	`47`	`{`
`48`	`48`	`this.params = params;`
`49`		`- this.algorithm = MLKEMParameterSpec.fromName(params.getParameters().getName()).getName().toUpperCase();`
	`49`	`+ this.algorithm = Strings.toUpperCase(MLKEMParameterSpec.fromName(params.getParameters().getName()).getName());`
`50`	`50`	`}`
`51`	`51`	`/**`
`52`	`52`	`* Compare this ML-KEM public key with another object.`