Skip to content

Commit 00889ea

Browse files
dghgitdghgit
committed
updated date in license, add core classes to prov gradle, updated Java 11, Java 15 test script
1 parent d0310c8 commit 00889ea

File tree

5 files changed

+49
-10
lines changed

5 files changed

+49
-10
lines changed

‎LICENSE.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<html>
22
<body bgcolor=#ffffff>
33

4-
Copyright (c) 2000-2021 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
4+
Copyright (c) 2000-2023 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
55
<p>
66
Permission is hereby granted, free of charge, to any person obtaining a copy of this software
77
and associated documentation files (the "Software"), to deal in the Software without restriction,

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ subprojects {
164164
targetCompatibility = 1.8
165165
}
166166

167-
version = '1.70'
167+
version = '1.73'
168168

169169
task testFull(type:Test) {
170170
systemProperties = [

‎buildj2me

+33-2
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,14 @@ then
5050
((cd pg/src/test/j2me; tar cf - * ) | (cd $target/src && tar xf -))
5151

5252
(cd $target;
53+
rm src/org/bouncycastle/test/*.java
54+
rm src/org/bouncycastle/asn1/LocaleUtil.java
5355
rm src/org/bouncycastle/crypto/test/AllTests.java
5456
rm src/org/bouncycastle/crypto/test/SHA3DigestTest.java
5557
rm src/org/bouncycastle/crypto/test/SHAKEDigestTest.java
5658
rm src/org/bouncycastle/crypto/test/NISTECCTest.java
5759
rm src/org/bouncycastle/crypto/test/LEATest.java
60+
rm src/org/bouncycastle/crypto/test/AsconTest.java
5861
rm src/org/bouncycastle/crypto/test/Grain128AEADTest.java
5962
rm src/org/bouncycastle/crypto/test/RadixConverterTest.java
6063
rm src/org/bouncycastle/crypto/test/DigestConstraintsTest.java
@@ -102,12 +105,15 @@ then
102105
rm -rf src/org/bouncycastle/pqc/legacy/crypto/*/NTRU*
103106
rm -rf src/org/bouncycastle/pqc/legacy/crypto/*/BitStringTest*
104107
rm -rf src/org/bouncycastle/pqc/legacy/crypto/*/IndexGenerator*
108+
rm -rf src/org/bouncycastle/pqc/crypto/util/PQCOtherInfo*.java
105109
rm -rf src/org/bouncycastle/pqc/crypto/sphincsplus
106110
rm -rf src/org/bouncycastle/pqc/crypto/xmss
107111
rm -rf src/org/bouncycastle/pqc/crypto/lms
108112
rm -rf src/org/bouncycastle/pqc/crypto/test
109113
rm -rf src/org/bouncycastle/pqc/crypto/sike
110114
rm -rf src/org/bouncycastle/pqc/crypto/picnic
115+
rm -rf src/org/bouncycastle/pqc/crypto/rainbow
116+
rm -rf src/org/bouncycastle/pqc/crypto/gemss
111117
rm src/org/bouncycastle/pqc/crypto/legacy/qtesla/QTeslaKeyEncodingTests.java
112118
rm -rf src/org/bouncycastle/gpg/keybox
113119
rm -rf src/org/bouncycastle/gpg/test
@@ -128,13 +134,20 @@ then
128134
rm src/org/bouncycastle/asn1/test/TypeOfBiometricDataUnitTest.java
129135
rm src/org/bouncycastle/asn1/test/UTCTimeTest.java
130136
rm src/org/bouncycastle/crypto/test/SimpleTestTest.java
137+
rm src/org/bouncycastle/crypto/test/HPKETest*.java
131138
rm src/org/bouncycastle/crypto/test/Argon2Test.java
132139
rm src/org/bouncycastle/crypto/test/AESVectorFileTest.java
133140
rm src/org/bouncycastle/crypto/test/GCMReorderTest.java
134141
rm src/org/bouncycastle/crypto/test/HCFamilyVecTest.java
135142
rm src/org/bouncycastle/crypto/test/RSABlindedTest.java
136143
rm src/org/bouncycastle/crypto/test/SP80038GTest.java
137144
rm src/org/bouncycastle/crypto/digests/Blake3Digest.java
145+
rm src/org/bouncycastle/crypto/digests/Blake2sxDigest.java
146+
rm src/org/bouncycastle/crypto/digests/Blake2spDigest.java
147+
rm src/org/bouncycastle/crypto/digests/Blake2bpDigest.java
148+
rm src/org/bouncycastle/crypto/test/Blake2bp*.java
149+
rm src/org/bouncycastle/crypto/test/Blake2sx*.java
150+
rm src/org/bouncycastle/crypto/test/Blake2sp*.java
138151
rm src/org/bouncycastle/crypto/macs/Blake3Mac.java
139152
rm src/org/bouncycastle/crypto/test/Blake3*.java
140153
rm src/org/bouncycastle/crypto/params/Blake3*.java
@@ -183,10 +196,15 @@ then
183196
rm -r src/org/bouncycastle/apache
184197
rm -r src/org/bouncycastle/voms
185198
rm -r src/org/bouncycastle/math/ec/tools
199+
rm -f src/org/bouncycastle/crypto/*/PhotonB*
200+
rm -f src/org/bouncycastle/crypto/*/Elephant*
201+
rm -f src/org/bouncycastle/crypto/*/ISAP*
202+
rm -f src/org/bouncycastle/crypto/*/Sparkle*
203+
rm -f src/org/bouncycastle/crypto/*/Xoo*
186204
rm src/org/bouncycastle/cert/test/ExternalKeyTest.java
187205
rm src/org/bouncycastle/mozilla/SignedPublicKeyAndChallenge.java
188206

189-
for i in src/org/bouncycastle/pqc/crypto/*/*.java src/org/bouncycastle/pqc/crypto/*/*/*.java src/org/bouncycastle/pqc/math/*/*.java src/org/bouncycastle/pqc/math/*/*/*.java src/org/bouncycastle/crypto/engines/*.java
207+
for i in src/org/bouncycastle/pqc/crypto/*/*.java src/org/bouncycastle/pqc/crypto/*/*/*.java src/org/bouncycastle/pqc/math/*/*.java src/org/bouncycastle/pqc/math/*/*/*.java src/org/bouncycastle/crypto/digests/*.java src/org/bouncycastle/crypto/engines/*.java src/org/bouncycastle/bcpg/*.java src/org/bouncycastle/openpgp/*.java
190208
do
191209
ed $i <<%%
192210
g/ .Override/d
@@ -262,6 +280,20 @@ g/java.util.Collections/s//java.util.HashMap/
262280
g/Collections.EMPTY_MAP/s//new HashMap()/
263281
w
264282
q
283+
%
284+
285+
ed src/org/bouncycastle/cert/cmp/CMSProcessableCMPCertificate.java <<%
286+
g/\.\.\. /s//[]/g
287+
g/^ *.Override/s///
288+
w
289+
q
290+
%
291+
292+
ed src/org/bouncycastle/cert/crmf/CertificateRepMessageBuilder.java <<%
293+
g/\.\.\. /s//[]/g
294+
g/^ *.Override/s///
295+
w
296+
q
265297
%
266298
)
267299

@@ -359,7 +391,6 @@ q
359391
org.bouncycastle.pqc.legacy.crypto.rainbow \
360392
org.bouncycastle.pqc.legacy.crypto.mceliece \
361393
org.bouncycastle.pqc.legacy.crypto.gmss \
362-
org.bouncycastle.pqc.math.linearalgebra \
363394
org.bouncycastle.util \
364395
org.bouncycastle.util.encoders \
365396
org.bouncycastle.util.test > /dev/null \

‎prov/build.gradle

+8
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ dependencies {
55
jar.archiveBaseName = "bcprov-$vmrange"
66

77

8+
sourceSets {
9+
main {
10+
java {
11+
srcDirs '../core/src/main/java'
12+
}
13+
}
14+
}
15+
816
task sourcesJar(type: Jar) {
917
archiveBaseName = jar.archiveBaseName
1018
classifier = 'sources'

‎run_test.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,24 @@ q
1919
done
2020
)
2121

22-
javac -d /tmp/classes.jakarta -classpath build/artifacts/jdk1.8/jars/bcprov-jdk18on-172.jar:build/artifacts/jdk1.8/jars/bcutil-jdk18on-172.jar:build/artifacts/jdk1.8/jars/bcpkix-jdk18on-172.jar:build/artifacts/jdk1.8/jars/bcjmail-jdk18on-172.jar:/opt/junit/junit.jar:libs/jakarta.mail-2.0.1.jar:libs/jakarta.activation-api-2.0.0.jar /tmp/jakarta.test/org/bouncycastle/mail/smime/test/*.java
23-
java -cp /tmp/classes.jakarta:build/artifacts/jdk1.8/jars/bcprov-jdk18on-172.jar:build/artifacts/jdk1.8/jars/bcpkix-jdk18on-172.jar:build/artifacts/jdk1.8/jars/bcutil-jdk18on-172.jar:build/artifacts/jdk1.8/jars/bcjmail-jdk18on-172.jar:/opt/junit/junit.jar:libs/jakarta.mail-2.0.1.jar:libs/jakarta.activation-api-2.0.0.jar:libs/activation.jar org.bouncycastle.mail.smime.test.AllTests
22+
javac -d /tmp/classes.jakarta -classpath build/artifacts/jdk1.8/jars/bcprov-jdk18on-173.jar:build/artifacts/jdk1.8/jars/bcutil-jdk18on-173.jar:build/artifacts/jdk1.8/jars/bcpkix-jdk18on-173.jar:build/artifacts/jdk1.8/jars/bcjmail-jdk18on-173.jar:/opt/junit/junit.jar:libs/jakarta.mail-2.0.1.jar:libs/jakarta.activation-api-2.0.0.jar /tmp/jakarta.test/org/bouncycastle/mail/smime/test/*.java
23+
java -cp /tmp/classes.jakarta:build/artifacts/jdk1.8/jars/bcprov-jdk18on-173.jar:build/artifacts/jdk1.8/jars/bcpkix-jdk18on-173.jar:build/artifacts/jdk1.8/jars/bcutil-jdk18on-173.jar:build/artifacts/jdk1.8/jars/bcjmail-jdk18on-173.jar:/opt/junit/junit.jar:libs/jakarta.mail-2.0.1.jar:libs/jakarta.activation-api-2.0.0.jar:libs/activation.jar org.bouncycastle.mail.smime.test.AllTests
2424

2525
)
2626

2727
(
2828
export JAVA_HOME=/opt/jdk-11.0.1
2929
export PATH=$JAVA_HOME/bin:$PATH
3030

31-
javac -d /tmp/classes.jdk11 -classpath build/artifacts/jdk1.8/jars/bcprov-jdk18on-172.jar:/opt/junit/junit.jar prov/src/test/jdk1.11/org/bouncycastle/jcajce/provider/test/XDHKeyTest.java
32-
java -cp /tmp/classes.jdk11:build/artifacts/jdk1.8/jars/bcprov-jdk18on-172.jar:/opt/junit/junit.jar org.bouncycastle.jcajce.provider.test.XDHKeyTest
31+
javac -d /tmp/classes.jdk11 -classpath build/artifacts/jdk1.8/jars/bcprov-jdk18on-173.jar:/opt/junit/junit.jar prov/src/test/jdk1.11/org/bouncycastle/jcajce/provider/test/XDHKeyTest.java
32+
java -cp /tmp/classes.jdk11:build/artifacts/jdk1.8/jars/bcprov-jdk18on-173.jar:/opt/junit/junit.jar org.bouncycastle.jcajce.provider.test.XDHKeyTest
3333

3434
)
3535

3636
(
3737
export JAVA_HOME=/opt/jdk-15
3838
export PATH=$JAVA_HOME/bin:$PATH
3939

40-
javac -d /tmp/classes.jdk15 -classpath build/artifacts/jdk1.8/jars/bcprov-jdk18on-172.jar:/opt/junit/junit.jar prov/src/test/jdk1.15/org/bouncycastle/jcajce/provider/test/EdDSA15Test.java
41-
java -cp /tmp/classes.jdk15:build/artifacts/jdk1.8/jars/bcprov-jdk18on-172.jar:/opt/junit/junit.jar org.bouncycastle.jcajce.provider.test.EdDSA15Test
40+
javac -d /tmp/classes.jdk15 -classpath build/artifacts/jdk1.8/jars/bcprov-jdk18on-173.jar:/opt/junit/junit.jar prov/src/test/jdk1.15/org/bouncycastle/jcajce/provider/test/EdDSA15Test.java
41+
java -cp /tmp/classes.jdk15:build/artifacts/jdk1.8/jars/bcprov-jdk18on-173.jar:/opt/junit/junit.jar org.bouncycastle.jcajce.provider.test.EdDSA15Test
4242
)

0 commit comments

Comments
 (0)