Skip to content

Commit d05327a

Browse files
dghgitdghgit
committed
update
1 parent 05a06f2 commit d05327a

8 files changed

Lines changed: 79 additions & 3 deletions

File tree

‎ant/bc+-build.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,7 @@
367367
<attribute name="Codebase" value="*" />
368368
<attribute name="Application-Library-Allowable-Codebase" value="*" />
369369
<attribute name="Caller-Allowable-Codebase" value="*" />
370+
<attribute name="Automatic-Module-Name" value="org.bouncycastle.provider" />
370371
</manifestElements>
371372
</compile>
372373

@@ -549,6 +550,7 @@
549550
<attribute name="Codebase" value="*" />
550551
<attribute name="Application-Library-Allowable-Codebase" value="*" />
551552
<attribute name="Caller-Allowable-Codebase" value="*" />
553+
<attribute name="Automatic-Module-Name" value="org.bouncycastle.mail" />
552554
</manifestElements>
553555
</compile>
554556

@@ -593,6 +595,7 @@
593595
<attribute name="Codebase" value="*" />
594596
<attribute name="Application-Library-Allowable-Codebase" value="*" />
595597
<attribute name="Caller-Allowable-Codebase" value="*" />
598+
<attribute name="Automatic-Module-Name" value="org.bouncycastle.tls" />
596599
</manifestElements>
597600
</compile>
598601

@@ -644,6 +647,7 @@
644647
<attribute name="Codebase" value="*" />
645648
<attribute name="Application-Library-Allowable-Codebase" value="*" />
646649
<attribute name="Caller-Allowable-Codebase" value="*" />
650+
<attribute name="Automatic-Module-Name" value="org.bouncycastle.pkix" />
647651
</manifestElements>
648652
</compile>
649653

@@ -694,6 +698,7 @@
694698
<attribute name="Codebase" value="*" />
695699
<attribute name="Application-Library-Allowable-Codebase" value="*" />
696700
<attribute name="Caller-Allowable-Codebase" value="*" />
701+
<attribute name="Automatic-Module-Name" value="org.bouncycastle.pg" />
697702
</manifestElements>
698703
</compile>
699704

‎bc-build.properties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

2-
release.suffix: 159
3-
release.name: 1.59
4-
release.version: 1.59
2+
release.suffix: 160
3+
release.name: 1.60
4+
release.version: 1.60.0
55
release.debug: false
66

77
mail.jar.home: /opt/javamail/mail.jar

‎build1-1‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ find $jdk11src -name "*.java" -exec scripts/useseccert.sh \{\} \;
7575
rm -rf org/bouncycastle/math/ec/test
7676
rm -rf org/bouncycastle/math/ec/custom/test
7777
rm -rf org/bouncycastle/math/ec/custom/sec/test
78+
rm -rf org/bouncycastle/crypto/CryptoServicesPermission.java
7879
rm -rf org/bouncycastle/crypto/tls/test
7980
rm -rf org/bouncycastle/crypto/test/GCMReorderTest.java
8081
rm -rf org/bouncycastle/jce/cert
@@ -544,6 +545,8 @@ then
544545
rm -rf src/org/bouncycastle/voms
545546
rm -rf src/org/bouncycastle/sasn1
546547
rm -rf src/org/bouncycastle/asn1/test
548+
rm -rf src/org/bouncycastle/gpg/keybox
549+
rm -rf src/org/bouncycastle/gpg/test
547550
rm -f src/org/bouncycastle/openpgp/test/DSA2Test.java
548551
rm -f src/org/bouncycastle/openpgp/test/PGPUnicodeTest.java
549552
rm -f src/org/bouncycastle/openpgp/examples/DSAElGamalKeyRingGenerator.java
@@ -569,6 +572,12 @@ then
569572
/@RELEASE_NAME@/s//$version/
570573
w
571574
q
575+
%
576+
577+
ed src/org/bouncycastle/openpgp/test/RegressionTest.java <<%
578+
g/new PGPKeyRingTest(),/d
579+
w
580+
q
572581
%
573582

574583
(cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src:../../../../jce-jdk11-$base/classes:$JDK11PATH/lib/classes.zip bcpg/*.java bcpg/*/*.java openpgp/*.java )

‎build1-2‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ find $jdk12src -name "*.java" -exec scripts/usejcecert.sh \{\} \;
9696
rm -rf org/bouncycastle/jce/provider/test/X509LDAP*.java
9797
rm -rf org/bouncycastle/jce/provider/test/MQVTest*.java
9898
rm -rf org/bouncycastle/jce/provider/test/AlgorithmParametersTest.java
99+
rm -rf org/bouncycastle/jce/provider/test/GOST3410KeyPairTest.java
99100
rm -rf org/bouncycastle/jce/spec/ECNamedCurveSpec.java
100101
rm -rf org/bouncycastle/util/encoders/test/*.java
101102
rm -rf org/bouncycastle/x509/PKIXCertPathReviewer.java
@@ -505,8 +506,11 @@ then
505506
rm -rf src/org/bouncycastle/sasn1
506507
rm -rf src/org/bouncycastle/est
507508
rm -rf src/org/bouncycastle/asn1/test
509+
rm -rf src/org/bouncycastle/gpg/keybox
510+
rm -rf src/org/bouncycastle/gpg/test
508511
rm -f src/org/bouncycastle/openpgp/test/DSA2Test.java
509512
rm -f src/org/bouncycastle/openpgp/test/PGPUnicodeTest.java
513+
rm -f src/org/bouncycastle/openpgp/test/PGPKeyRingTest.java
510514
find src -name AllTests.java -exec rm {} \;
511515

512516
javadoc -windowtitle "$WINDOWTITLE" -doctitle "$DOCTITLE" \
@@ -528,6 +532,12 @@ then
528532
/@RELEASE_NAME@/s//$version/
529533
w
530534
q
535+
%
536+
537+
ed src/org/bouncycastle/openpgp/test/RegressionTest.java <<%
538+
g/new PGPKeyRingTest(),/d
539+
w
540+
q
531541
%
532542

533543
(cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src:../../../../jce-jdk12-$base/classes */*.java */*/*.java)

‎build15+‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,12 @@ else
3131
fi
3232
fi
3333

34+
if [ -f build/artifacts/jdk1.5/jars/bcprov-jdk15on*.jar ]
35+
then
36+
tar cf - prov/src/main/resources/META-INF | (cd build/artifacts/jdk1.5/jars/; tar xf -)
37+
cd build/artifacts/jdk1.5/jars/
38+
mv prov/src/main/resources/META-INF .
39+
jar uf bcprov-jdk15on*.jar META-INF
40+
jar uf bcprov-ext-jdk15on*.jar META-INF
41+
rm -r prov META-INF
42+
fi

‎buildj2me‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ then
2828
((cd core/src/main/java; tar cf - * ) | (cd $target/src && tar xf -))
2929
((cd core/src/main/javadoc; tar cf - * ) | (cd $target/src && tar xf -))
3030
((cd core/src/main/jdk1.4; tar cf - * ) | (cd $target/src && tar xf -))
31+
((cd core/src/main/jdk1.1; tar cf - org ) | (cd $target/src && tar xf -))
3132
((cd core/src/main/j2me; tar cf - * ) | (cd $target/src && tar xf -))
3233
((cd core/src/test/java; tar cf - * ) | (cd $target/src && tar xf -))
3334
((cd core/src/test/j2me; tar cf - * ) | (cd $target/src && tar xf -))
@@ -44,6 +45,7 @@ then
4445
rm src/org/bouncycastle/crypto/test/AllTests.java
4546
rm src/org/bouncycastle/crypto/test/SHA3DigestTest.java
4647
rm src/org/bouncycastle/crypto/test/SHAKEDigestTest.java
48+
rm src/org/bouncycastle/crypto/CryptoServicesPermission.java
4749
rm src/org/bouncycastle/util/StreamParser.java
4850
rm src/org/bouncycastle/util/StreamParsingException.java
4951
rm src/org/bouncycastle/asn1/util/Dump.java
@@ -69,6 +71,7 @@ then
6971
rm src/org/bouncycastle/asn1/test/PublishTrustAnchorsTest.java
7072
rm src/org/bouncycastle/asn1/test/RevokeRequestTest.java
7173
rm -rf src/org/bouncycastle/math/ec/rfc7748/test
74+
rm -rf src/org/bouncycastle/math/ec/rfc8032/test
7275
rm -rf src/org/bouncycastle/math/raw/test
7376
rm -rf src/org/bouncycastle/math/test
7477
rm -rf src/org/bouncycastle/pqc/math/ntru
@@ -78,6 +81,8 @@ then
7881
rm -rf src/org/bouncycastle/pqc/crypto/*/IndexGenerator*
7982
rm -rf src/org/bouncycastle/pqc/crypto/xmss
8083
rm -rf src/org/bouncycastle/pqc/crypto/test/XMSS*
84+
rm -rf src/org/bouncycastle/gpg/keybox
85+
rm -rf src/org/bouncycastle/gpg/test
8186
rm src/org/bouncycastle/asn1/test/MonetaryValueUnitTest.java
8287
rm src/org/bouncycastle/asn1/test/NameOrPseudonymUnitTest.java
8388
rm src/org/bouncycastle/asn1/test/NetscapeCertTypeTest.java

‎scripts/jdk1.1ed.sh‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@ w
2020
q
2121
%
2222

23+
ed org/bouncycastle/asn1/BEROctetString.java <<%
24+
g/private final ASN1OctetString/s/final//
25+
g/private final int/s/final//
26+
w
27+
q
28+
%
29+
2330
ed org/bouncycastle/asn1/DERIA5String.java <<%
2431
g/private final byte.. *string;/s/final//
2532
w
@@ -44,6 +51,12 @@ w
4451
q
4552
%
4653

54+
ed org/bouncycastle/asn1/crmf/DhSigStatic.java <<%
55+
g/private final /s/final//
56+
w
57+
q
58+
%
59+
4760
ed org/bouncycastle/asn1/pkcs/PBKDF2Params.java <<%
4861
g/private final ASN1OctetString octStr;/s/final//
4962
g/private final ASN1Integer iterationCount;/s/final//
@@ -73,6 +86,12 @@ w
7386
q
7487
%
7588

89+
ed org/bouncycastle/crypto/agreement/kdf/GSKKDFParameters.java <<%
90+
g/private final /s/final//
91+
w
92+
q
93+
%
94+
7695
ed org/bouncycastle/crypto/signers/ISOTrailers.java <<%
7796
g/private static final Map.* trailerMap;/s/final//
7897
w
@@ -274,3 +293,16 @@ g/private.*final.*;/s/final//
274293
w
275294
q
276295
%
296+
297+
ed org/bouncycastle/jcajce/spec/DHDomainParameterSpec.java <<%
298+
g/private.*final.*;/s/final//
299+
w
300+
q
301+
%
302+
303+
ed org/bouncycastle/jcajce/provider/asymmetric/dh/KeyAgreementSpi.java <<%
304+
g/private.*final.*;/s/final//
305+
w
306+
q
307+
%
308+

‎scripts/jdk1.2ed.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,9 @@ w
5858
q
5959
%
6060

61+
ed org/bouncycastle/crypto/CryptoServicesRegistrar.java <<%
62+
g/private final String/s/final//
63+
g/private final Class/s/final//
64+
w
65+
q
66+
%

0 commit comments

Comments
 (0)