Skip to content

Commit 8a6c1da

Browse files
dghgitdghgit
committed
The legacy jdk1.3 and jdk1.4 PKCS#12 keystore overlays report an unrecognised bag through java.util.logging where the base class does, rather than writing it and an ASN.1 dump to stdout, the Ant bcpg copy no longer sweeps in the OpenPGPTestKeys fixture that sits in the main-namespace openpgp package and so matches none of its *Test.java excludes, the Ant bcpkix source and javadoc copies exclude test directories at any depth so the est/test/san certificate fixtures stop reaching the sources jar, and jdk15+.xml gains the test-signed target jdk14.xml already carries.
1 parent bd3d286 commit 8a6c1da

5 files changed

Lines changed: 35 additions & 23 deletions

File tree

‎ant/bc+-build.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -904,6 +904,8 @@
904904
<exclude name="**/*Tests.java" />
905905
<exclude name="**/test/*.*" />
906906
<exclude name="**/test/**.*" />
907+
<!-- the two above only reach one level below test/; est/test/san holds .pem fixtures two levels down -->
908+
<exclude name="**/test/**" />
907909
</fileset>
908910
</copy>
909911

@@ -958,6 +960,8 @@
958960
<exclude name="**/*Test.java" />
959961
<exclude name="**/*Tests.java" />
960962
<exclude name="**/test/*.java" />
963+
<!-- src.dir merges main and test sources, so test files are excluded by name; OpenPGPTestKeys lives in the main-namespace openpgp package and ends in Keys.java, matching none of the patterns above. -->
964+
<exclude name="**/*TestKeys.java" />
961965
</fileset>
962966
</copy>
963967

@@ -1008,6 +1012,8 @@
10081012
<fileset dir="${src.dir}" includes="**/crypto/*/*Test.java" />
10091013
<fileset dir="${src.dir}" includes="**/crypto/agreement/owl/*Test.java" />
10101014
<fileset dir="${src.dir}" includes="org/bouncycastle/tls/SpreadCertificateStatusTest.java" />
1015+
<!-- main-namespace test fixture the bcpg copy now excludes; the openpgp.api tests resolve it from here -->
1016+
<fileset dir="${src.dir}" includes="org/bouncycastle/openpgp/OpenPGPTestKeys.java" />
10111017
<fileset dir="${src.dir}" includes="**/pqc/crypto/hqc/*Test.java" />
10121018
<fileset dir="${src.dir}" includes="**/pqc/math/ntru/*Test.java" />
10131019
<fileset dir="${src.dir}" includes="**/tsp/*UnitTest.java" />
@@ -1380,6 +1386,7 @@
13801386
<include name="org/bouncycastle/operator/**/*.html" />
13811387
<include name="org/bouncycastle/mozilla/**/*.html" />
13821388
<include name="org/bouncycastle/tsp/**/*.html" />
1389+
<exclude name="**/test/**" />
13831390
</fileset>
13841391
</copy>
13851392

‎ant/jdk15+.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,19 @@
210210
<ant antfile="ant/bc+-build.xml" dir="." target="test-lw" />
211211
</target>
212212

213+
<!-- Run the junit suites against the jars exactly as they stand, with no build-test
214+
dependency, mirroring the target of the same name in jdk14.xml. JRE 5 requires every
215+
class in a package to share signer info, and bctest shares org.bouncycastle.pqc.crypto.hqc
216+
(GFTest, reaching the package-private GF) and org.bouncycastle.openpgp (OpenPGPTestKeys,
217+
which the openpgp.api tests resolve) with the signed jars, so those suites only pass when
218+
bctest is signed too. "test" cannot deliver that: its build-test dependency re-jars bctest
219+
on every invocation, stripping the signature bcsign applied. Sign, then use this target. -->
220+
<target name="test-signed">
221+
<!-- normally created by build-test, which this target deliberately does not depend on -->
222+
<mkdir dir="${artifacts.dir}/reports/xml"/>
223+
<ant antfile="ant/bc+-build.xml" dir="." target="test"/>
224+
</target>
225+
213226
<target name="zip-src">
214227
<ant antfile="ant/bc+-build.xml" dir="." target="zip-src" />
215228
</target>

‎prov/src/main/jdk1.3/org/bouncycastle/jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
7878
import org.bouncycastle.asn1.pkcs.Pfx;
7979
import org.bouncycastle.asn1.pkcs.SafeBag;
80-
import org.bouncycastle.asn1.util.ASN1Dump;
8180
import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
8281
import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier;
8382
import org.bouncycastle.asn1.x509.DigestInfo;
@@ -961,8 +960,7 @@ else if (b.getBagId().equals(certBag))
961960
}
962961
else
963962
{
964-
System.out.println("extra in data " + b.getBagId());
965-
System.out.println(ASN1Dump.dumpAsString(b));
963+
// NOTE: base reports the unrecognised bag through java.util.logging, a Java 1.4 API that JRE 1.3 does not have
966964
}
967965
}
968966
}
@@ -1107,15 +1105,13 @@ else if (aOid.equals(pkcs_9_at_localKeyId))
11071105
}
11081106
else
11091107
{
1110-
System.out.println("extra in encryptedData " + b.getBagId());
1111-
System.out.println(ASN1Dump.dumpAsString(b));
1108+
// NOTE: base reports the unrecognised bag through java.util.logging, a Java 1.4 API that JRE 1.3 does not have
11121109
}
11131110
}
11141111
}
11151112
else
11161113
{
1117-
System.out.println("extra " + c[i].getContentType().getId());
1118-
System.out.println("extra " + ASN1Dump.dumpAsString(PKCS12Util.getContent(c[i])));
1114+
// NOTE: base reports the unrecognised bag through java.util.logging, a Java 1.4 API that JRE 1.3 does not have
11191115
}
11201116
}
11211117
}

‎prov/src/main/jdk1.4/org/bouncycastle/jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi.java‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import java.util.Map;
3737
import java.util.Set;
3838
import java.util.Vector;
39+
import java.util.logging.Logger;
3940

4041
import javax.crypto.Cipher;
4142
import javax.crypto.Mac;
@@ -107,6 +108,8 @@ public class PKCS12KeyStoreSpi
107108
{
108109
private final JcaJceHelper helper = new BCJcaJceHelper();
109110

111+
static final Logger LOG = Logger.getLogger(PKCS12KeyStoreSpi.class.getName());
112+
110113
private static final int SALT_SIZE = 20;
111114

112115
private static final DefaultSecretKeyProvider keySizeProvider = new DefaultSecretKeyProvider();
@@ -961,8 +964,8 @@ else if (b.getBagId().equals(certBag))
961964
}
962965
else
963966
{
964-
System.out.println("extra in data " + b.getBagId());
965-
System.out.println(ASN1Dump.dumpAsString(b));
967+
LOG.info("extra in data " + b.getBagId());
968+
LOG.fine(ASN1Dump.dumpAsString(b));
966969
}
967970
}
968971
}
@@ -1107,15 +1110,15 @@ else if (aOid.equals(pkcs_9_at_localKeyId))
11071110
}
11081111
else
11091112
{
1110-
System.out.println("extra in encryptedData " + b.getBagId());
1111-
System.out.println(ASN1Dump.dumpAsString(b));
1113+
LOG.info("extra in encrypted data " + b.getBagId());
1114+
LOG.fine(ASN1Dump.dumpAsString(b));
11121115
}
11131116
}
11141117
}
11151118
else
11161119
{
1117-
System.out.println("extra " + c[i].getContentType().getId());
1118-
System.out.println("extra " + ASN1Dump.dumpAsString(PKCS12Util.getContent(c[i])));
1120+
LOG.info("extra " + c[i].getContentType().getId());
1121+
LOG.fine(ASN1Dump.dumpAsString(PKCS12Util.getContent(c[i])));
11191122
}
11201123
}
11211124
}

‎prov/src/main/jdk1.4/org/bouncycastle/jcajce/provider/keystore/pkcs12/PKCS12PBMAC1KeyStoreSpi.java‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@
8080
import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
8181
import org.bouncycastle.asn1.pkcs.Pfx;
8282
import org.bouncycastle.asn1.pkcs.SafeBag;
83-
import org.bouncycastle.asn1.util.ASN1Dump;
8483
import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
8584
import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier;
8685
import org.bouncycastle.asn1.x509.DigestInfo;
@@ -995,9 +994,7 @@ else if (b.getBagId().equals(keyBag))
995994
}
996995
else
997996
{
998-
// -DM 2 System.out.println
999-
System.out.println("extra in data " + b.getBagId());
1000-
System.out.println(ASN1Dump.dumpAsString(b));
997+
// NOTE: base reports the unrecognised bag through java.util.logging; this overlay also serves the jdk1.3 build, which has no such API
1001998
}
1002999
}
10031000
}
@@ -1026,17 +1023,13 @@ else if (b.getBagId().equals(keyBag))
10261023
}
10271024
else
10281025
{
1029-
// -DM 2 System.out.println
1030-
System.out.println("extra in encryptedData " + b.getBagId());
1031-
System.out.println(ASN1Dump.dumpAsString(b));
1026+
// NOTE: base reports the unrecognised bag through java.util.logging; this overlay also serves the jdk1.3 build, which has no such API
10321027
}
10331028
}
10341029
}
10351030
else
10361031
{
1037-
// -DM 2 System.out.println
1038-
System.out.println("extra " + c[i].getContentType().getId());
1039-
System.out.println("extra " + ASN1Dump.dumpAsString(PKCS12Util.getContent(c[i])));
1032+
// NOTE: base reports the unrecognised bag through java.util.logging; this overlay also serves the jdk1.3 build, which has no such API
10401033
}
10411034
}
10421035
}

0 commit comments

Comments
 (0)