1 |
brianr |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' phpki/phpki-0.82/include/openssl_functions.php mezzanine_patched_phpki/phpki-0.82/include/openssl_functions.php |
2 |
|
|
--- phpki/phpki-0.82/include/openssl_functions.php 2010-03-18 16:41:48.000000000 +0100 |
3 |
|
|
+++ mezzanine_patched_phpki/phpki-0.82/include/openssl_functions.php 2010-03-18 16:41:13.000000000 +0100 |
4 |
|
|
@@ -543,7 +543,7 @@ |
5 |
|
|
unset($cmd_output); |
6 |
|
|
$cmd_output[] = 'Creating certifcate request.'; |
7 |
|
|
|
8 |
|
|
- if ($passwd) { |
9 |
|
|
+ if (($passwd) && ($passwd != "''")) { |
10 |
|
|
exec(REQ." -new -newkey rsa:$keysize -keyout '$userkey' -out '$userreq' -config '$cnf_file' -days '$expiry_days' -passout pass:$passwd 2>&1", $cmd_output, $ret); |
11 |
|
|
} |
12 |
|
|
else { |