playframework#1298: Unified the private key fetching

Task-Url: playframework#1298
tazmaniax · Mar 10, 2019 · 17859b8 · 17859b8
1 parent 411537d
commit 17859b8
Showing 1 changed file with 11 additions and 14 deletions.
diff --git a/framework/src/play/server/ssl/SslHttpServerContextFactory.java b/framework/src/play/server/ssl/SslHttpServerContextFactory.java
@@ -91,23 +91,20 @@ public PEMKeyManager() {
 
             try (PEMParser keyReader = new PEMParser(new FileReader(Play.getFile(keyFile)))) {
                 final Object object = keyReader.readObject();
-
+
+                PrivateKeyInfo privateKeyInfo = null;
                 if (object instanceof PrivateKeyInfo) {
-                	key = BouncyCastleProvider.getPrivateKey((PrivateKeyInfo)object);
-                } else if (object instanceof PEMEncryptedKeyPair || object instanceof PEMKeyPair) {
-	                JcaPEMKeyConverter converter = new JcaPEMKeyConverter().setProvider("BC");
-	                final KeyPair keyPair;
-	                if (object instanceof PEMEncryptedKeyPair) {
-	                    PEMDecryptorProvider decProv = new JcePEMDecryptorProviderBuilder()
-	                            .build(Play.configuration.getProperty("certificate.password", "secret").toCharArray());
-	                    keyPair = converter.getKeyPair(((PEMEncryptedKeyPair) object).decryptKeyPair(decProv));
-	                } else {
-	                    keyPair = converter.getKeyPair((PEMKeyPair) object);
-	                }
-	                key = keyPair.getPrivate();
+                	privateKeyInfo = (PrivateKeyInfo)object;
+                } else if (object instanceof PEMKeyPair) {
+                	privateKeyInfo = ((PEMKeyPair)object).getPrivateKeyInfo();
+                } else if (object instanceof PEMEncryptedKeyPair) {
+                    PEMDecryptorProvider decProv = new JcePEMDecryptorProviderBuilder()
+                            .build(Play.configuration.getProperty("certificate.password", "secret").toCharArray());
+                    privateKeyInfo = ((PEMEncryptedKeyPair) object).decryptKeyPair(decProv).getPrivateKeyInfo();
                 } else {
-                	throw new UnsupportedOperationException("Unsupported key type '" + object.getClass() + "'");
+                	throw new UnsupportedOperationException("Unsupported PEM content '" + object.getClass() + "'");
                 }
+                key = BouncyCastleProvider.getPrivateKey(privateKeyInfo);
 
                 final File hostCertFile = Play.getFile(p.getProperty("certificate.file", "conf/host.cert"));
                 final Collection collection = new CertificateFactory().engineGenerateCertificates(new FileInputStream(hostCertFile));