Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update BouncyCastle to 1.64 #52185

Merged
merged 4 commits into from Feb 18, 2020
Merged

Update BouncyCastle to 1.64 #52185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31bcb54
Update BouncyCastle to 1.64
jkakavas Feb 11, 2020
e7ed823
Add missing classes
jkakavas Feb 11, 2020
e3eda35
Adjust tests to changes in BC internals
jkakavas Feb 11, 2020
aedc7a3
checkstyle dammit
jkakavas Feb 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildSrc/version.properties
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@ joda = 2.10.4
# - plugins/ingest-attachment (transitive dependency, check the upstream POM)
# - distribution/tools/plugin-cli
# - x-pack/plugin/security
bouncycastle = 1.61
bouncycastle=1.64
# test dependencies
randomizedrunner = 2.7.6
junit = 4.12
Expand Down
1 change: 0 additions & 1 deletion plugins/ingest-attachment/licenses/bcmail-jdk15on-1.61.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/ingest-attachment/licenses/bcmail-jdk15on-1.64.jar.sha1
View file
Open in desktop
@@ -0,0 +1 @@
7a2601f0a1d336966cca03edb04a69ba0f5f25d9
1 change: 0 additions & 1 deletion plugins/ingest-attachment/licenses/bcpkix-jdk15on-1.61.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/ingest-attachment/licenses/bcpkix-jdk15on-1.64.jar.sha1
View file
Open in desktop
@@ -0,0 +1 @@
3dac163e20110817d850d17e0444852a6d7d0bd7
1 change: 0 additions & 1 deletion plugins/ingest-attachment/licenses/bcprov-jdk15on-1.61.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/ingest-attachment/licenses/bcprov-jdk15on-1.64.jar.sha1
View file
Open in desktop
@@ -0,0 +1 @@
1467dac1b787b5ad2a18201c0c281df69882259e
8 changes: 8 additions & 0 deletions x-pack/plugin/security/cli/build.gradle
View file
Open in desktop
Expand Up @@ -24,6 +24,14 @@ forbiddenPatterns {
exclude '**/*.jks'
}

thirdPartyAudit {
ignoreMissingClasses(
// Used in org.bouncycastle.pqc.crypto.qtesla.QTeslaKeyEncodingTests
'junit.framework.Assert',
'junit.framework.TestCase'
)
}

if (BuildParams.inFipsJvm) {
test.enabled = false
jarHell.enabled = false
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugin/security/cli/licenses/bcpkix-jdk15on-1.61.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions x-pack/plugin/security/cli/licenses/bcpkix-jdk15on-1.64.jar.sha1
View file
Open in desktop
@@ -0,0 +1 @@
3dac163e20110817d850d17e0444852a6d7d0bd7
1 change: 0 additions & 1 deletion x-pack/plugin/security/cli/licenses/bcprov-jdk15on-1.61.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions x-pack/plugin/security/cli/licenses/bcprov-jdk15on-1.64.jar.sha1
View file
Open in desktop
@@ -0,0 +1 @@
1467dac1b787b5ad2a18201c0c281df69882259e
6 changes: 3 additions & 3 deletions .../cli/src/test/java/org/elasticsearch/xpack/security/cli/CertificateGenerateToolTests.java
View file
Open in desktop
Expand Up @@ -7,12 +7,12 @@

import com.google.common.jimfs.Configuration;
import com.google.common.jimfs.Jimfs;
import org.bouncycastle.asn1.DLTaggedObject;
import org.elasticsearch.core.internal.io.IOUtils;
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
import org.bouncycastle.asn1.ASN1Sequence;
import org.bouncycastle.asn1.ASN1String;
import org.bouncycastle.asn1.DEROctetString;
import org.bouncycastle.asn1.DERTaggedObject;
import org.bouncycastle.asn1.pkcs.Attribute;
import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
import org.bouncycastle.asn1.x509.Extension;
Expand Down Expand Up @@ -489,8 +489,8 @@ private void assertSubjAltNames(GeneralNames subjAltNames, CertificateInformatio
assertThat(seq.size(), equalTo(2));
assertThat(seq.getObjectAt(0), instanceOf(ASN1ObjectIdentifier.class));
assertThat(seq.getObjectAt(0).toString(), equalTo(CN_OID));
assertThat(seq.getObjectAt(1), instanceOf(DERTaggedObject.class));
DERTaggedObject taggedName = (DERTaggedObject) seq.getObjectAt(1);
assertThat(seq.getObjectAt(1), instanceOf(DLTaggedObject.class));
DLTaggedObject taggedName = (DLTaggedObject) seq.getObjectAt(1);
assertThat(taggedName.getTagNo(), equalTo(0));
assertThat(taggedName.getObject(), instanceOf(ASN1String.class));
assertThat(taggedName.getObject().toString(), Matchers.isIn(certInfo.commonNames));
Expand Down
4 changes: 2 additions & 2 deletions ...y/cli/src/test/java/org/elasticsearch/xpack/security/cli/HttpCertificateCommandTests.java
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@
import joptsimple.OptionSet;
import org.bouncycastle.asn1.DERIA5String;
import org.bouncycastle.asn1.DEROctetString;
import org.bouncycastle.asn1.DERSequence;
import org.bouncycastle.asn1.DLSequence;
import org.bouncycastle.asn1.pkcs.Attribute;
import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
import org.bouncycastle.asn1.x509.Extension;
Expand Down Expand Up @@ -599,7 +599,7 @@ private void verifyCertificationRequest(PKCS10CertificationRequest csr, String c
final Attribute[] extensionAttributes = csr.getAttributes(PKCSObjectIdentifiers.pkcs_9_at_extensionRequest);
assertThat(extensionAttributes, arrayWithSize(1));
assertThat(extensionAttributes[0].getAttributeValues(), arrayWithSize(1));
assertThat(extensionAttributes[0].getAttributeValues()[0], instanceOf(DERSequence.class));
assertThat(extensionAttributes[0].getAttributeValues()[0], instanceOf(DLSequence.class));

// We register 1 extension - the subject alternative names
final Extensions extensions = Extensions.getInstance(extensionAttributes[0].getAttributeValues()[0]);
Expand Down