Skip to content

Commit 0226bd9

Browse files
committed
added use of new SpecUtil class, removed use of deprecated one.
1 parent e473a06 commit 0226bd9

19 files changed

+19
-21
lines changed

prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/mldsa/MLDSAKeyPairGeneratorSpi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
import org.bouncycastle.crypto.CryptoServicesRegistrar;
1111
import org.bouncycastle.jcajce.spec.MLDSAParameterSpec;
1212
import org.bouncycastle.jcajce.util.BCJcaJceHelper;
13+
import org.bouncycastle.jcajce.util.SpecUtil;
1314
import org.bouncycastle.pqc.crypto.mldsa.MLDSAKeyGenerationParameters;
1415
import org.bouncycastle.pqc.crypto.mldsa.MLDSAKeyPairGenerator;
1516
import org.bouncycastle.pqc.crypto.mldsa.MLDSAParameters;
1617
import org.bouncycastle.pqc.crypto.mldsa.MLDSAPrivateKeyParameters;
1718
import org.bouncycastle.pqc.crypto.mldsa.MLDSAPublicKeyParameters;
18-
import org.bouncycastle.pqc.jcajce.provider.util.SpecUtil;
1919
import org.bouncycastle.util.Strings;
2020

2121
public class MLDSAKeyPairGeneratorSpi

prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/mlkem/MLKEMKeyPairGeneratorSpi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
import org.bouncycastle.crypto.CryptoServicesRegistrar;
1111
import org.bouncycastle.jcajce.spec.MLKEMParameterSpec;
1212
import org.bouncycastle.jcajce.util.BCJcaJceHelper;
13+
import org.bouncycastle.jcajce.util.SpecUtil;
1314
import org.bouncycastle.pqc.crypto.mlkem.MLKEMKeyGenerationParameters;
1415
import org.bouncycastle.pqc.crypto.mlkem.MLKEMKeyPairGenerator;
1516
import org.bouncycastle.pqc.crypto.mlkem.MLKEMParameters;
1617
import org.bouncycastle.pqc.crypto.mlkem.MLKEMPrivateKeyParameters;
1718
import org.bouncycastle.pqc.crypto.mlkem.MLKEMPublicKeyParameters;
18-
import org.bouncycastle.pqc.jcajce.provider.util.SpecUtil;
1919
import org.bouncycastle.util.Strings;
2020

2121
public class MLKEMKeyPairGeneratorSpi

prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/slhdsa/SLHDSAKeyPairGeneratorSpi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
1212
import org.bouncycastle.crypto.CryptoServicesRegistrar;
1313
import org.bouncycastle.jcajce.spec.SLHDSAParameterSpec;
14+
import org.bouncycastle.jcajce.util.SpecUtil;
1415
import org.bouncycastle.pqc.crypto.slhdsa.SLHDSAKeyGenerationParameters;
1516
import org.bouncycastle.pqc.crypto.slhdsa.SLHDSAKeyPairGenerator;
1617
import org.bouncycastle.pqc.crypto.slhdsa.SLHDSAParameters;
1718
import org.bouncycastle.pqc.crypto.slhdsa.SLHDSAPrivateKeyParameters;
1819
import org.bouncycastle.pqc.crypto.slhdsa.SLHDSAPublicKeyParameters;
19-
import org.bouncycastle.pqc.jcajce.provider.util.SpecUtil;
2020
import org.bouncycastle.util.Strings;
2121

2222
public class SLHDSAKeyPairGeneratorSpi

prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/ECUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
2222
import org.bouncycastle.crypto.params.ECPublicKeyParameters;
2323
import org.bouncycastle.jcajce.provider.config.ProviderConfiguration;
24+
import org.bouncycastle.jcajce.util.SpecUtil;
2425
import org.bouncycastle.jce.interfaces.ECPrivateKey;
2526
import org.bouncycastle.jce.interfaces.ECPublicKey;
2627
import org.bouncycastle.jce.provider.BouncyCastleProvider;
@@ -29,7 +30,6 @@
2930
import org.bouncycastle.math.ec.ECCurve;
3031
import org.bouncycastle.math.ec.ECPoint;
3132
import org.bouncycastle.math.ec.FixedPointCombMultiplier;
32-
import org.bouncycastle.pqc.jcajce.provider.util.SpecUtil;
3333
import org.bouncycastle.util.Arrays;
3434
import org.bouncycastle.util.Fingerprint;
3535
import org.bouncycastle.util.Strings;

prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/bike/BIKEKeyPairGeneratorSpi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99

1010
import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
1111
import org.bouncycastle.crypto.CryptoServicesRegistrar;
12+
import org.bouncycastle.jcajce.util.SpecUtil;
1213
import org.bouncycastle.pqc.crypto.bike.BIKEKeyGenerationParameters;
1314
import org.bouncycastle.pqc.crypto.bike.BIKEKeyPairGenerator;
1415
import org.bouncycastle.pqc.crypto.bike.BIKEParameters;
1516
import org.bouncycastle.pqc.crypto.bike.BIKEPrivateKeyParameters;
1617
import org.bouncycastle.pqc.crypto.bike.BIKEPublicKeyParameters;
17-
import org.bouncycastle.pqc.jcajce.provider.util.SpecUtil;
1818
import org.bouncycastle.pqc.jcajce.spec.BIKEParameterSpec;
1919
import org.bouncycastle.util.Strings;
2020

prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/cmce/CMCEKeyPairGeneratorSpi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99

1010
import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
1111
import org.bouncycastle.crypto.CryptoServicesRegistrar;
12+
import org.bouncycastle.jcajce.util.SpecUtil;
1213
import org.bouncycastle.pqc.crypto.cmce.CMCEKeyGenerationParameters;
1314
import org.bouncycastle.pqc.crypto.cmce.CMCEKeyPairGenerator;
1415
import org.bouncycastle.pqc.crypto.cmce.CMCEParameters;
1516
import org.bouncycastle.pqc.crypto.cmce.CMCEPrivateKeyParameters;
1617
import org.bouncycastle.pqc.crypto.cmce.CMCEPublicKeyParameters;
17-
import org.bouncycastle.pqc.jcajce.provider.util.SpecUtil;
1818
import org.bouncycastle.pqc.jcajce.spec.CMCEParameterSpec;
1919
import org.bouncycastle.util.Strings;
2020

prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/dilithium/DilithiumKeyPairGeneratorSpi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010

1111
import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
1212
import org.bouncycastle.crypto.CryptoServicesRegistrar;
13+
import org.bouncycastle.jcajce.util.SpecUtil;
1314
import org.bouncycastle.pqc.crypto.crystals.dilithium.DilithiumKeyGenerationParameters;
1415
import org.bouncycastle.pqc.crypto.crystals.dilithium.DilithiumKeyPairGenerator;
1516
import org.bouncycastle.pqc.crypto.crystals.dilithium.DilithiumParameters;
1617
import org.bouncycastle.pqc.crypto.crystals.dilithium.DilithiumPrivateKeyParameters;
1718
import org.bouncycastle.pqc.crypto.crystals.dilithium.DilithiumPublicKeyParameters;
18-
import org.bouncycastle.pqc.jcajce.provider.util.SpecUtil;
1919
import org.bouncycastle.pqc.jcajce.spec.DilithiumParameterSpec;
2020
import org.bouncycastle.util.Strings;
2121

prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/falcon/FalconKeyPairGeneratorSpi.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,19 @@
22

33
import java.security.InvalidAlgorithmParameterException;
44
import java.security.KeyPair;
5-
import java.security.NoSuchAlgorithmException;
65
import java.security.SecureRandom;
76
import java.security.spec.AlgorithmParameterSpec;
87
import java.util.HashMap;
98
import java.util.Map;
109

1110
import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
1211
import org.bouncycastle.crypto.CryptoServicesRegistrar;
12+
import org.bouncycastle.jcajce.util.SpecUtil;
1313
import org.bouncycastle.pqc.crypto.falcon.FalconKeyGenerationParameters;
1414
import org.bouncycastle.pqc.crypto.falcon.FalconKeyPairGenerator;
1515
import org.bouncycastle.pqc.crypto.falcon.FalconParameters;
1616
import org.bouncycastle.pqc.crypto.falcon.FalconPrivateKeyParameters;
1717
import org.bouncycastle.pqc.crypto.falcon.FalconPublicKeyParameters;
18-
import org.bouncycastle.pqc.crypto.falcon.FalconSigner;
19-
import org.bouncycastle.pqc.jcajce.provider.util.SpecUtil;
2018
import org.bouncycastle.pqc.jcajce.spec.FalconParameterSpec;
2119
import org.bouncycastle.util.Strings;
2220

prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/frodo/FrodoKeyPairGeneratorSpi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99

1010
import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
1111
import org.bouncycastle.crypto.CryptoServicesRegistrar;
12+
import org.bouncycastle.jcajce.util.SpecUtil;
1213
import org.bouncycastle.pqc.crypto.frodo.FrodoKeyGenerationParameters;
1314
import org.bouncycastle.pqc.crypto.frodo.FrodoKeyPairGenerator;
1415
import org.bouncycastle.pqc.crypto.frodo.FrodoParameters;
1516
import org.bouncycastle.pqc.crypto.frodo.FrodoPrivateKeyParameters;
1617
import org.bouncycastle.pqc.crypto.frodo.FrodoPublicKeyParameters;
17-
import org.bouncycastle.pqc.jcajce.provider.util.SpecUtil;
1818
import org.bouncycastle.pqc.jcajce.spec.FrodoParameterSpec;
1919
import org.bouncycastle.util.Strings;
2020

prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/hqc/HQCKeyPairGeneratorSpi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010

1111
import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
1212
import org.bouncycastle.crypto.CryptoServicesRegistrar;
13+
import org.bouncycastle.jcajce.util.SpecUtil;
1314
import org.bouncycastle.pqc.crypto.hqc.HQCKeyGenerationParameters;
1415
import org.bouncycastle.pqc.crypto.hqc.HQCKeyPairGenerator;
1516
import org.bouncycastle.pqc.crypto.hqc.HQCParameters;
1617
import org.bouncycastle.pqc.crypto.hqc.HQCPrivateKeyParameters;
1718
import org.bouncycastle.pqc.crypto.hqc.HQCPublicKeyParameters;
18-
import org.bouncycastle.pqc.jcajce.provider.util.SpecUtil;
1919
import org.bouncycastle.pqc.jcajce.spec.HQCParameterSpec;
2020
import org.bouncycastle.util.Strings;
2121

0 commit comments

Comments
 (0)