You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2026/09/28 09:24:55 UTC
(hbase) branch master updated: HBASE-30404 Bump org.bouncycastle:bcprov-jdk18on from 1.84 to 1.86 (#8684)
This is an automated email from the ASF dual-hosted git repository.
Apache9 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new 3aec0f740dc HBASE-30404 Bump org.bouncycastle:bcprov-jdk18on from 1.84 to 1.86 (#8684)
3aec0f740dc is described below
commit 3aec0f740dc8392688a4c0b387abeb4a7a644224
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Mon Sep 28 17:24:49 2026 +0800
HBASE-30404 Bump org.bouncycastle:bcprov-jdk18on from 1.84 to 1.86 (#8684)
Signed-off-by: Dávid Paksy <pa...@apache.org>
---
.../hadoop/hbase/io/crypto/tls/TestHBaseHostnameVerifier.java | 4 +---
.../org/apache/hadoop/hbase/io/crypto/tls/X509TestContext.java | 7 ++-----
.../org/apache/hadoop/hbase/security/AbstractTestMutualTls.java | 9 ++++-----
pom.xml | 2 +-
4 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/tls/TestHBaseHostnameVerifier.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/tls/TestHBaseHostnameVerifier.java
index e5fd85f9b87..ae1b3936ce7 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/tls/TestHBaseHostnameVerifier.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/tls/TestHBaseHostnameVerifier.java
@@ -21,7 +21,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
-import java.lang.invoke.MethodHandles;
import java.security.KeyPair;
import java.security.Security;
import java.security.cert.CertificateFactory;
@@ -58,8 +57,7 @@ public class TestHBaseHostnameVerifier {
public static void setupClass() throws Exception {
Security.addProvider(new BouncyCastleProvider());
X500NameBuilder caNameBuilder = new X500NameBuilder(BCStyle.INSTANCE);
- caNameBuilder.addRDN(BCStyle.CN,
- MethodHandles.lookup().lookupClass().getCanonicalName() + " Root CA");
+ caNameBuilder.addRDN(BCStyle.CN, TestHBaseHostnameVerifier.class.getSimpleName() + " Root CA");
KeyPair keyPair = X509TestHelpers.generateKeyPair(X509KeyType.EC);
X509Certificate caCert = X509TestHelpers.newSelfSignedCACert(caNameBuilder.build(), keyPair);
certificateCreator = new CertificateCreator(keyPair, caCert);
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/tls/X509TestContext.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/tls/X509TestContext.java
index 8e6b998983f..d405dc2da44 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/tls/X509TestContext.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/tls/X509TestContext.java
@@ -21,7 +21,6 @@ import static java.util.Objects.requireNonNull;
import java.io.File;
import java.io.IOException;
-import java.lang.invoke.MethodHandles;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
@@ -455,14 +454,12 @@ public final class X509TestContext {
private void createCertificates(String... subjectAltNames)
throws GeneralSecurityException, IOException, OperatorCreationException {
X500NameBuilder caNameBuilder = new X500NameBuilder(BCStyle.INSTANCE);
- caNameBuilder.addRDN(BCStyle.CN,
- MethodHandles.lookup().lookupClass().getCanonicalName() + " Root CA");
+ caNameBuilder.addRDN(BCStyle.CN, getClass().getSimpleName() + " Root CA");
trustStoreCertificate =
X509TestHelpers.newSelfSignedCACert(caNameBuilder.build(), trustStoreKeyPair);
X500NameBuilder nameBuilder = new X500NameBuilder(BCStyle.INSTANCE);
- nameBuilder.addRDN(BCStyle.CN,
- MethodHandles.lookup().lookupClass().getCanonicalName() + " Zookeeper Test");
+ nameBuilder.addRDN(BCStyle.CN, getClass().getSimpleName() + " Zookeeper Test");
keyStoreCertificate = newCert(nameBuilder.build(), subjectAltNames);
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/AbstractTestMutualTls.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/AbstractTestMutualTls.java
index 10096fc027e..7090fa21570 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/AbstractTestMutualTls.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/AbstractTestMutualTls.java
@@ -23,7 +23,6 @@ import static org.junit.jupiter.api.Assertions.fail;
import java.io.File;
import java.io.IOException;
-import java.lang.invoke.MethodHandles;
import java.net.InetSocketAddress;
import java.security.Security;
import java.security.cert.X509Certificate;
@@ -182,10 +181,10 @@ public abstract class AbstractTestMutualTls {
// to simulate a good cert with a bad host, we need to create a new cert using the existing
// context's CA/truststore. Here we can pass any random SANS, as long as it won't match
// localhost or any reasonable name that this test might run on.
- X509Certificate cert = x509TestContext.newCert(new X500NameBuilder(BCStyle.INSTANCE)
- .addRDN(BCStyle.CN,
- MethodHandles.lookup().lookupClass().getCanonicalName() + " With Bad Host Test")
- .build(), "www.example.com");
+ X509Certificate cert = x509TestContext.newCert(
+ new X500NameBuilder(BCStyle.INSTANCE)
+ .addRDN(BCStyle.CN, getClass().getSimpleName() + " With Bad Host Test").build(),
+ "www.example.com");
x509TestContext.cloneWithNewKeystoreCert(cert)
.setKeystoreConfigurations(KeyStoreFileType.JKS, confToSet);
break;
diff --git a/pom.xml b/pom.xml
index 61f041f8dd7..e23836de096 100644
--- a/pom.xml
+++ b/pom.xml
@@ -939,7 +939,7 @@
<joni.version>2.2.5</joni.version>
<jcodings.version>1.0.63</jcodings.version>
<spy.version>2.12.3</spy.version>
- <bouncycastle.version>1.84</bouncycastle.version>
+ <bouncycastle.version>1.86</bouncycastle.version>
<skyscreamer.version>1.5.1</skyscreamer.version>
<commons-crypto.version>1.1.0</commons-crypto.version>
<!-- Plugin Dependencies -->