From 40de5f7981317f655d0b0a15eba1970c078586de Mon Sep 17 00:00:00 2001
From: John Crisp <jcrisp@safeandsoundit.co.uk>
Date: Wed, 4 Mar 2020 12:32:33 +0100
Subject: [PATCH] Fix no password

---
 ca/request_cert.php           | 4 ++--
 include/openssl_functions.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ca/request_cert.php b/ca/request_cert.php
index 632d540..1f065ed 100644
--- a/ca/request_cert.php
+++ b/ca/request_cert.php
@@ -296,7 +296,7 @@ default:
 	<th colspan=2><h3>Certificate Request Form</h3></th>
 
 	<tr>
-	<td width=30%>Common Name<font color=red size=3>*</font><br>(i.e. User real name or computer hostname) </td>
+	<td width=30%>Common Name<font color=red size=3>*</font><br>(i.e. User real name or computer hostname - used as SubjectAltName)</td>
 	<td><input type=text name=common_name value="<?php echo  htvar($common_name)?>" size=50 maxlength=60></td>
 	</tr>
 
@@ -328,7 +328,7 @@ default:
 	</tr>
 
 	<tr>
-	<td>Certificate Password<font color=red size=3>*</font> </td>
+	<td>Certificate Password<font color=red size=3>*</font><br>(Mandatory for Email,SSL Client,Code signing)</td>
 	<td><input type=password name=passwd value="<?php echo  htvar($passwd) ?>" size=30>&nbsp;&nbsp; Again <input type=password name=passwdv  value="<?php echo  htvar($passwdv) ?>" size=30></td>
 	</tr>
 
diff --git a/include/openssl_functions.php b/include/openssl_functions.php
index 35fbf97..1e9424a 100644
--- a/include/openssl_functions.php
+++ b/include/openssl_functions.php
@@ -627,8 +627,8 @@ function CA_create_cert($cert_type='email',$country,$province,$locality,$organiz
 		else {
 			$cmd_output[] = "infile: $usercert   keyfile: $userkey   outfile: $userpfx";
 			// Need to check this password thing
-			//exec(PKCS12." -export -in '$usercert' -inkey '$userkey' -certfile '$config[cacert_pem]' -caname '$config[organization]' -out '$userpfx' -name $friendly_name -nodes -passout pass: 2>&1", $cmd_output, $ret);
-			exec(PKCS12." -export -in '$usercert' -inkey '$userkey' -certfile '$config[cacert_pem]' -caname '$config[organization]' -out '$userpfx' -name $friendly_name  -nodes 2>&1", $cmd_output, $ret);
+			exec(PKCS12." -export -in '$usercert' -inkey '$userkey' -certfile '$config[cacert_pem]' -caname '$config[organization]' -out '$userpfx' -name $friendly_name -nodes -passout pass: 2>&1", $cmd_output, $ret);
+			//exec(PKCS12." -export -in '$usercert' -inkey '$userkey' -certfile '$config[cacert_pem]' -caname '$config[organization]' -out '$userpfx' -name $friendly_name  -nodes 2>&1", $cmd_output, $ret);
 		}
 	};