Skip to content

Commit ea73791

Browse files
KarolinHemKarolinHem
authored
Merge branch 'bcgit:main' into main
2 parents 1382853 + 09baab6 commit ea73791

File tree

252 files changed

+11699
-1757
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

252 files changed

+11699
-1757
lines changed

‎.gitlab-ci.yml

Lines changed: 33 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
stages:
22
- check
3+
- build
34
- test
45

56
check-code:
@@ -18,35 +19,44 @@ check-code:
1819
- "mail/build/reports"
1920
- "util/build/reports"
2021
- "tls/build/reports"
21-
- "mls/build/reports"
22-
22+
- "mls/build/reports"
23+
24+
ant-build:
25+
stage: build
26+
needs: [ "check-code" ]
27+
script:
28+
- "ecr_login"
29+
- "ecr_pull vm_base_intel latest"
30+
- "ci_docker_run \"vm_base_intel:latest\" \"bc-java\" \"/workspace/bc-java/ci/build_1_8.sh\""
31+
32+
2333
test-code-8:
2434
stage: test
25-
needs: ["check-code"]
35+
needs: [ "check-code" ]
2636
script:
27-
- "ecr_login"
28-
- "ecr_pull vm_base_intel latest"
29-
- "ci_docker_run \"vm_base_intel:latest\" \"bc-java\" \"/workspace/bc-java/ci/test_8.sh\""
37+
- "ecr_login"
38+
- "ecr_pull vm_base_intel latest"
39+
- "ci_docker_run \"vm_base_intel:latest\" \"bc-java\" \"/workspace/bc-java/ci/test_8.sh\""
3040
artifacts:
3141
when: always
3242
reports:
3343
junit:
34-
- "core/build/test-results/**/*.xml"
35-
- "prov/build/test-results/**/*.xml"
36-
- "pg/build/test-results/**/*.xml"
37-
- "pkix/build/test-results/**/*.xml"
38-
- "mail/build/test-results/**/*.xml"
39-
- "util/build/test-results/**/*.xml"
40-
- "tls/build/test-results/**/*.xml"
41-
- "mls/build/test-results/**/*.xml"
44+
- "core/build/test-results/**/*.xml"
45+
- "prov/build/test-results/**/*.xml"
46+
- "pg/build/test-results/**/*.xml"
47+
- "pkix/build/test-results/**/*.xml"
48+
- "mail/build/test-results/**/*.xml"
49+
- "util/build/test-results/**/*.xml"
50+
- "tls/build/test-results/**/*.xml"
51+
- "mls/build/test-results/**/*.xml"
4252

4353
test-code-11:
4454
stage: test
45-
needs: ["check-code"]
55+
needs: [ "check-code" ]
4656
script:
47-
- "ecr_login"
48-
- "ecr_pull vm_base_intel latest"
49-
- "ci_docker_run \"vm_base_intel:latest\" \"bc-java\" \"/workspace/bc-java/ci/test_11.sh\""
57+
- "ecr_login"
58+
- "ecr_pull vm_base_intel latest"
59+
- "ci_docker_run \"vm_base_intel:latest\" \"bc-java\" \"/workspace/bc-java/ci/test_11.sh\""
5060
artifacts:
5161
when: always
5262
reports:
@@ -63,11 +73,11 @@ test-code-11:
6373

6474
test-code-17:
6575
stage: test
66-
needs: ["check-code"]
76+
needs: [ "check-code" ]
6777
script:
68-
- "ecr_login"
69-
- "ecr_pull vm_base_intel latest"
70-
- "ci_docker_run \"vm_base_intel:latest\" \"bc-java\" \"/workspace/bc-java/ci/test_17.sh\""
78+
- "ecr_login"
79+
- "ecr_pull vm_base_intel latest"
80+
- "ci_docker_run \"vm_base_intel:latest\" \"bc-java\" \"/workspace/bc-java/ci/test_17.sh\""
7181
artifacts:
7282
when: always
7383
reports:
@@ -84,7 +94,7 @@ test-code-17:
8494

8595
test-code-21:
8696
stage: test
87-
needs: ["check-code"]
97+
needs: [ "check-code" ]
8898
script:
8999
- "ecr_login"
90100
- "ecr_pull vm_base_intel latest"

‎CONTRIBUTORS.html

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@
452452
<li>catbref &lt;https://github.com/catbref&gt; sample implementation of RFC 7748/Ed25519 (incorporated work from github users Valodim and str4d as well).</li>
453453
<li>gerlion &lt;https://github.com/gerlion&gt; detection of concurrency issue with pre-1.60 EC math library.</li>
454454
<li>fgrieu &lt;fgrieu&#064gmail.com&gt; identification and suggested fixes for possible timing vulnerability in OAEPEncoding and RSACoreEngine.</li>
455-
<li>MTG &lt;https://github.com/mtgag&gt; patch for decoding issues in PKIPublicationInfo and CertifiedKeyPair.</li>
455+
<li>MTG &lt;https://github.com/mtgag&gt; patch for decoding issues in PKIPublicationInfo and CertifiedKeyPair, patch for adding jurisdiction{C,ST,L} to X500 name style.</li>
456456
<li>Andreas Gadermaier &lt;up.gadermaier&#064gmail.com&gt; initial version of Argon2 PBKDF algorithm.</li>
457457
<li>Tony Washer &lt;tony.washer&#64yahoo.co.uk&gt; review of qTesla, Java 1.9 module code, additional test code and debugging for GOST, DSTU, and ECNR algorithms. Initial lightweight implementation of the ZUC ciphers and macs. Additions to LMS/HSS API implementations, fix for truncation issue with big HSS keys, contributions to optimization of LMS/HSS. Patch for XDH/EdDSA key handling and mcEliece decryption using kobaraImai. Initial GCM-SIV, Blake3, and Kangaroo implementation.</li>
458458
<li>Vincent Bouckaert &lt;https://github.com/veebee&gt; initial version of RFC 4998 ASN.1 classes. Debugging and testing of high level RFC 4998 implementation.</li>
@@ -541,6 +541,12 @@
541541
<li>Thomas Devanneaux &lt;tdevanneaux&#064apple.com&gt; - extensions to the HPKE API to support encryption/decryption from byte ranges, allow sender selected ephemeral key.</li>
542542
<li>Norman Maurer &lt;norman_maurer&#064apple.com&gt; - extensions to the HPKE API to support encryption/decryption from byte ranges, allow sender selected ephemeral key.</li>
543543
<li>Bing Shi &lt;roadicing&#064gmail.com&gt; - addition of F2m bounds checking for imported EC F2m curves.</li>
544+
<li>Phil Brown &lt;https://github.com/brownp2k&gt; - additional ant targets for building util and pkix.</li>
545+
<li>Tamas Cservenak &lt;https://github.com/cstamas&gt; - initial patch for supporting Ed25519 keys in GnuPG S-expressions.</li>
546+
<li>chchen-scholar &lt;https://github.com/chchen-scholar&gt; - encoding fix for EccP256CurvePoint.</li>
547+
<li>Seung Yeon &lt;https://github.com/seungyeonpark&gt; - addition of Memoable method implementations to CertPathValidationContext and CertificatePoliciesValidation.</li>
548+
<li>yuhh0328 &lt;https://github.com/yuhh0328&gt; - initial patch for adding ML-KEM support to TLS.</li>
549+
<li>Jan Oupick&yacute; &lt;https://github.com/Honzaik&gt; - update to draft 13 of composite PQC signatures.</li>
544550
</ul>
545551
</body>
546552
</html>

‎ant/bc+-build.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@
250250
windowtitle="Bouncy Castle Library ${release.name} API Specification"
251251
header="&lt;b&gt;Bouncy Castle Cryptography Library ${release.name}&lt;/b&gt;">
252252
<docElements/>
253-
<arg value="${javadoc.args}" />
253+
<arg line="${javadoc.args}" />
254254
<classpath>
255255
<path refid="project.classpath" />
256256
<fileset dir="${artifacts.jars.dir}">
@@ -923,6 +923,7 @@
923923
<fileset dir="${src.dir}" includes="**/tsp/*UnitTest.java" />
924924
<fileset dir="${src.dir}" includes="**/utiltest/*Test.java" />
925925
<fileset dir="${src.dir}" includes="**/util/io/pem/*Test.java" />
926+
<fileset dir="${src.dir}" includes="**/keybox/*Test.java" />
926927
<fileset dir="${src.dir}" includes="**/test/*.java" />
927928
<fileset dir="${src.dir}" includes="**/test/*/*.java" />
928929
<fileset dir="${src.dir}" includes="**/*.asc" />
@@ -953,6 +954,7 @@
953954
</copy>
954955

955956
<delete file="${test.target.src.dir}/org/bouncycastle/pqc/crypto/lms/AllTests.java" />
957+
<delete file="${test.target.src.dir}/org/bouncycastle/gpg/keybox/AllTests.java" />
956958
<delete file="${test.target.src.dir}/org/bouncycastle/x509/CertPathReviewerMessages_de.properties" />
957959
<delete file="${test.target.src.dir}/org/bouncycastle/x509/CertPathReviewerMessages.properties" />
958960

‎ant/build.regexp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11

2-
regexp: <List<PGPSignature>>|<Map<CertID, OCSPResponse>>|<URI[^>]*>>|<[A-Z?][^>@]*[a-zA-Z0-9\\]]>|<[A-Z]>|<[a-z][^>@]*[a-z\\]]>|@SuppressWarnings(.*)|@Override|@Deprecated
2+
regexp: <List<PGPSignature>>|<Map<CertID, OCSPResponse>>|<URI[^>]*>>|<[A-Z?][^>@]*[a-zA-Z0-9\\]]>|<[A-Z]>|<[a-z][^>@]*[a-z\\]]>|@SuppressWarnings(.*)|@Override|@Deprecated|@FunctionalInterface
33

‎ant/jdk13.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@
7979
<exclude name="**/BCEC*.java" />
8080
<exclude name="**/JCEEC5*.java" />
8181
<exclude name="**/provider/JCEEC*.java" />
82+
<exclude name="**/compositesignatures/*.java" />
83+
<exclude name="**/CompositeSignatures.java" />
8284
<exclude name="**/EC5*.java" />
8385
<exclude name="**/SIKE*.java" />
8486
<exclude name="**/Rainbow*.java" />
@@ -259,9 +261,13 @@
259261
<exclude name="**/PKIXRevocationTest.java" />
260262
<exclude name="**/cms/test/AnnotatedKeyTest.java"/>
261263
<exclude name="**/bouncycastle/cms/test/AuthEnvelopedDataTest.java"/>
264+
<exclude name="**/bouncycastle/cms/test/CMSAuthEnvelopedDataStreamGeneratorTest.java"/>
265+
<exclude name="**/bouncycastle/cms/test/GOSTR3410_2012_256CmsSignVerifyDetached.java"/>
266+
<exclude name="**/bouncycastle/cert/test/GOSTR3410_2012_256GenerateCertificate.java"/>
262267
<exclude name="**/its/**" />
263268
</fileset>
264269
<fileset dir="mail/src/test/java">
270+
<exclude name="**/MailGeneralTest.java" />
265271
<exclude name="**/SignedMailValidatorTest.java" />
266272
<exclude name="**/DummyCertPathReviewer.java" />
267273
<exclude name="**/JournalingSecureRandomEncryptTest.java"/>
@@ -290,9 +296,12 @@
290296
</fileset>
291297
<fileset dir="pkix/src/main/jdk1.4" includes="**/*.java" />
292298
<fileset dir="util/src/main/jdk1.4" includes="**/*.java" />
299+
<fileset dir="pg/src/main/jdk1.5" includes="**/*.java" />
300+
<fileset dir="core/src/test/jdk1.4" includes="**/*.java" />
301+
</copy>
302+
<copy todir="${src.dir}" overwrite="true">
293303
<fileset dir="pg/src/main/jdk1.4" includes="**/*.java" />
294304
<fileset dir="pg/src/main/jdk1.3" includes="**/*.java" />
295-
<fileset dir="core/src/test/jdk1.4" includes="**/*.java" />
296305
</copy>
297306
<copy todir="${src.dir}" overwrite="true">
298307
<fileset dir="prov/src/test/jdk1.4" includes="**/*.java" >

‎ant/jdk14.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
<exclude name="**/PKCS12StoreParameter.java"/>
7777
<exclude name="**/JDKPKCS12StoreParameter.java"/>
7878
<exclude name="**/SIKE*.java"/>
79+
<exclude name="**/CompositeSign*.java"/>
7980
<exclude name="**/rainbow/*.java"/>
8081
<exclude name="**/Rainbow*.java"/>
8182
<exclude name="**/XMS*.java"/>
@@ -84,6 +85,7 @@
8485
<exclude name="**/legacy/**/ntru/**/*.java"/>
8586
<exclude name="**/xmss/**/*.java"/>
8687
<exclude name="**/lms/**/*.java"/>
88+
<exclude name="**/asymmetric/compositesignatures/*.java"/>
8789
<exclude name="**/asymmetric/DSTU*.java"/>
8890
<exclude name="**/asymmetric/dstu/*.java"/>
8991
<exclude name="**/asymmetric/ecgost12/*.java"/>
@@ -128,17 +130,21 @@
128130
<fileset dir="pg/src/test/java">
129131
<exclude name="**/keybox/**/*.java"/>
130132
<exclude name="**/gpg/test/*.java"/>
133+
<exclude name="**/BcImplProviderTest.java"/>
131134
</fileset>
132135
<fileset dir="pkix/src/test/java">
133136
<exclude name="**/est/**/*.java"/>
134137
<exclude name="**/pkix/test/RevocationTest.java"/>
135138
<exclude name="**/TimeStampTokenInfoUnitTest.java"/>
136139
<exclude name="**/cms/test/AnnotatedKeyTest.java"/>
137-
<exclude name="**/bouncycastle/cms/test/AuthEnvelopedDataTest.java"/>
140+
<exclude name="**/cms/test/GOSTR3410_2012_256CmsSignVerifyDetached.java"/>
141+
<exclude name="**/cert/test/GOSTR3410_2012_256GenerateCertificate.java"/>
142+
<exclude name="**/bouncycastle/cms/test/*AuthEnvelopedData*Test.java"/>
138143
<exclude name="**/PKIXRevocationTest.java"/>
139144
<exclude name="**/its/**/*.java"/>
140145
</fileset>
141146
<fileset dir="mail/src/test/java">
147+
<exclude name="**/MailGeneralTest.java"/>
142148
<exclude name="**/SignedMailValidatorTest.java"/>
143149
<exclude name="**/DummyCertPathReviewer.java"/>
144150
</fileset>
@@ -199,6 +205,9 @@
199205
<fileset dir="pkix/src/main/javadoc"/>
200206
<fileset dir="pg/src/main/javadoc"/>
201207
</copy>
208+
<copy todir="${src.dir}" overwrite="true">
209+
<fileset dir="pg/src/main/jdk1.5" includes="**/*.java"/>
210+
</copy>
202211
<copy todir="${src.dir}" overwrite="true">
203212
<fileset dir="core/src/main/jdk1.4" includes="**/*.java"/>
204213
<fileset dir="prov/src/main/jdk1.4" includes="**/*.java"/>

‎ant/jdk15+.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<fileset dir="pkix/src/test/resources" includes="**/*.*" />
5555

5656
<fileset dir="pg/src/main/java" includes="**/*.java" />
57+
<fileset dir="pg/src/main/jdk1.5" includes="**/*.java" />
5758
<fileset dir="pg/src/main/javadoc" includes="**/*.html" />
5859
<fileset dir="pg/src/main/java" includes="**/*.properties" />
5960
<fileset dir="pg/src/test/java" includes="**/*.java" />

‎ant/jdk18+.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<property name="artifacts.dir" value="${build.dir}/artifacts/${jdk.name}" />
1010
<property name="src.dir" value="${build.dir}/${jdk.name}" />
1111
<property name="target.prefix" value="jdk18on" />
12-
<property name="javadoc.args" value="-breakiterator" />
12+
<property name="javadoc.args" value="-breakiterator -Xdoclint:none -quiet" />
1313

1414
<target name="clean">
1515
<delete dir="${build.dir}" />

‎bc-build.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
# intended to hold user-specific settings that are *not* committed to
44
# the repository.
55

6-
release.suffix: 178b04
7-
release.name: 1.77.99
8-
release.version: 1.77.99
6+
release.suffix: 17801
7+
release.name: 1.78.1
8+
release.version: 1.78.1
99
release.debug: true
1010

1111
mail.jar.home: ./libs/javax.mail-1.4.7.jar

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ subprojects {
246246
}
247247

248248
tasks.withType(JavaCompile).configureEach {
249-
options.debug = true;
249+
options.debug = false;
250250
}
251251

252252
tasks.withType(Test).configureEach {

0 commit comments

Comments
 (0)