diff -Nru bouncycastle-1.55/bc-build.properties bouncycastle-1.56/bc-build.properties
--- bouncycastle-1.55/bc-build.properties 2016-08-17 04:58:34.000000000 +0000
+++ bouncycastle-1.56/bc-build.properties 2016-12-22 09:08:44.000000000 +0000
@@ -1,8 +1,8 @@
-release.suffix: 155
-release.name: 1.55
-release.version: 1.55.0
-release.debug: false
+release.suffix: 156
+release.name: 1.56
+release.version: 1.56.0
+release.debug: true
mail.jar.home: /opt/javamail/mail.jar
activation.jar.home: /opt/jaf/activation.jar
diff -Nru bouncycastle-1.55/build1-1 bouncycastle-1.56/build1-1
--- bouncycastle-1.55/build1-1 2015-12-29 01:39:18.000000000 +0000
+++ bouncycastle-1.56/build1-1 2016-12-20 01:53:07.000000000 +0000
@@ -112,10 +112,10 @@
rm org/bouncycastle/jce/provider/test/DetDSATest.java
rm org/bouncycastle/jce/provider/test/AEADTest.java
rm -rf org/bouncycastle/jce/provider/JDKPKCS12StoreParameter.java
- rm -rf org/bouncycastle/jcajce/provider/asymmetric/ec/ECUtils.java
rm -rf org/bouncycastle/jcajce/provider/config/PKCS12StoreParameter.java
rm -rf org/bouncycastle/jcajce/provider/test/PrivateConstructorTest.java
rm -rf org/bouncycastle/jcajce/provider/test/ECAlgorithmParametersTest.java
+ rm -rf org/bouncycastle/jcajce/provider/test/RandomTest.java
rm org/bouncycastle/asn1/test/GetInstanceTest.java
rm org/bouncycastle/asn1/test/ASN1SequenceParserTest.java
rm org/bouncycastle/asn1/test/OctetStringTest.java
@@ -124,6 +124,7 @@
rm -rf org/bouncycastle/jcajce/provider/asymmetric/dstu
rm -rf org/bouncycastle/jcajce/provider/asymmetric/DSTU*.java
rm -rf org/bouncycastle/jcajce/provider/asymmetric/util/EC5*.java
+ rm -rf org/bouncycastle/jcajce/provider/drbg
rm org/bouncycastle/asn1/test/EnumeratedTest.java
rm -rf org/bouncycastle/pqc/jcajce
rm -r org/bouncycastle/crypto/test/speedy
@@ -377,15 +378,16 @@
(cd src/javax/crypto; javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip *.java */*.java)
(cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip asn1/*.java)
+ (cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip asn1/[bx]*/*.java)
+ (cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip asn1/[pc]*/*.java)
(cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip crypto/*.java)
(cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip *.java pqc/*/*.java)
(cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip u*/*.java )
(cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip [jk]*/*.java)
(cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip [lmn]*/*.java)
(cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip asn1/*.java)
- (cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip asn1/x*/*.java)
- (cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip asn1/c*/*.java)
- (cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip asn1/[abdefghijklmnopqrstuvwyz]*/*.java)
+ (cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip asn1/[adefghijk]*/*.java)
+ (cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip asn1/[lmnoqrstuvwyz]*/*.java)
(cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip asn1/*/*/*.java)
(cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip crypto/[ade]*/*.java)
(cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip crypto/[gimpsu]*/*.java)
@@ -401,7 +403,8 @@
(cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip jce/*/*.java)
(cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip util/*/*.java)
(cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip [abc]*/*/*/*.java)
- (cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip [ijm]*/*/*/*.java)
+ (cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip j*/*/*/*.java)
+ (cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip m*/*/*/*.java)
(cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip [ptuvx]*/*/*/*.java)
(cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip x509/*.java x509/*/*.java)
diff -Nru bouncycastle-1.55/build1-2 bouncycastle-1.56/build1-2
--- bouncycastle-1.55/build1-2 2016-08-16 00:25:12.000000000 +0000
+++ bouncycastle-1.56/build1-2 2016-12-21 11:02:03.000000000 +0000
@@ -110,10 +110,10 @@
rm org/bouncycastle/jce/provider/test/DetDSATest.java
rm org/bouncycastle/jce/provider/test/AEADTest.java
rm -rf org/bouncycastle/jce/provider/JDKPKCS12StoreParameter.java
- rm -rf org/bouncycastle/jcajce/provider/asymmetric/ec/ECUtils.java
rm -rf org/bouncycastle/jcajce/provider/config/PKCS12StoreParameter.java
rm -rf org/bouncycastle/jcajce/provider/test/PrivateConstructorTest.java
rm -rf org/bouncycastle/jcajce/provider/test/ECAlgorithmParametersTest.java
+ rm -rf org/bouncycastle/jcajce/provider/test/RandomTest.java
rm org/bouncycastle/asn1/test/GetInstanceTest.java
rm org/bouncycastle/asn1/test/ASN1SequenceParserTest.java
rm org/bouncycastle/asn1/test/OctetStringTest.java
@@ -344,7 +344,8 @@
(cd src/org/bouncycastle/jce/cert; javac -d ../../../../../classes -classpath ../../../../../classes:../../../../../src *.java )
(cd src/org/bouncycastle/jcajce/provider; javac -d ../../../../../classes -classpath ../../../../../classes:../../../../../src [abcis]*/*.java [abcis]*/*/*.java )
- (cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src *.java [abci]*/*.java [abci]*/*/*.java [abci]*/*/*/*.java )
+ (cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src *.java a*/*.java a*/*/*.java a*/*/*/*.java )
+ (cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src *.java [bci]*/*.java [bci]*/*/*.java [bci]*/*/*/*.java )
(cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src [jmop]*/*.java [jmop]*/*/*.java [jmop]*/*/*/*.java [jmop]*/*/*/*/*.java)
(cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src [tuvx]*/*.java [tuvx]*/*/*.java [tuvx]*/*/*/*.java)
diff -Nru bouncycastle-1.55/build.gradle bouncycastle-1.56/build.gradle
--- bouncycastle-1.55/build.gradle 2015-08-23 06:43:28.000000000 +0000
+++ bouncycastle-1.56/build.gradle 2016-11-13 00:30:06.000000000 +0000
@@ -41,7 +41,7 @@
sourceCompatibility = 1.5
targetCompatibility = 1.5
- version = '1.52'
+ version = '1.56-SNAPSHOT'
test {
systemProperty 'bc.test.data.home', bcTestDataHome
@@ -52,7 +52,7 @@
}
}
-test.dependsOn([':core:test', ':prov:test', ':pkix:test', ':mail:test', 'pg:test'])
+test.dependsOn([':core:test', ':prov:test', ':tls:test', ':pkix:test', ':mail:test', 'pg:test'])
cobertura {
coverageDirs = [
@@ -60,7 +60,8 @@
"${rootProject.projectDir}/mail/build/classes/main",
"${rootProject.projectDir}/pg/build/classes/main",
"${rootProject.projectDir}/pkix/build/classes/main",
- "${rootProject.projectDir}/prov/build/classes/main"
+ "${rootProject.projectDir}/prov/build/classes/main",
+ "${rootProject.projectDir}/tls/build/classes/main",
]
coverageSourceDirs = [
"${rootProject.projectDir}/core/src/main/java",
@@ -68,6 +69,7 @@
"${rootProject.projectDir}/pg/src/main/java",
"${rootProject.projectDir}/pkix/src/main/java",
"${rootProject.projectDir}/prov/src/main/java",
+ "${rootProject.projectDir}/tls/src/main/java",
]
coverageMergeDatafiles = [
file("${rootProject.projectDir}/core/build/cobertura/cobertura.ser"),
@@ -75,6 +77,7 @@
file("${rootProject.projectDir}/pg/build/cobertura/cobertura.ser"),
file("${rootProject.projectDir}/pkix/build/cobertura/cobertura.ser"),
file("${rootProject.projectDir}/prov/build/cobertura/cobertura.ser"),
+ file("${rootProject.projectDir}/tls/build/cobertura/cobertura.ser"),
]
auxiliaryClasspath += files("${rootProject.projectDir}/core/build/classes/main")
coverageFormats = ['html', 'xml']
diff -Nru bouncycastle-1.55/CONTRIBUTORS.html bouncycastle-1.56/CONTRIBUTORS.html
--- bouncycastle-1.55/CONTRIBUTORS.html 2016-08-20 00:55:56.000000000 +0000
+++ bouncycastle-1.56/CONTRIBUTORS.html 2016-12-23 04:32:48.000000000 +0000
@@ -6,6 +6,14 @@
Donors
+The following people and organisations donated financially to help with the release of 1.56:
+
+DidiSoft, Cotiviti, Atanas Krachev, Encryptomatic LLC, LogicalAnswersIncSupporter
+
+
+We also wish to acknowledge financial support from the Core Infrastructure Initiative towards developing the TLS API and JSSE provider.
+
+
The following people and organisations donated financially to help with the release of 1.55:
Digistamp, RAM NAG
@@ -32,7 +40,7 @@
Organisations
-- Holders of Crypto Workshop Support Contracts. Over 100 hours of consulting time left over from these has been contributed back to working on the Bouncy Castle APIs. You know who you are!
+- Holders of Crypto Workshop Support Contracts. Without the consulting time left over from support contracts being contributed back to working on the Bouncy Castle APIs, progress would be impossible. You know who you are!
- Atlassian Software Systems donation of Confluence and JIRA licences.
- Grier Forensics, for collaborating in the development of the S/MIME Toolkit and DANE SMIMEA functionality.
- TU-Darmstadt, Computer Science Department, RBG, for the initial
@@ -408,7 +416,7 @@
- Sebastian Oerding <sebastian.oerding@robotron.de> Fixes to toString() in x509.CertificatePolicies.
- Kai Kramer <kai.kramer@gmail.com> Code to deal with orphaned chain certificates in the PKCS#12 KeyStore.
- Benoit Charles <benoit.charles@opentrust.com> Fix for IES data length check on decryption.
-- Niko <nfink95@gmail.com> fix to cast issue in getOutputSize() for ECIES.
+- Niko <nfink95@gmail.com> fix to cast issue in getOutputSize() for ECIES.
- akwizgran<https://github.com/akwizgran> Fixed clone of key in Blake2bDgest copy constructor, blake2b reset issue for varient keys.
- Matthias Edelhoff <Matthias.Edelhoff@cryptovision.com> BasicConstraintsValidation pathlen fix in PKIX certpath classes.
- Lukasz Deputat <lukasz.deputat@gmail.com> Fixed bugs in TlsUtils read methods [#BJA-592].
@@ -417,6 +425,11 @@
- Slawomir Jaranowski<https://github.com/slawekjaranowski> Patch to make cipher/hash/signature name methods in PGP internal API public.
- Andrey Vasilyev<https://github.com/andrey-vasilyev> Initial implementation of GOST R 34.11-2012.
- William Glanton <wglanton77@gmail.com> Fixed bug in Poly1305 [#BJA-620].
+- jdvorak001<https://github.com/jdvorak001> Speed improvements for ASN.1 ObjectIdentifier cache.
+- Joseph Naegele <jnaegele@grierforensics.com> Patch for handling multiple certificates in a DANE SMIMEA entry.
+- Andrew Bonventre<https://github.com/andybons> NullPointer patch for WNafUtil.
+- The Google Security Team (Project Wycheproof) <https://github.com/google/wycheproof> defect analysis and additional test cases for the provider.
+- The Intel Security Team <> analysis detecting the issue with AESFastEngine (CVE-2016-1000339), additional suggestions for improvement to hardening of AESEngine.