Skip to content

Commit 7a23b5a

Browse files
committed
compatibility updates.
1 parent 559ca6c commit 7a23b5a

4 files changed

Lines changed: 73 additions & 325 deletions

File tree

build1-1

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,13 @@ find $jdk11src -name "*.java" -exec scripts/useseccert.sh \{\} \;
7777
rm -rf org/bouncycastle/pqc/math/ntru
7878
rm -rf org/bouncycastle/pqc/crypto/ntru
7979
rm -rf org/bouncycastle/pqc/crypto/xmss
80+
rm -rf org/bouncycastle/pqc/crypto/sphincsplus
8081
rm -rf org/bouncycastle/pqc/crypto/*/NTRU*
8182
rm -rf org/bouncycastle/pqc/crypto/*/XMSS*
8283
rm -rf org/bouncycastle/pqc/crypto/*/EncryptionKey*
8384
rm -rf org/bouncycastle/pqc/crypto/*/BitStringT*
8485
rm -rf org/bouncycastle/pqc/crypto/test/QT*
86+
rm -rf org/bouncycastle/pqc/crypto/test/SphincsPlus*
8587
rm -rf org/bouncycastle/crypto/*/test
8688
rm -rf org/bouncycastle/crypto/test/NISTECCTest.java
8789
rm -rf org/bouncycastle/crypto/test/SP80038GTest.java
@@ -225,7 +227,9 @@ find $jdk11src -name "*.java" -exec scripts/useseccert.sh \{\} \;
225227
rm -rf org/bouncycastle/pkix/test/TestUtil*
226228
rm org/bouncycastle/cms/jcajce/JceKeyTransAuthEnvelopedRecipient.java
227229
rm -rf org/bouncycastle/mime/
230+
rm -rf org/bouncycastle/its/
228231
rm -rf org/bouncycastle/tsp/test
232+
rm -rf org/bouncycastle/its/test
229233
rm -rf org/bouncycastle/est/test
230234
rm -rf org/bouncycastle/dvcs/test
231235
rm -rf org/bouncycastle/openssl/test/WriterTest.java
@@ -611,6 +615,7 @@ then
611615
rm -rf src/org/bouncycastle/asn1/*/test
612616
rm -rf src/org/bouncycastle/gpg/keybox
613617
rm -rf src/org/bouncycastle/gpg/test
618+
rm -f src/org/bouncycastle/openpgp/test/PGPCanonicalizedDataGeneratorTest.java
614619
rm -f src/org/bouncycastle/openpgp/test/DSA2Test.java
615620
rm -f src/org/bouncycastle/openpgp/test/PGPUnicodeTest.java
616621
rm -f src/org/bouncycastle/openpgp/test/BcPGPEd25519JcaKeyPairConversionTest.java
@@ -634,6 +639,12 @@ then
634639
echo "compiling"
635640

636641

642+
ed src/org/bouncycastle/gpg/SExpression.java <<%
643+
g/\.\.\. /s//[]/
644+
w
645+
q
646+
%
647+
637648
ed src/org/bouncycastle/bcpg/SignatureSubpacketInputStream.java <<%
638649
g/private.*final.*;/s/final//
639650
w
@@ -644,12 +655,42 @@ q
644655
/@RELEASE_NAME@/s//$version/
645656
w
646657
q
658+
%
659+
660+
ed src/org/bouncycastle/openpgp/PGPExtendedKeyAttribute.java <<%
661+
g/private.*final.*;/s/final//
662+
w
663+
q
664+
%
665+
666+
ed src/org/bouncycastle/openpgp/OpenedPGPKeyData.java <<%
667+
g/private.*final.*;/s/final//
668+
w
669+
q
670+
%
671+
672+
ed src/org/bouncycastle/openpgp/PGPCanonicalizedDataGenerator.java <<%
673+
g/FileNotFoundException/s//IOException/
674+
w
675+
q
676+
%
677+
678+
ed src/org/bouncycastle/openpgp/operator/jcajce/JcePublicKeyDataDecryptorFactoryBuilder.java <<%
679+
g/RSAKey/s//RSAPrivateKey/g
680+
w
681+
q
647682
%
648683

649684
ed src/org/bouncycastle/openpgp/test/RegressionTest.java <<%
650685
g/new PGPKeyRingTest(),/d
651686
w
652687
q
688+
%
689+
690+
ed src/org/bouncycastle/apache/bzip2/CBZip2OutputStream.java <<%
691+
g/private.*final.*;/s/final//
692+
w
693+
q
653694
%
654695

655696
ed src/org/bouncycastle/openpgp/operator/jcajce/JcaKeyFingerprintCalculator.java <<%

pkix/src/main/jdk1.1/org/bouncycastle/cms/SignerInfoGenerator.java

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

0 commit comments

Comments
 (0)