Skip to content

Commit 50f2413

Browse files
dghgitdghgit
committed
Java 1.3, 1.2 updates
1 parent c96c8d4 commit 50f2413

12 files changed

Lines changed: 382 additions & 316 deletions

File tree

‎ant/jdk13.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
<exclude name="**/IndexGenerator.java" />
5151
<exclude name="**/ntru/**/*.java" />
5252
<exclude name="**/xmss/**/*.java" />
53+
<exclude name="**/lms/*.java" />
5354
<exclude name="**/asymmetric/DSTU*.java" />
5455
<exclude name="**/asymmetric/dstu/*.java" />
5556
<exclude name="**/provider/config/PKCS12StoreParameter.java" />
@@ -77,9 +78,11 @@
7778
<exclude name="**/JDKPKCS12StoreParameter.java" />
7879
<exclude name="**/NTRU*.java" />
7980
<exclude name="**/XMSS*.java" />
81+
<exclude name="**/spec/LMS*.java" />
8082
<exclude name="**/IndexGenerator.java" />
8183
<exclude name="**/ntru/**/*.java" />
8284
<exclude name="**/xmss/**/*.java" />
85+
<exclude name="**/lms/**/*.java" />
8386
<exclude name="**/ecgost12/**/*.java" />
8487
<exclude name="**/asymmetric/DSTU*.java" />
8588
<exclude name="**/asymmetric/dstu/*.java" />
@@ -124,6 +127,9 @@
124127
<exclude name="**/ntru/**/*.java" />
125128
<exclude name="**/NTRU*.java" />
126129
<exclude name="**/XMSS*.java" />
130+
<exclude name="**/HSS*.java" />
131+
<exclude name="**/LMS*.java" />
132+
<exclude name="**/lms/*.java" />
127133
<exclude name="**/crypto/engines/test/BitStringTest.java" />
128134
<exclude name="**/crypto/engines/test/AllTests.java" />
129135
<exclude name="**/crypto/signers/test/AllTests.java" />
@@ -164,6 +170,8 @@
164170
<exclude name="**/GetInstanceTest.java" />
165171
<exclude name="**/ntru/**/*.java" />
166172
<exclude name="**/NTRU*.java" />
173+
<exclude name="**/LMS*.java" />
174+
<exclude name="**/HSS*.java" />
167175
<exclude name="**/crypto/engines/test/BitStringTest.java" />
168176
<exclude name="**/crypto/engines/test/AllTests.java" />
169177
<exclude name="**/crypto/signers/test/AllTests.java" />

‎build1-2‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,17 @@ find $jdk12src -name "*.java" -exec scripts/usejcecert.sh \{\} \;
5959
rm -rf org/bouncycastle/pqc/crypto/ntru
6060
rm -rf org/bouncycastle/pqc/crypto/*/NTRU*
6161
rm -rf org/bouncycastle/pqc/crypto/xmss
62+
rm -rf org/bouncycastle/pqc/crypto/lms
6263
rm -rf org/bouncycastle/pqc/jcajce/provider/xmss
6364
rm -rf org/bouncycastle/pqc/jcajce/provider/XMSS*
65+
rm -rf org/bouncycastle/pqc/jcajce/provider/LMS*
66+
rm -rf org/bouncycastle/pqc/jcajce/provider/lms
6467
rm -rf org/bouncycastle/pqc/crypto/*/XMSS*
68+
rm -rf org/bouncycastle/pqc/crypto/*/LMS*
69+
rm -rf org/bouncycastle/pqc/crypto/*/HSS*
6570
rm -rf org/bouncycastle/pqc/crypto/*/EncryptionKey*
6671
rm -rf org/bouncycastle/pqc/crypto/*/BitStringT*
72+
rm org/bouncycastle/pqc/jcajce/spec/LMS*
6773
rm -rf org/bouncycastle/crypto/*/test
6874
rm -rf org/bouncycastle/crypto/*/IndexGenerator*
6975
rm -rf org/bouncycastle/util/utiltest
@@ -539,7 +545,10 @@ Implementation-Version: $version.0
539545
%
540546

541547
cp ../../../../pg/src/test/resources/org/bouncycastle/openpgp/test/bigpub.asc classes/org/bouncycastle/openpgp/test/bigpub.asc
548+
cp ../../../../pg/src/test/resources/org/bouncycastle/openpgp/test/eddsa-sks-pub-keyring.asc classes/org/bouncycastle/openpgp/test/eddsa-sks-pub-keyring.asc
542549
cp ../../../../pg/src/test/resources/org/bouncycastle/openpgp/test/longSigSubPack.asc classes/org/bouncycastle/openpgp/test/longSigSubPack.asc
550+
(dbase=`pwd`; cd ../../../../pg/src/test/resources/; tar cf - pgpdata | (cd $dbase/classes; tar xf -))
551+
543552

544553
(cd classes; jar cmf pg.mf ../../bcpg-jdk12-$base.jar org)
545554
java -classpath ../jce-jdk12-$base.jar:classes org.bouncycastle.openpgp.test.RegressionTest

‎core/src/main/jdk1.3/org/bouncycastle/asn1/StreamUtil.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ static int findLimit(InputStream in)
1717
{
1818
if (in instanceof LimitedInputStream)
1919
{
20-
return ((LimitedInputStream)in).getRemaining();
20+
return ((LimitedInputStream)in).getLimit();
2121
}
2222
else if (in instanceof ASN1InputStream)
2323
{

‎core/src/test/jdk1.3/org/bouncycastle/asn1/test/InputStreamTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ public void performTest()
7878
testWithByteArray(classCast2, "unknown object encountered: class org.bouncycastle.asn1.BERTaggedObjectParser");
7979
testWithByteArray(classCast3, "unknown object encountered in constructed OCTET STRING: class org.bouncycastle.asn1.DLTaggedObject");
8080

81-
testWithByteArray(memoryError1, "corrupted stream - out of bounds length found: 2078365180 >= 110");
82-
testWithByteArray(memoryError2, "corrupted stream - out of bounds length found: 2102504523 >= 110");
81+
testWithByteArray(memoryError1, "corrupted stream - out of bounds length found: 2078365180 >= 39");
82+
testWithByteArray(memoryError2, "corrupted stream - out of bounds length found: 2102504523 >= 39");
8383
}
8484

8585
private void testWithByteArray(byte[] data, String message)

‎pkix/src/main/jdk1.2/org/bouncycastle/cms/bc/BcCMSContentEncryptorBuilder.java‎

Lines changed: 0 additions & 124 deletions
This file was deleted.

0 commit comments

Comments
 (0)