Merge pull request #41 from darkwebdesign/ISSUE-32

ISSUE-32: Wrong certificate is extracted as public key from keystore

Author: raymondschouten

File/KeystoreFile.php

@@ -121,7 +121,7 @@ public function getPem($path, $passPhrase)
         $process2->setInput($process1->getOutput());
         $process2->mustRun();
 
-        $process3 = new Process("openssl pkcs12 -in $in -passin pass:$pass -nokeys");
+        $process3 = new Process("openssl pkcs12 -in $in -passin pass:$pass -nokeys -clcerts");
         $process3->mustRun();
 
         $process4 = new Process("openssl x509");
@@ -149,7 +149,7 @@ public function getPublicKey($path, $passPhrase)
         $in = escapeshellarg($this->getPathname());
         $pass = escapeshellarg($passPhrase);
 
-        $process1 = new Process("openssl pkcs12 -in $in -passin pass:$pass -nokeys");
+        $process1 = new Process("openssl pkcs12 -in $in -passin pass:$pass -nokeys -clcerts");
         $process1->mustRun();
 
         $process2 = new Process("openssl x509");
@@ -214,7 +214,7 @@ public function getSubject($passPhrase)
         $in = escapeshellarg($this->getPathname());
         $pass = escapeshellarg($passPhrase);
 
-        $process1 = new Process("openssl pkcs12 -in $in -passin pass:$pass -nokeys");
+        $process1 = new Process("openssl pkcs12 -in $in -passin pass:$pass -nokeys -clcerts");
         $process1->mustRun();
 
         $process2 = new Process('openssl x509 -noout -subject');
@@ -238,7 +238,7 @@ public function getIssuer($passPhrase)
         $in = escapeshellarg($this->getPathname());
         $pass = escapeshellarg($passPhrase);
 
-        $process1 = new Process("openssl pkcs12 -in $in -passin pass:$pass -nokeys");
+        $process1 = new Process("openssl pkcs12 -in $in -passin pass:$pass -nokeys -clcerts");
         $process1->mustRun();
 
         $process2 = new Process('openssl x509 -noout -issuer');
@@ -262,7 +262,7 @@ public function getNotBefore($passPhrase)
         $in = escapeshellarg($this->getPathname());
         $pass = escapeshellarg($passPhrase);
 
-        $process1 = new Process("openssl pkcs12 -in $in -passin pass:$pass -nokeys");
+        $process1 = new Process("openssl pkcs12 -in $in -passin pass:$pass -nokeys -clcerts");
         $process1->mustRun();
 
         $process2 = new Process('openssl x509 -noout -startdate');
@@ -286,7 +286,7 @@ public function getNotAfter($passPhrase)
         $in = escapeshellarg($this->getPathname());
         $pass = escapeshellarg($passPhrase);
 
-        $process1 = new Process("openssl pkcs12 -in $in -passin pass:$pass -nokeys");
+        $process1 = new Process("openssl pkcs12 -in $in -passin pass:$pass -nokeys -clcerts");
         $process1->mustRun();
 
         $process2 = new Process('openssl x509 -noout -enddate');
@@ -337,7 +337,7 @@ public function changePassPhrase($passPhrase, $newPassPhrase)
         $process2->setInput($process1->getOutput());
         $process2->mustRun();
 
-        $process3 = new Process("openssl pkcs12 -in $in -passin pass:$pass -nokeys");
+        $process3 = new Process("openssl pkcs12 -in $in -passin pass:$pass -nokeys -clcerts");
         $process3->mustRun();
 
         $process4 = new Process("openssl x509");