Skip to content

Commit 56112ea

Browse files
dghgitdghgit
committed
compatibility updates
1 parent f335799 commit 56112ea

File tree

15 files changed

+1470
-180
lines changed

15 files changed

+1470
-180
lines changed

‎ant/jdk13.xml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,16 @@
4545
<exclude name="**/PKIXNameConstraints*.java" />
4646
<exclude name="**/ExtendedPKIX*.java" />
4747
<exclude name="**/RFC3281*.java" />
48+
<exclude name="**/sike/*.java" />
4849
<exclude name="**/CertPathValidatorUtilities.java" />
4950
<exclude name="**/JDKPKCS12StoreParameter.java" />
50-
<exclude name="**/NTRU*.java" />
5151
<exclude name="**/IndexGenerator.java" />
52-
<exclude name="**/ntru/**/*.java" />
52+
<exclude name="**/legacy/**/ntru/**/*.java" />
5353
<exclude name="**/xmss/**/*.java" />
5454
<exclude name="**/lms/*.java" />
5555
<exclude name="**/asymmetric/DSTU*.java" />
5656
<exclude name="**/asymmetric/dstu/*.java" />
57+
<exclude name="**/Logging*.java" />
5758
<exclude name="**/provider/config/PKCS12StoreParameter.java" />
5859
</fileset>
5960
<fileset dir="util/src/main/java">
@@ -72,6 +73,8 @@
7273
<exclude name="**/JCEEC5*.java" />
7374
<exclude name="**/provider/JCEEC*.java" />
7475
<exclude name="**/EC5*.java" />
76+
<exclude name="**/SIKE*.java" />
77+
<exclude name="**/sike/*.java" />
7578
<exclude name="**/CertPathReviewer*.java" />
7679
<exclude name="**/PKIXCertPathReviewer.java" />
7780
<exclude name="**/PKIXAttrCert*.java" />
@@ -81,11 +84,11 @@
8184
<exclude name="**/RFC3281*.java" />
8285
<exclude name="**/CertPathValidatorUtilities.java" />
8386
<exclude name="**/JDKPKCS12StoreParameter.java" />
84-
<exclude name="**/NTRU*.java" />
87+
<exclude name="**/legacy/**/NTRU*.java" />
8588
<exclude name="**/XMSS*.java" />
8689
<exclude name="**/spec/LMS*.java" />
8790
<exclude name="**/IndexGenerator.java" />
88-
<exclude name="**/ntru/**/*.java" />
91+
<exclude name="**/legacy/**/ntru/**/*.java" />
8992
<exclude name="**/xmss/**/*.java" />
9093
<exclude name="**/lms/**/*.java" />
9194
<exclude name="**/ecgost12/**/*.java" />
@@ -140,6 +143,7 @@
140143
<exclude name="**/GetInstanceTest.java" />
141144
<exclude name="**/ntru/**/*.java" />
142145
<exclude name="**/NTRU*.java" />
146+
<exclude name="**/SIKE*.java" />
143147
<exclude name="**/XMSS*.java" />
144148
<exclude name="**/HSS*.java" />
145149
<exclude name="**/LMS*.java" />
@@ -154,6 +158,7 @@
154158
<exclude name="**/pqc/**/EncryptionKeyTest.java" />
155159
<exclude name="**/pqc/**/BitStringTest.java" />
156160
<exclude name="**/pqc/**/QTESLA*.java" />
161+
<exclude name="**/pqc/legacy/**/*.java" />
157162
<exclude name="**/jcajce/provider/test/*.java" />
158163
<exclude name="**/jce/provider/test/JceTestUtil.java" />
159164
<exclude name="**/speedy/**" />
@@ -187,6 +192,7 @@
187192
<exclude name="**/NTRU*.java" />
188193
<exclude name="**/LMS*.java" />
189194
<exclude name="**/HSS*.java" />
195+
<exclude name="**/SIKE*.java" />
190196
<exclude name="**/crypto/engines/test/BitStringTest.java" />
191197
<exclude name="**/crypto/engines/test/AllTests.java" />
192198
<exclude name="**/crypto/signers/test/AllTests.java" />
@@ -201,6 +207,7 @@
201207
<exclude name="**/ChaCha20Poly1305Test.java"/>
202208
<exclude name="**/speedy/**" />
203209
<exclude name="**/cavp/**" />
210+
<exclude name="**/legacy/**" />
204211
<exclude name="**/KDFFeedbackGeneratorTest.java" />
205212
<exclude name="**/KDFDoublePipelineIteratorGeneratorTest.java" />
206213
<exclude name="**/PSSTest.java" />
@@ -264,6 +271,7 @@
264271
<exclude name="**/rsa/PSSParamSpec.java" />
265272
</fileset>
266273
<fileset dir="pkix/src/main/jdk1.4" includes="**/*.java" />
274+
<fileset dir="util/src/main/jdk1.4" includes="**/*.java" />
267275
<fileset dir="pg/src/main/jdk1.4" includes="**/*.java" />
268276
<fileset dir="pg/src/main/jdk1.3" includes="**/*.java" />
269277
<fileset dir="core/src/test/jdk1.4" includes="**/*.java" />

‎build1-1‎

Lines changed: 103 additions & 85 deletions
Large diffs are not rendered by default.

‎build1-2‎

Lines changed: 34 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ mkdir -p $jdk12src
5454
((cd pg/src/test/jdk1.3 && tar cf - * ) | (cd $jdk12src && tar xf -))
5555
((cd pg/src/test/jdk1.2 && tar cf - * ) | (cd $jdk12src && tar xf -))
5656
((cd util/src/main/java && tar cf - * ) | (cd $jdk12src && tar xf -))
57+
((cd util/src/main/jdk1.4 && tar cf - * ) | (cd $jdk12src && tar xf -))
5758
((cd util/src/main/javadoc && tar cf - * ) | (cd $jdk12src && tar xf -))
5859

5960
find $jdk12src -name "*.java" -exec scripts/trim.sh \{\} \;
@@ -63,12 +64,17 @@ find $jdk12src -name "*.java" -exec scripts/usejcecert.sh \{\} \;
6364
cd $jdk12src
6465

6566
rm -rf org/bouncycastle/math/ec/rfc8032/test
67+
rm org/bouncycastle/pqc/legacy/crypto/qtesla/QTeslaKeyEncodingTests.java
6668
rm -rf org/bouncycastle/crypto/test/ntru
67-
rm -rf org/bouncycastle/pqc/math/ntru
68-
rm -rf org/bouncycastle/pqc/crypto/ntru
69-
rm -rf org/bouncycastle/pqc/crypto/*/NTRU*
69+
rm -rf org/bouncycastle/pqc/legacy/math/ntru
70+
rm -rf org/bouncycastle/pqc/math/test
71+
rm -rf org/bouncycastle/pqc/math/ntru/test
72+
rm -rf org/bouncycastle/pqc/legacy/crypto/ntru
73+
rm -rf org/bouncycastle/pqc/legacy/crypto/*/NTRU*
74+
rm -rf org/bouncycastle/pqc/crypto/test
7075
rm -rf org/bouncycastle/pqc/crypto/xmss
7176
rm -rf org/bouncycastle/pqc/crypto/lms
77+
rm -rf org/bouncycastle/pqc/crypto/sike
7278
rm -rf org/bouncycastle/pqc/jcajce/provider/xmss
7379
rm -rf org/bouncycastle/pqc/jcajce/provider/XMSS*
7480
rm -rf org/bouncycastle/pqc/jcajce/provider/LMS*
@@ -81,25 +87,32 @@ find $jdk12src -name "*.java" -exec scripts/usejcecert.sh \{\} \;
8187
rm -rf org/bouncycastle/pqc/crypto/*/CMCEVectorTest*
8288
rm -rf org/bouncycastle/pqc/crypto/*/FrodoVectorTest*
8389
rm -rf org/bouncycastle/pqc/crypto/*/SABERVectorTest*
90+
rm -rf org/bouncycastle/pqc/crypto/*/NTRUKAT*
91+
rm -rf org/bouncycastle/pqc/legacy/crypto/test/*
8492
rm org/bouncycastle/pqc/jcajce/spec/LMS*
93+
rm -rf org/bouncycastle/crypto/constraints/Logging*
8594
rm -rf org/bouncycastle/crypto/*/test
8695
rm -rf org/bouncycastle/crypto/*/IndexGenerator*
8796
rm -rf org/bouncycastle/crypto/test/SimpleTestTest.java
8897
rm -rf org/bouncycastle/util/utiltest
8998
rm -rf org/bouncycastle/mail
9099
rm -rf org/bouncycastle/mime
91100
rm org/bouncycastle/pkix/test/CheckerTest.java
101+
rm org/bouncycastle/crypto/test/RadixConverterTest.java
92102
rm org/bouncycastle/pkix/jcajce/Revocation*.java
93103
rm org/bouncycastle/pkix/jcajce/X509RevocationChecker.java
94104
rm org/bouncycastle/pkix/jcajce/RFC3280*.java
95105
rm org/bouncycastle/cms/jcajce/JceKeyTransAuthEnvelopedRecipient.java
96106
rm org/bouncycastle/cms/jcajce/JceAADStream.java
97107
rm org/bouncycastle/jcajce/provider/keystore/util/ParameterUtil.java
108+
rm -r org/bouncycastle/pqc/jcajce/*/SIKE*
109+
rm -r org/bouncycastle/pqc/jcajce/provider/sike
98110
rm -rf org/bouncycastle/jce/provider/test/SimpleTestTest.java
99111
rm -rf org/bouncycastle/oer
100112
rm -rf org/bouncycastle/i18n/test
101113
rm -rf org/bouncycastle/i18n/filter/test
102114
rm -rf org/bouncycastle/math/ec/test
115+
rm -rf org/bouncycastle/pqc/math/test
103116
rm -rf org/bouncycastle/crypto/tls/test
104117
rm -rf org/bouncycastle/crypto/test/GCMReorderTest.java
105118
rm -rf org/bouncycastle/crypto/test/NISTECCTest.java
@@ -207,7 +220,7 @@ then
207220

208221
tar cf - index.html LICENSE.html CONTRIBUTORS.html docs | (cd $artifacts/lcrypto-jdk12-$base && tar xf -)
209222
((cd $jdk12src && tar cf - java org/bouncycastle/LICENSE.java \
210-
org/bouncycastle/math org/bouncycastle/internal org/bouncycastle/crypto org/bouncycastle/util org/bouncycastle/asn1 org/bouncycastle/pqc/math org/bouncycastle/pqc/crypto org/bouncycastle/pqc/asn1 ) | (cd $artifacts/lcrypto-jdk12-$base/src && tar xf -))
223+
org/bouncycastle/math org/bouncycastle/internal org/bouncycastle/crypto org/bouncycastle/util org/bouncycastle/asn1 org/bouncycastle/pqc/legacy org/bouncycastle/pqc/math org/bouncycastle/pqc/crypto org/bouncycastle/pqc/asn1 ) | (cd $artifacts/lcrypto-jdk12-$base/src && tar xf -))
211224
(
212225
cd $artifacts/lcrypto-jdk12-$base;
213226

@@ -271,9 +284,9 @@ then
271284

272285
echo "compiling"
273286

274-
(cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src *.java */*.java internal/*/*/*.java )
275-
(cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src a*/*/*.java )
276-
(cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src [bcdefghijklmnopqrstuv]*/*/*.java )
287+
(cd src/org/bouncycastle; javac -J-mx768m -d ../../../classes -classpath ../../../classes:../../../src *.java */*.java internal/*/*/*.java )
288+
(cd src/org/bouncycastle; javac -J-mx768m -d ../../../classes -classpath ../../../classes:../../../src a*/*/*.java )
289+
(cd src/org/bouncycastle; javac -J-mx768m -d ../../../classes -classpath ../../../classes:../../../src [bcdefghijklmnopqrstuv]*/*/*.java )
277290

278291
echo "lightweight regression test"
279292

@@ -379,20 +392,20 @@ then
379392

380393
echo "compiling"
381394

382-
(cd src/javax/crypto; javac -d ../../../classes -classpath ../../../classes:../../../src *.java */*.java)
383-
(cd src/java/security/spec; javac -d ../../../../classes -classpath ../../../../classes *.java )
384-
385-
(cd src/org/bouncycastle/jce/cert; javac -d ../../../../../classes -classpath ../../../../../classes:../../../../../src *.java )
386-
(cd src/org/bouncycastle/jcajce/provider; javac -d ../../../../../classes -classpath ../../../../../classes:../../../../../src a*/*.java )
387-
(cd src/org/bouncycastle/jcajce/provider; javac -d ../../../../../classes -classpath ../../../../../classes:../../../../../src [cis]*/*.java )
388-
(cd src/org/bouncycastle/jcajce/provider; javac -d ../../../../../classes -classpath ../../../../../classes:../../../../../src [abcis]*/*/*.java )
389-
(cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src *.java a*/*.java a*/*/*.java a*/*/*/*.java internal/*/*/*.java )
390-
(cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src [bc]*/*.java [bc]*/*/*.java [bc]*/*/*/*.java )
391-
(cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src [j]*/*.java [j]*/*/*.java [j]*/*/*/*.java [j]*/*/*/*/*.java)
392-
(cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src [mop]*/*.java [mop]*/*/*.java [mop]*/*/*/*.java [mop]*/*/*/*/*.java)
393-
(cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src [tu]*/*.java [tu]*/*/*.java [tu]*/*/*/*.java)
394-
(cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src [x]*/*/*.java)
395-
(cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src [x]*/*.java)
395+
(cd src/javax/crypto; javac -J-mx768m -d ../../../classes -classpath ../../../classes:../../../src *.java */*.java)
396+
(cd src/java/security/spec; javac -J-mx768m -d ../../../../classes -classpath ../../../../classes *.java )
397+
398+
(cd src/org/bouncycastle/jce/cert; javac -J-mx768m -d ../../../../../classes -classpath ../../../../../classes:../../../../../src *.java )
399+
(cd src/org/bouncycastle/jcajce/provider; javac -J-mx768m -d ../../../../../classes -classpath ../../../../../classes:../../../../../src a*/*.java )
400+
(cd src/org/bouncycastle/jcajce/provider; javac -J-mx768m -d ../../../../../classes -classpath ../../../../../classes:../../../../../src [cis]*/*.java )
401+
(cd src/org/bouncycastle/jcajce/provider; javac -J-mx768m -d ../../../../../classes -classpath ../../../../../classes:../../../../../src [abcis]*/*/*.java )
402+
(cd src/org/bouncycastle; javac -J-mx768m -d ../../../classes -classpath ../../../classes:../../../src *.java a*/*.java a*/*/*.java a*/*/*/*.java internal/*/*/*.java )
403+
(cd src/org/bouncycastle; javac -J-mx768m -d ../../../classes -classpath ../../../classes:../../../src [bc]*/*.java [bc]*/*/*.java [bc]*/*/*/*.java )
404+
(cd src/org/bouncycastle; javac -J-mx768m -d ../../../classes -classpath ../../../classes:../../../src [j]*/*.java [j]*/*/*.java [j]*/*/*/*.java [j]*/*/*/*/*.java)
405+
(cd src/org/bouncycastle; javac -J-mx768m -d ../../../classes -classpath ../../../classes:../../../src [mop]*/*.java [mop]*/*/*.java [mop]*/*/*/*.java [mop]*/*/*/*/*.java)
406+
(cd src/org/bouncycastle; javac -J-mx768m -d ../../../classes -classpath ../../../classes:../../../src [tu]*/*.java [tu]*/*/*.java [tu]*/*/*/*.java)
407+
(cd src/org/bouncycastle; javac -J-mx768m -d ../../../classes -classpath ../../../classes:../../../src [x]*/*/*.java)
408+
(cd src/org/bouncycastle; javac -J-mx768m -d ../../../classes -classpath ../../../classes:../../../src [x]*/*.java)
396409

397410

398411

0 commit comments

Comments
 (0)