From 289d0b2a771c96b662a0bf4dcc6603a8c8e074b8 Mon Sep 17 00:00:00 2001 From: fnglei Date: Thu, 9 Feb 2023 01:50:16 +0000 Subject: [PATCH] =?UTF-8?q?:checkered=5Fflag:=20=E4=BF=AE=E5=A4=8D=20Windo?= =?UTF-8?q?ws=20=E5=B9=B3=E5=8F=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/topiam/employee/common/util/X509Utilities.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/util/X509Utilities.java b/eiam-common/src/main/java/cn/topiam/employee/common/util/X509Utilities.java index 35dc96bb..cda48814 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/util/X509Utilities.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/util/X509Utilities.java @@ -46,9 +46,9 @@ import org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder; */ public class X509Utilities { - public static final String BEGIN_CERT = "-----BEGIN CERTIFICATE-----\n"; + public static final String BEGIN_CERT = "-----BEGIN CERTIFICATE-----"; public static final String END_CERT = "-----END CERTIFICATE-----"; - public static final String BEGIN_KEY = "-----BEGIN RSA PRIVATE KEY-----\n"; + public static final String BEGIN_KEY = "-----BEGIN RSA PRIVATE KEY-----"; public static final String END_KEY = "-----END RSA PRIVATE KEY-----"; public static byte[] getDer(String combinedKeyAndCertPem, String begin, String end) { @@ -65,7 +65,7 @@ public class X509Utilities { public static String keyCleanup(String pem) { return pem.replace(BEGIN_CERT, "").replace(END_CERT, "").replace(BEGIN_KEY, "") - .replace(END_KEY, "").replace("\n", "").trim(); + .replace(END_KEY, "").replace("\n", "").trim().replace("\r",""); } public static X509Certificate getCertificate(byte[] der) throws CertificateException {