gitee
/
eiam
mirror of https://gitee.com/topiam/eiam
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

🏁 修复 Windows 平台问题

pull/18/head
fnglei 2023-02-09 01:50:16 +00:00 committed by smallbun
parent da63f95e3a
commit 289d0b2a77
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eiam-common/src/main/java/cn/topiam/employee/common/util/X509Utilities.java
View File

@ -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 {