Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-14223 Fix tests for windows

This commit is contained in:
Mike Drob 2020-03-04 10:47:30 -08:00
parent 46bda6bea0
commit dd9b9f2f7f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
solr/core/src/java/org/apache/solr/util/CryptoKeys.java
View File

@ -363,10 +363,9 @@ public final class CryptoKeys {
public RSAKeyPair(URL privateKeyResourceName, URL publicKeyResourceName) throws IOException, InvalidKeySpecException {
try (InputStream inPrivate = privateKeyResourceName.openStream()) {
String privateString = new String(inPrivate.readAllBytes(), StandardCharsets.UTF_8)
.replaceAll("-----[A-Z ]*-----", "")
.replaceAll("\\n", "");
.replaceAll("-----(BEGIN|END) PRIVATE KEY-----", "");
PKCS8EncodedKeySpec privateSpec = new PKCS8EncodedKeySpec(Base64.base64ToByteArray(privateString));
PKCS8EncodedKeySpec privateSpec = new PKCS8EncodedKeySpec(java.util.Base64.getMimeDecoder().decode(privateString));
KeyFactory rsaFactory = KeyFactory.getInstance("RSA");
privateKey = rsaFactory.generatePrivate(privateSpec);
} catch (NoSuchAlgorithmException e) {