You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by lh...@apache.org on 2021/12/23 14:07:39 UTC

[pulsar] 03/03: Fix invalid setting of enabled ciphers to fix warning from BoringSSL

This is an automated email from the ASF dual-hosted git repository.

lhotari pushed a commit to branch branch-2.8
in repository https://gitbox.apache.org/repos/asf/pulsar.git

commit ef4c8e5fef94ea1c581e72651c26cfa8da37c669
Author: Lari Hotari <lh...@apache.org>
AuthorDate: Tue Dec 21 16:18:42 2021 +0200

    Fix invalid setting of enabled ciphers to fix warning from BoringSSL
    
    (cherry picked from commit 185c1bf62cbb2afbd565ec674585e7834aaddc66)
---
 .../org/apache/pulsar/common/util/keystoretls/KeyStoreSSLContext.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/keystoretls/KeyStoreSSLContext.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/keystoretls/KeyStoreSSLContext.java
index 3825d80..987a32b 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/keystoretls/KeyStoreSSLContext.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/keystoretls/KeyStoreSSLContext.java
@@ -185,9 +185,7 @@ public class KeyStoreSSLContext {
 
     private SSLEngine configureSSLEngine(SSLEngine sslEngine) {
         sslEngine.setEnabledProtocols(protocols.toArray(new String[0]));
-        if (this.ciphers == null) {
-            sslEngine.setEnabledCipherSuites(sslEngine.getSupportedCipherSuites());
-        } else {
+        if (this.ciphers != null) {
             sslEngine.setEnabledCipherSuites(this.ciphers.toArray(new String[0]));
         }