Skip to content

Commit 97c7934

Browse files
dghgitdghgit
committed
Java 4 updates.
1 parent a5a03cf commit 97c7934

File tree

4 files changed

+0
-43
lines changed

4 files changed

+0
-43
lines changed

‎core/src/main/jdk1.4/org/bouncycastle/pqc/crypto/util/PrivateKeyFactory.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
2121
import org.bouncycastle.pqc.asn1.CMCEPrivateKey;
2222
import org.bouncycastle.pqc.asn1.FalconPrivateKey;
23-
import org.bouncycastle.pqc.asn1.McElieceCCA2PrivateKey;
2423
import org.bouncycastle.pqc.asn1.PQCObjectIdentifiers;
2524
import org.bouncycastle.pqc.asn1.SPHINCS256KeyParams;
2625
import org.bouncycastle.pqc.asn1.SPHINCSPLUSPrivateKey;
@@ -60,7 +59,6 @@
6059
import org.bouncycastle.pqc.crypto.sphincs.SPHINCSPrivateKeyParameters;
6160
import org.bouncycastle.pqc.crypto.sphincsplus.SPHINCSPlusParameters;
6261
import org.bouncycastle.pqc.crypto.sphincsplus.SPHINCSPlusPrivateKeyParameters;
63-
import org.bouncycastle.pqc.legacy.crypto.mceliece.McElieceCCA2PrivateKeyParameters;
6462
import org.bouncycastle.util.Arrays;
6563
import org.bouncycastle.util.Pack;
6664

@@ -365,12 +363,6 @@ else if (algOID.on(BCObjectIdentifiers.pqc_kem_hqc))
365363

366364
return new HQCPrivateKeyParameters(hqcParams, keyEnc);
367365
}
368-
else if (algOID.equals(PQCObjectIdentifiers.mcElieceCca2))
369-
{
370-
McElieceCCA2PrivateKey mKey = McElieceCCA2PrivateKey.getInstance(keyInfo.parsePrivateKey());
371-
372-
return new McElieceCCA2PrivateKeyParameters(mKey.getN(), mKey.getK(), mKey.getField(), mKey.getGoppaPoly(), mKey.getP(), Utils.getDigestName(mKey.getDigest().getAlgorithm()));
373-
}
374366
else
375367
{
376368
throw new RuntimeException("algorithm identifier in private key not recognised");

‎core/src/main/jdk1.4/org/bouncycastle/pqc/crypto/util/PrivateKeyInfoFactory.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import org.bouncycastle.pqc.asn1.CMCEPublicKey;
1717
import org.bouncycastle.pqc.asn1.FalconPrivateKey;
1818
import org.bouncycastle.pqc.asn1.FalconPublicKey;
19-
import org.bouncycastle.pqc.asn1.McElieceCCA2PrivateKey;
2019
import org.bouncycastle.pqc.asn1.PQCObjectIdentifiers;
2120
import org.bouncycastle.pqc.asn1.SPHINCS256KeyParams;
2221
import org.bouncycastle.pqc.crypto.bike.BIKEPrivateKeyParameters;
@@ -38,7 +37,6 @@
3837
import org.bouncycastle.pqc.crypto.slhdsa.SLHDSAPrivateKeyParameters;
3938
import org.bouncycastle.pqc.crypto.sphincs.SPHINCSPrivateKeyParameters;
4039
import org.bouncycastle.pqc.crypto.sphincsplus.SPHINCSPlusPrivateKeyParameters;
41-
import org.bouncycastle.pqc.legacy.crypto.mceliece.McElieceCCA2PrivateKeyParameters;
4240
import org.bouncycastle.util.Pack;
4341

4442
/**
@@ -136,14 +134,6 @@ else if (privateKey instanceof CMCEPrivateKeyParameters)
136134
CMCEPrivateKey cmcePriv = new CMCEPrivateKey(0, params.getDelta(), params.getC(), params.getG(), params.getAlpha(), params.getS(), cmcePub);
137135
return new PrivateKeyInfo(algorithmIdentifier, cmcePriv, attributes);
138136
}
139-
else if (privateKey instanceof McElieceCCA2PrivateKeyParameters)
140-
{
141-
McElieceCCA2PrivateKeyParameters priv = (McElieceCCA2PrivateKeyParameters)privateKey;
142-
McElieceCCA2PrivateKey mcEliecePriv = new McElieceCCA2PrivateKey(priv.getN(), priv.getK(), priv.getField(), priv.getGoppaPoly(), priv.getP(), Utils.getAlgorithmIdentifier(priv.getDigest()));
143-
AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(PQCObjectIdentifiers.mcElieceCca2);
144-
145-
return new PrivateKeyInfo(algorithmIdentifier, mcEliecePriv);
146-
}
147137
else if (privateKey instanceof FrodoPrivateKeyParameters)
148138
{
149139
FrodoPrivateKeyParameters params = (FrodoPrivateKeyParameters)privateKey;

‎core/src/main/jdk1.4/org/bouncycastle/pqc/crypto/util/PublicKeyFactory.java‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
2020
import org.bouncycastle.internal.asn1.isara.IsaraObjectIdentifiers;
2121
import org.bouncycastle.pqc.asn1.CMCEPublicKey;
22-
import org.bouncycastle.pqc.asn1.McElieceCCA2PublicKey;
2322
import org.bouncycastle.pqc.asn1.PQCObjectIdentifiers;
2423
import org.bouncycastle.pqc.asn1.SPHINCS256KeyParams;
2524
import org.bouncycastle.pqc.crypto.bike.BIKEParameters;
@@ -54,7 +53,6 @@
5453
import org.bouncycastle.pqc.crypto.sphincs.SPHINCSPublicKeyParameters;
5554
import org.bouncycastle.pqc.crypto.sphincsplus.SPHINCSPlusParameters;
5655
import org.bouncycastle.pqc.crypto.sphincsplus.SPHINCSPlusPublicKeyParameters;
57-
import org.bouncycastle.pqc.legacy.crypto.mceliece.McElieceCCA2PublicKeyParameters;
5856
import org.bouncycastle.util.Arrays;
5957
import org.bouncycastle.util.Pack;
6058

@@ -70,7 +68,6 @@ public class PublicKeyFactory
7068
{
7169
converters.put(PQCObjectIdentifiers.sphincs256, new SPHINCSConverter());
7270
converters.put(PQCObjectIdentifiers.newHope, new NHConverter());
73-
converters.put(PQCObjectIdentifiers.mcElieceCca2, new McElieceCCA2Converter());
7471
converters.put(BCObjectIdentifiers.sphincsPlus, new SPHINCSPlusConverter());
7572

7673
converters.put(BCObjectIdentifiers.sphincsPlus_sha2_128s_r3, new SPHINCSPlusConverter());
@@ -401,18 +398,6 @@ AsymmetricKeyParameter getPublicKeyParameters(SubjectPublicKeyInfo keyInfo, Obje
401398
}
402399
}
403400

404-
private static class McElieceCCA2Converter
405-
extends SubjectPublicKeyInfoConverter
406-
{
407-
AsymmetricKeyParameter getPublicKeyParameters(SubjectPublicKeyInfo keyInfo, Object defaultParams)
408-
throws IOException
409-
{
410-
McElieceCCA2PublicKey mKey = McElieceCCA2PublicKey.getInstance(keyInfo.parsePublicKey());
411-
412-
return new McElieceCCA2PublicKeyParameters(mKey.getN(), mKey.getT(), mKey.getG(), Utils.getDigestName(mKey.getDigest().getAlgorithm()));
413-
}
414-
}
415-
416401
private static class FrodoConverter
417402
extends SubjectPublicKeyInfoConverter
418403
{

‎core/src/main/jdk1.4/org/bouncycastle/pqc/crypto/util/SubjectPublicKeyInfoFactory.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
1010
import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
1111
import org.bouncycastle.internal.asn1.isara.IsaraObjectIdentifiers;
12-
import org.bouncycastle.pqc.asn1.McElieceCCA2PublicKey;
1312
import org.bouncycastle.pqc.asn1.PQCObjectIdentifiers;
1413
import org.bouncycastle.pqc.asn1.SPHINCS256KeyParams;
1514
import org.bouncycastle.pqc.crypto.bike.BIKEPublicKeyParameters;
@@ -29,7 +28,6 @@
2928
import org.bouncycastle.pqc.crypto.slhdsa.SLHDSAPublicKeyParameters;
3029
import org.bouncycastle.pqc.crypto.sphincs.SPHINCSPublicKeyParameters;
3130
import org.bouncycastle.pqc.crypto.sphincsplus.SPHINCSPlusPublicKeyParameters;
32-
import org.bouncycastle.pqc.legacy.crypto.mceliece.McElieceCCA2PublicKeyParameters;
3331

3432
/**
3533
* Factory to create ASN.1 subject public key info objects from lightweight public keys.
@@ -94,14 +92,6 @@ else if (publicKey instanceof CMCEPublicKeyParameters)
9492

9593
return new SubjectPublicKeyInfo(algorithmIdentifier, encoding);
9694
}
97-
else if (publicKey instanceof McElieceCCA2PublicKeyParameters)
98-
{
99-
McElieceCCA2PublicKeyParameters pub = (McElieceCCA2PublicKeyParameters)publicKey;
100-
McElieceCCA2PublicKey mcEliecePub = new McElieceCCA2PublicKey(pub.getN(), pub.getT(), pub.getG(), Utils.getAlgorithmIdentifier(pub.getDigest()));
101-
AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(PQCObjectIdentifiers.mcElieceCca2);
102-
103-
return new SubjectPublicKeyInfo(algorithmIdentifier, mcEliecePub);
104-
}
10595
else if (publicKey instanceof FrodoPublicKeyParameters)
10696
{
10797
FrodoPublicKeyParameters params = (FrodoPublicKeyParameters)publicKey;

0 commit comments

Comments
 (0)