Skip to content

Commit fc1de5c

Browse files
authored
Remove any line separators from the key data
This allows folks to use the java.util.Base64 (at least under Java8) which doesn't handle the line separators. Thanks much for the code!
1 parent 237bdf7 commit fc1de5c

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

src/main/java/com/mastercard/developer/utils/EncryptionUtils.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,15 @@ public static PrivateKey loadDecryptionKey(String keyFilePath) throws GeneralSec
4747
// OpenSSL / PKCS#1 Base64 PEM encoded file
4848
keyDataString = keyDataString.replace(PKCS_1_PEM_HEADER, "");
4949
keyDataString = keyDataString.replace(PKCS_1_PEM_FOOTER, "");
50+
keyDataString = keyDataString.replace(System.lineSeparator(), "");
5051
return readPkcs1PrivateKey(base64Decode(keyDataString));
5152
}
5253

5354
if (keyDataString.contains(PKCS_8_PEM_HEADER)) {
5455
// PKCS#8 Base64 PEM encoded file
5556
keyDataString = keyDataString.replace(PKCS_8_PEM_HEADER, "");
5657
keyDataString = keyDataString.replace(PKCS_8_PEM_FOOTER, "");
58+
keyDataString = keyDataString.replace(System.lineSeparator(), "");
5759
return readPkcs8PrivateKey(base64Decode(keyDataString));
5860
}
5961

0 commit comments

Comments
 (0)