fix ssl enabled protocol

polardb · Mar 31, 2022 · 2fe3dac · 2fe3dac
1 parent 5d7304e
commit 2fe3dac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/polardbx-net/src/main/java/com/alibaba/polardbx/ssl/SslConstant.java b/polardbx-net/src/main/java/com/alibaba/polardbx/ssl/SslConstant.java
@@ -41,7 +41,7 @@ public class SslConstant {
             SSLContext sslContext = SSLContext.getInstance("TLS");
             sslContext.init(null, null, null);
             sslSocket = (SSLSocket) sslContext.getSocketFactory().createSocket();
-            String[] enabledProtocols = sslSocket.getEnabledProtocols();
+            enabledProtocols = sslSocket.getEnabledProtocols();
             if (enabledProtocols != null && enabledProtocols.length > 0) {
                 String enabledProtocol = enabledProtocols[0];
                 PROTOCOL = enabledProtocol;

diff --git a/polardbx-net/src/main/java/com/alibaba/polardbx/ssl/SslContextFactory.java b/polardbx-net/src/main/java/com/alibaba/polardbx/ssl/SslContextFactory.java
@@ -214,7 +214,7 @@ protected static byte[] parseFileContent(byte[] pem, String beginDelimiter, Stri
         String data = new String(pem);
         String[] tokens = data.split(beginDelimiter);
         tokens = tokens[1].split(endDelimiter);
-        return Base64.getDecoder().decode(tokens[0]);
+        return Base64.getDecoder().decode(tokens[0].replaceAll("[\r\n]", ""));
     }
 
     protected static RSAPrivateKey generatePrivateKeyFromDER(byte[] keyBytes) throws InvalidKeySpecException,