From f2493c615991fca0c457a9f340b509c1a622f18b Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Mon, 28 Apr 2008 02:11:19 +0000
Subject: * Obtain keysize * Use keyname for server

---
 etc/inc/openvpn.inc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'etc/inc/openvpn.inc')

diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc
index 28fd79f..43a0198 100644
--- a/etc/inc/openvpn.inc
+++ b/etc/inc/openvpn.inc
@@ -302,8 +302,11 @@ function openvpn_server_create_cert($mode, $id) {
 	global $g, $config;
 	$settings = $config['installedpackages']["openvpn$mode"]['config'][$id];
 	log_error("Creating server certificate for {$settings['description']}.");
-	$cakeysize = $settings['keysize'];
-	$caname = $settings['cipherpki'];
+	$caname = $settings['cipherpki'];	
+	foreach($config['openvpn']['keys'] as $ca) {
+		if($ca == $caname)
+			$cakeysize = $ca['keysize'];
+	}	
 	$ovpncapath = $g['varetc_path']."/openvpn/certificates";	
 	$easyrsapath = $g['easyrsapath'];
 	config_lock();
@@ -311,7 +314,7 @@ function openvpn_server_create_cert($mode, $id) {
 	fwrite($fd, "#!/bin/tcsh\n");
 	fwrite($fd, "cd $ovpncapath \n");
 	fwrite($fd, "source $ovpncapath/$caname/vars \n");
-	fwrite($fd, "$easyrsapath/pkitool --batch --server server \n");
+	fwrite($fd, "$easyrsapath/pkitool --batch --server {$caname} \n");
 	fwrite($fd, "openssl dhparam -out $ovpncapath/$caname/dh_params.dh $cakeysize \n");
 	fclose($fd);
 	system("/bin/chmod a+rx $ovpncapath/RUNME_2ND");
-- 
cgit v1.1