summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2011-10-10 17:16:08 -0400
committerjim-p <jimp@pfsense.org>2011-10-27 10:29:37 -0400
commit3f9c177572d5d2c2995b5e6a81679fd5bb7ce6ec (patch)
tree171542798e215059eaa9d9de28c1d6c67eb3aff3
parent4659f856f96b4f289d3f5de55d6b7d15f7c5351c (diff)
downloadpfsense-3f9c177572d5d2c2995b5e6a81679fd5bb7ce6ec.zip
pfsense-3f9c177572d5d2c2995b5e6a81679fd5bb7ce6ec.tar.gz
Specify full path to openssl.cnf, and select the relevant section to use when generating certificates.
-rw-r--r--etc/inc/certs.inc6
1 files changed, 6 insertions, 0 deletions
diff --git a/etc/inc/certs.inc b/etc/inc/certs.inc
index 60ce951..104a9fe 100644
--- a/etc/inc/certs.inc
+++ b/etc/inc/certs.inc
@@ -30,6 +30,8 @@
pfSense_MODULE: certificate_managaer
*/
+define("OPEN_SSL_CONF_PATH", "/etc/ssl/openssl.cnf");
+
require_once("functions.inc");
function & lookup_ca($refid) {
@@ -160,6 +162,7 @@ function ca_import(& $ca, $str, $key="", $serial=0) {
function ca_create(& $ca, $keylen, $lifetime, $dn) {
$args = array(
+ "x509_extensions" => "v3_ca",
"digest_alg" => "sha1",
"private_key_bits" => (int)$keylen,
"private_key_type" => OPENSSL_KEYTYPE_RSA,
@@ -202,6 +205,7 @@ function ca_inter_create(& $ca, $keylen, $lifetime, $dn, $caref) {
$signing_ca_serial = ++$signing_ca['serial'];
$args = array(
+ "x509_extensions" => "v3_ca",
"digest_alg" => "sha1",
"private_key_bits" => (int)$keylen,
"private_key_type" => OPENSSL_KEYTYPE_RSA,
@@ -263,6 +267,7 @@ function cert_create(& $cert, $caref, $keylen, $lifetime, $dn) {
$ca_serial = ++$ca['serial'];
$args = array(
+ "x509_extensions" => "usr_cert",
"digest_alg" => "sha1",
"private_key_bits" => (int)$keylen,
"private_key_type" => OPENSSL_KEYTYPE_RSA,
@@ -297,6 +302,7 @@ function cert_create(& $cert, $caref, $keylen, $lifetime, $dn) {
function csr_generate(& $cert, $keylen, $dn) {
$args = array(
+ "x509_extensions" => "v3_req",
"digest_alg" => "sha1",
"private_key_bits" => (int)$keylen,
"private_key_type" => OPENSSL_KEYTYPE_RSA,
OpenPOWER on IntegriCloud