Skip to content

Commit 8f31ae3

Browse files
dghgitdghgit
committed
compatibility updates.
1 parent e8a5007 commit 8f31ae3

File tree

11 files changed

+593
-67
lines changed

11 files changed

+593
-67
lines changed

‎ant/bc+-build.xml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1362,7 +1362,7 @@
13621362
<!--
13631363
jar up the source directories
13641364
-->
1365-
<target name="zip-src" depends="zip-src-check, zip-src-jce, zip-src-jce-ext, zip-src-provider, zip-src-provider-ext">
1365+
<target name="zip-src" depends="zip-src-check, zip-src-jce, zip-src-jce-ext, zip-src-provider, zip-src-provider-ext, zip-src-jmail">
13661366
<zip basedir="${mail.target.src.dir}" destfile="${mail.target.src.zip}" />
13671367
<delete dir="${mail.target.src.dir}" />
13681368
<zip basedir="${pkix.target.src.dir}" destfile="${pkix.target.src.zip}" />
@@ -1371,7 +1371,12 @@
13711371
<delete dir="${pg.target.src.dir}" />
13721372
<zip basedir="${util.target.src.dir}" destfile="${util.target.src.zip}" />
13731373
<delete dir="${util.target.src.dir}" />
1374-
<zip basedir="${jmail.target.src.dir}" destfile="${jmail.target.src.zip}" />
1374+
</target>
1375+
1376+
1377+
<target name="zip-src-jmail" if="jmail.present">
1378+
<zip basedir="${jmail.target.src.dir}" destfile="${jmail.target.src.zip}">
1379+
</zip>
13751380
<delete dir="${jmail.target.src.dir}" />
13761381
</target>
13771382

@@ -1406,6 +1411,7 @@
14061411
<target name="zip-src-check">
14071412
<available property="jce.present" file="${jce.target.src.dir}" />
14081413
<available property="provider.present" file="${provider.target.src.dir}" />
1414+
<available property="jmail.present" file="${jmail.target.src.dir}" />
14091415
</target>
14101416
</project>
14111417

‎ant/jdk14.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
<exclude name="**/xmss/**/*.java"/>
9494
<exclude name="**/lms/**/*.java"/>
9595
<exclude name="**/pqc/legacy/**/*.java"/>
96+
<exclude name="**/pqc/math/**/*.java"/>
9697
<exclude name="**/pqc/**/BitStringTest.java"/>
9798
<exclude name="**/pqc/**/XMS*.java"/>
9899
<exclude name="**/pqc/**/LMS*.java"/>

‎pg/src/test/java/org/bouncycastle/openpgp/test/Argon2S2KTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public static void main(String[] args)
8080
@Override
8181
public String getName()
8282
{
83-
return Argon2S2KTest.class.getSimpleName();
83+
return "Argon2S2KTest";
8484
}
8585

8686
@Override

‎pg/src/test/java/org/bouncycastle/openpgp/test/CRC24Test.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public static void main(String[] args)
2929
@Override
3030
public String getName()
3131
{
32-
return CRC24Test.class.getSimpleName();
32+
return "CRC24Test";
3333
}
3434

3535
@Override

‎pg/src/test/java/org/bouncycastle/openpgp/test/IgnoreUnknownEncryptedSessionKeys.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import java.io.ByteArrayOutputStream;
55
import java.io.IOException;
66
import java.io.InputStream;
7-
import java.nio.charset.StandardCharsets;
87

98
import org.bouncycastle.bcpg.ArmoredInputStream;
109
import org.bouncycastle.openpgp.PGPEncryptedData;
@@ -19,6 +18,7 @@
1918
import org.bouncycastle.openpgp.PGPSecretKeyRing;
2019
import org.bouncycastle.openpgp.bc.BcPGPObjectFactory;
2120
import org.bouncycastle.openpgp.operator.bc.BcPublicKeyDataDecryptorFactory;
21+
import org.bouncycastle.util.Strings;
2222
import org.bouncycastle.util.io.Streams;
2323
import org.bouncycastle.util.test.SimpleTest;
2424

@@ -35,7 +35,7 @@ public static void main(String[] args)
3535

3636
public String getName()
3737
{
38-
return getClass().getSimpleName();
38+
return "IgnoreUnknownEncryptedSessionKeys";
3939
}
4040

4141
public void performTest()
@@ -137,7 +137,7 @@ private void readKey()
137137
"xqAY9Bwizt4FWgXuLm1a4+So4V9j1TRCXd12Uc2l2RNmgDE=\n" +
138138
"=miES\n" +
139139
"-----END PGP PRIVATE KEY BLOCK-----";
140-
ByteArrayInputStream byteIn = new ByteArrayInputStream(key.getBytes(StandardCharsets.UTF_8));
140+
ByteArrayInputStream byteIn = new ByteArrayInputStream(Strings.toUTF8ByteArray(key));
141141
ArmoredInputStream armorIn = new ArmoredInputStream(byteIn);
142142
PGPObjectFactory objectFactory = new BcPGPObjectFactory(armorIn);
143143
tsk = (PGPSecretKeyRing)objectFactory.nextObject();
@@ -236,7 +236,7 @@ private void skesk23_pkesk3_seip()
236236
private void attemptDecryption(String msg)
237237
throws IOException, PGPException
238238
{
239-
ByteArrayInputStream byteIn = new ByteArrayInputStream(msg.getBytes(StandardCharsets.UTF_8));
239+
ByteArrayInputStream byteIn = new ByteArrayInputStream(Strings.toUTF8ByteArray(msg));
240240
ArmoredInputStream armorIn = new ArmoredInputStream(byteIn);
241241
PGPObjectFactory objectFactory = new BcPGPObjectFactory(armorIn);
242242

‎pg/src/test/java/org/bouncycastle/openpgp/test/UnrecognizableSubkeyParserTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
import java.io.ByteArrayInputStream;
44
import java.io.IOException;
5-
import java.nio.charset.StandardCharsets;
65
import java.util.Iterator;
76

87
import org.bouncycastle.bcpg.ArmoredInputStream;
98
import org.bouncycastle.openpgp.PGPObjectFactory;
109
import org.bouncycastle.openpgp.PGPPublicKeyRing;
1110
import org.bouncycastle.openpgp.bc.BcPGPObjectFactory;
11+
import org.bouncycastle.util.Strings;
1212
import org.bouncycastle.util.test.SimpleTest;
1313

1414
/**
@@ -28,7 +28,7 @@ public static void main(String[] arg)
2828

2929
public String getName()
3030
{
31-
return getClass().getSimpleName();
31+
return "UnrecognizableSubkeyParserTest";
3232
}
3333

3434
public void performTest()
@@ -519,7 +519,7 @@ private int count(Iterator iterator)
519519
private PGPPublicKeyRing certFromString(String string)
520520
throws IOException
521521
{
522-
ByteArrayInputStream bytesIn = new ByteArrayInputStream(string.getBytes(StandardCharsets.UTF_8));
522+
ByteArrayInputStream bytesIn = new ByteArrayInputStream(Strings.toUTF8ByteArray(string));
523523
ArmoredInputStream armorIn = new ArmoredInputStream(bytesIn);
524524
PGPObjectFactory objectFactory = new BcPGPObjectFactory(armorIn);
525525

‎pkix/src/test/java/org/bouncycastle/openssl/test/CompositeKeyTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import java.security.Security;
1515
import java.security.cert.CertificateFactory;
1616
import java.security.cert.X509Certificate;
17-
import java.security.spec.ECGenParameterSpec;
1817
import java.security.spec.PKCS8EncodedKeySpec;
1918
import java.security.spec.RSAKeyGenParameterSpec;
2019
import java.security.spec.X509EncodedKeySpec;
@@ -47,6 +46,7 @@
4746
import org.bouncycastle.jcajce.CompositePublicKey;
4847
import org.bouncycastle.jcajce.spec.CompositeAlgorithmSpec;
4948
import org.bouncycastle.jce.provider.BouncyCastleProvider;
49+
import org.bouncycastle.jce.spec.ECNamedCurveGenParameterSpec;
5050
import org.bouncycastle.openssl.PEMParser;
5151
import org.bouncycastle.openssl.jcajce.JcaPEMWriter;
5252
import org.bouncycastle.operator.ContentSigner;
@@ -192,7 +192,7 @@ public void testRSAAndECCompositeGen()
192192
//
193193
KeyPairGenerator ecKpg = KeyPairGenerator.getInstance("EC", "BC");
194194

195-
ecKpg.initialize(new ECGenParameterSpec("P-256"));
195+
ecKpg.initialize(new ECNamedCurveGenParameterSpec("P-256"));
196196

197197
KeyPair ecKp = ecKpg.generateKeyPair();
198198

@@ -251,7 +251,7 @@ public void testRSAAndECCompositeGen()
251251

252252
cert.verify(ecPub, "BC"); // ec key only
253253

254-
cert.verify(ecPub, new BouncyCastleProvider()); // ec key only
254+
// cert.verify(ecPub, new BouncyCastleProvider()); // ec key only
255255

256256
//
257257
// check verifies with contained key
@@ -331,7 +331,7 @@ public void testRSAAndECCompositeSignedDataGen()
331331
//
332332
KeyPairGenerator ecKpg = KeyPairGenerator.getInstance("EC", "BC");
333333

334-
ecKpg.initialize(new ECGenParameterSpec("P-256"));
334+
ecKpg.initialize(new ECNamedCurveGenParameterSpec("P-256"));
335335

336336
KeyPair ecKp = ecKpg.generateKeyPair();
337337

@@ -427,7 +427,7 @@ public void testRSAAndECCompositeSignedDataGen()
427427
SignerInformationStore sigStore = s.getSignerInfos();
428428
Store certStore = s.getCertificates();
429429

430-
SignerInformation sigInf = sigStore.getSigners().iterator().next();
430+
SignerInformation sigInf = (SignerInformation)sigStore.getSigners().iterator().next();
431431

432432
assertTrue(sigInf.verify(new JcaSimpleSignerInfoVerifierBuilder().build((X509CertificateHolder)certStore.getMatches(null).iterator().next())));
433433

@@ -444,7 +444,7 @@ public void testRSAAndECCompositeSignedDataGen()
444444
sigStore = s.getSignerInfos();
445445
certStore = s.getCertificates();
446446

447-
sigInf = sigStore.getSigners().iterator().next();
447+
sigInf = (SignerInformation)sigStore.getSigners().iterator().next();
448448

449449
assertTrue(sigInf.verify(new JcaSimpleSignerInfoVerifierBuilder().build((X509CertificateHolder)certStore.getMatches(null).iterator().next())));
450450

0 commit comments

Comments
 (0)