From b5971c4effeeef4a6c82de9774ac0574abb1e519 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Mon, 28 Apr 2008 02:25:15 +0000
Subject: Set keysize correctly

---
 etc/inc/openvpn.inc | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

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

diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc
index 99d25f6..b3554e3 100644
--- a/etc/inc/openvpn.inc
+++ b/etc/inc/openvpn.inc
@@ -301,12 +301,15 @@ function openvpn_server_create_cert($mode, $id) {
 		return;
 	global $g, $config;
 	$settings = $config['installedpackages']["openvpn$mode"]['config'][$id];
-	$serveruniq = $settings['interface'] . $settings['local_port'] . $settings['protocol'];
+	$interface = $settings['interface'];
+	if(!$interface) 
+		$interface = "WAN";
+	$serveruniq =  $interface . $settings['local_port'] . $settings['protocol'];
 	log_error("Creating server certificate for {$settings['description']}.");
 	$caname = $settings['cipherpki'];	
-	foreach($config['openvpn']['keys'] as $ca) {
-		if($ca['descr'] == $caname)
-			$cakeysize = $ca['keysize'];
+	foreach($config['openvpn']['keys'] as $ca => $ca2) {
+		if($ca == $caname)
+			$cakeysize = $ca2['keysize'];
 	}	
 	$ovpncapath = $g['varetc_path']."/openvpn/certificates";	
 	$easyrsapath = $g['easyrsapath'];
-- 
cgit v1.1