Merge pull request #12 from j256/support-java-base64

jaaufauvre · web-flow · commit cb7852c0c098 · 2021-01-10T17:46:10.000Z
Remove any line separators from the key data
diff --git a/src/main/java/com/mastercard/developer/utils/EncryptionUtils.java b/src/main/java/com/mastercard/developer/utils/EncryptionUtils.java
@@ -47,13 +47,15 @@ public static PrivateKey loadDecryptionKey(String keyFilePath) throws GeneralSec
             // OpenSSL / PKCS#1 Base64 PEM encoded file
             keyDataString = keyDataString.replace(PKCS_1_PEM_HEADER, "");
             keyDataString = keyDataString.replace(PKCS_1_PEM_FOOTER, "");
+            keyDataString = keyDataString.replace(System.lineSeparator(), "");
             return readPkcs1PrivateKey(base64Decode(keyDataString));
         }
 
         if (keyDataString.contains(PKCS_8_PEM_HEADER)) {
             // PKCS#8 Base64 PEM encoded file
             keyDataString = keyDataString.replace(PKCS_8_PEM_HEADER, "");
             keyDataString = keyDataString.replace(PKCS_8_PEM_FOOTER, "");
+            keyDataString = keyDataString.replace(System.lineSeparator(), "");
             return readPkcs8PrivateKey(base64Decode(keyDataString));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -47,13 +47,15 @@ public static PrivateKey loadDecryptionKey(String keyFilePath) throws GeneralSec`
`47`	`47`	`// OpenSSL / PKCS#1 Base64 PEM encoded file`
`48`	`48`	`keyDataString = keyDataString.replace(PKCS_1_PEM_HEADER, "");`
`49`	`49`	`keyDataString = keyDataString.replace(PKCS_1_PEM_FOOTER, "");`
	`50`	`+ keyDataString = keyDataString.replace(System.lineSeparator(), "");`
`50`	`51`	`return readPkcs1PrivateKey(base64Decode(keyDataString));`
`51`	`52`	`}`
`52`	`53`
`53`	`54`	`if (keyDataString.contains(PKCS_8_PEM_HEADER)) {`
`54`	`55`	`// PKCS#8 Base64 PEM encoded file`
`55`	`56`	`keyDataString = keyDataString.replace(PKCS_8_PEM_HEADER, "");`
`56`	`57`	`keyDataString = keyDataString.replace(PKCS_8_PEM_FOOTER, "");`
	`58`	`+ keyDataString = keyDataString.replace(System.lineSeparator(), "");`
`57`	`59`	`return readPkcs8PrivateKey(base64Decode(keyDataString));`
`58`	`60`	`}`
`59`	`61`