IPSec update...
authorms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Sun, 11 Feb 2007 12:10:37 +0000 (12:10 +0000)
committerms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Sun, 11 Feb 2007 12:10:37 +0000 (12:10 +0000)
Dial.cgi bearbeitet/fix...

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@408 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

html/cgi-bin/dial.cgi
html/cgi-bin/vpnmain.cgi

index a369097..8ca1384 100644 (file)
@@ -60,10 +60,10 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'dial profile'})
 }
 
 if ($cgiparams{'ACTION'} eq $Lang::tr{'dial'}) {
-       system('/etc/rc.d/rc.red','start') == 0
+       system('/etc/rc.d/init.d/red','start') == 0
        or &General::log("Dial failed: $?"); }
 elsif ($cgiparams{'ACTION'} eq $Lang::tr{'hangup'}) {
-       system('/etc/rc.d/rc.red','stop') == 0
+       system('/etc/rc.d/init.d/red','stop') == 0
        or &General::log("Hangup failed: $?"); }
 sleep 1;
 
index 364036d..794bf7e 100644 (file)
@@ -1,24 +1,24 @@
 #!/usr/bin/perl
 #
-# This file is part of the IPFire Firewall.
+# This file is part of the IPCop Firewall.
 #
-# IPFire is free software; you can redistribute it and/or modify
+# IPCop is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# IPFire is distributed in the hope that it will be useful,
+# IPCop is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with IPFire; if not, write to the Free Software
+# along with IPCop; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # Copyright (C) 2003-05-25 Mark Wormgoor <mark@wormgoor.com>
 #
-# $Id: vpnmain.cgi,v 1.10.2.69 2006/01/31 02:07:19 franck78 Exp $
+# $Id: vpnmain.cgi,v 1.10.2.104 2006/11/30 12:43:10 franck78 Exp $
 #
 
 use Net::DNS;
@@ -33,34 +33,33 @@ use strict;
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
-
 require "${General::swroot}/countries.pl";
 
 #workaround to suppress a warning when a variable is used only once
-my @dummy = ( ${Header::colourgreen} );
+my @dummy = ( ${Header::colourgreen}, ${Header::colourblue} );
 undef (@dummy);
 
 ###
 ### Initialize variables
 ###
-my $sleepDelay = '4s'; # after a call to ipsecctrl S or R, wait this delay (seconds) before reading status
+my $sleepDelay = 4;    # after a call to ipsecctrl S or R, wait this delay (seconds) before reading status
                        # (let the ipsec do its job)
 my %netsettings=();
-my %cgiparams=();
-my %vpnsettings=();
+our %cgiparams=();
+our %vpnsettings=();
 my %checked=();
 my %confighash=();
 my %cahash=();
 my %selected=();
 my $warnmessage = '';
 my $errormessage = '';
+
 &General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
 $cgiparams{'ENABLED'} = 'off';
+$cgiparams{'ENABLED_GREEN'} = 'off';
+$cgiparams{'ENABLED_ORANGE'} = 'off';
 $cgiparams{'ENABLED_BLUE'} = 'off';
 $cgiparams{'EDIT_ADVANCED'} = 'off';
-$cgiparams{'NAT'} = 'off';
-$cgiparams{'COMPRESSION'} = 'off';
-$cgiparams{'ONLY_PROPOSED'} = 'off';
 $cgiparams{'ACTION'} = '';
 $cgiparams{'CA_NAME'} = '';
 $cgiparams{'DBG_CRYPT'} = '';
@@ -70,6 +69,37 @@ $cgiparams{'DBG_CONTROL'} = '';
 $cgiparams{'DBG_KLIPS'} = '';
 $cgiparams{'DBG_DNS'} = '';
 $cgiparams{'DBG_NAT_T'} = '';
+$cgiparams{'KEY'} = '';
+$cgiparams{'TYPE'} = '';
+$cgiparams{'ADVANCED'} = '';
+$cgiparams{'INTERFACE'} = '';
+$cgiparams{'NAME'} = '';
+$cgiparams{'LOCAL_SUBNET'} = '';
+$cgiparams{'REMOTE_SUBNET'} = '';
+$cgiparams{'REMOTE'} = '';
+$cgiparams{'LOCAL_ID'} = '';
+$cgiparams{'REMOTE_ID'} = '';
+$cgiparams{'REMARK'} = '';
+$cgiparams{'PSK'} = '';
+$cgiparams{'CERT_NAME'} = '';
+$cgiparams{'CERT_EMAIL'} = '';
+$cgiparams{'CERT_OU'} = '';
+$cgiparams{'CERT_ORGANIZATION'} = '';
+$cgiparams{'CERT_CITY'} = '';
+$cgiparams{'CERT_STATE'} = '';
+$cgiparams{'CERT_COUNTRY'} = '';
+$cgiparams{'SUBJECTALTNAME'} = '';
+$cgiparams{'CERT_PASS1'} = '';
+$cgiparams{'CERT_PASS2'} = '';
+$cgiparams{'ROOTCERT_HOSTNAME'} = '';
+$cgiparams{'ROOTCERT_COUNTRY'} = '';
+$cgiparams{'P12_PASS'} = '';
+$cgiparams{'ROOTCERT_ORGANIZATION'} = '';
+$cgiparams{'ROOTCERT_HOSTNAME'} = '';
+$cgiparams{'ROOTCERT_EMAIL'} = '';
+$cgiparams{'ROOTCERT_OU'} = '';
+$cgiparams{'ROOTCERT_CITY'} = '';
+$cgiparams{'ROOTCERT_STATE'} = '';
 
 &Header::getcgihash(\%cgiparams, {'wantfile' => 1, 'filevar' => 'FH'});
 
@@ -90,11 +120,19 @@ sub valid_dns_host {
                return $res->errorstring;
        }
 }
-
-#
-# old version: maintain serial number to one, without explication. 
-# this      : let the counter go, so that each cert is numbered.
-#
+###
+### Just return true is one interface is vpn enabled
+###
+sub vpnenabled {
+    return ($vpnsettings{'ENABLED'} eq 'on' || 
+           $vpnsettings{'ENABLED_GREEN'} eq 'on' ||
+           $vpnsettings{'ENABLED_ORANGE'} eq 'on' ||
+           $vpnsettings{'ENABLED_BLUE'} eq 'on');
+}
+###
+### old version: maintain serial number to one, without explication. 
+### this            : let the counter go, so that each cert is numbered.
+###
 sub cleanssldatabase
 {
     if (open(FILE, ">${General::swroot}/certs/serial")) {
@@ -123,7 +161,81 @@ sub newcleanssldatabase
     unlink ("${General::swroot}/certs/serial.old");
 #   unlink ("${General::swroot}/certs/01.pem");                numbering evolves. Wrong place to delete
 }
-                                                           
+
+###
+### Call openssl and return errormessage if any
+###
+sub callssl ($) {
+    my $opt = shift;
+    my $retssl =  `/usr/bin/openssl $opt 2>&1`;        #redirect stderr
+    my $ret = '';
+    foreach my $line (split (/\n/, $retssl)) {
+       &General::log("ipsec", "$line") if (0);         # 1 for verbose logging
+       $ret .= '<br>'.$line if ( $line =~ /error|unknown/ );
+    }
+    if ($ret) {
+        $ret= &Header::cleanhtml($ret);
+    }
+    return $ret ? "$Lang::tr{'openssl produced an error'}: $ret" : '' ;
+}
+###
+### Obtain a CN from given cert
+###
+sub getCNfromcert ($) {
+    #&General::log("ipsec", "Extracting name from $_[0]...");
+    my $temp = `/usr/bin/openssl x509 -text -in $_[0]`;
+    $temp =~ /Subject:.*CN=(.*)[\n]/;
+    $temp = $1;
+    $temp =~ s+/Email+, E+;
+    $temp =~ s/ ST=/ S=/;
+    $temp =~ s/,//g;
+    $temp =~ s/\'//g;
+    return $temp;
+}
+###
+### Obtain Subject from given cert
+###
+sub getsubjectfromcert ($) {
+    #&General::log("ipsec", "Extracting subject from $_[0]...");
+    my $temp = `/usr/bin/openssl x509 -text -in $_[0]`;
+    $temp =~ /Subject: (.*)[\n]/;
+    $temp = $1;
+    $temp =~ s+/Email+, E+;
+    $temp =~ s/ ST=/ S=/;
+    return $temp;
+}
+###
+### Combine local subnet and connection name to make a unique name for each connection section 
+### (this sub is not used now)
+###
+sub makeconnname ($) {
+    my $conn = shift;
+    my $subnet = shift;
+
+    $subnet =~ /^(.*?)\/(.*?)$/;       # $1=IP $2=mask
+    my $ip = unpack('N', &Socket::inet_aton($1));
+    if (length ($2) > 2) {
+       my $mm =  unpack('N', &Socket::inet_aton($2));
+       while ( ($mm & 1)==0 ) {
+           $ip >>= 1; 
+           $mm >>= 1;
+       };
+    } else {
+       $ip >>=  (32 - $2);
+    }
+    return sprintf ("%s-%X", $conn, $ip);
+}
+###
+### Write a config file.
+###
+###Type=Host : GUI can choose the interface used (RED,GREEN,BLUE) and
+###            the side is always defined as 'left'.
+###            configihash[14]: 'VHOST' is allowed
+###
+###Type=Net :  GUI can choose to be left or right. This serve nothing in the conf!
+###            interface is fixed to RED only. No special reason for this also.
+###
+
 sub writeipsecfiles {
     my %lconfighash = ();
     my %lvpnsettings = ();
@@ -136,28 +248,26 @@ sub writeipsecfiles {
     flock SECRETS, 2;
     print CONF "version 2\n\n";
     print CONF "config setup\n";
-    if ($lvpnsettings{'ENABLED_BLUE'} eq 'on')
-    {
-       if ($lvpnsettings{'ENABLED'} eq 'on')
-       {
-               print CONF "\tinterfaces=\"%defaultroute ipsec1=$netsettings{'BLUE_DEV'}\"\n";
-       } else {
-               print CONF "\tinterfaces=ipsec0=$netsettings{'BLUE_DEV'}\n";
-       }
-    } else {
-       print CONF "\tinterfaces=%defaultroute\n";
-    }
-    
+    #create an ipsec Interface for each 'enabled' ones
+    my $interfaces = "\tinterfaces=\"";
+    $interfaces .= "%defaultroute " if ($lvpnsettings{'ENABLED'} eq 'on');
+    $interfaces .= "ipsec1=$netsettings{'GREEN_DEV'} " if ($lvpnsettings{'ENABLED_GREEN'} eq 'on');
+    $interfaces .= "ipsec2=$netsettings{'BLUE_DEV'} " if ($lvpnsettings{'ENABLED_BLUE'} eq 'on');
+    $interfaces .= "ipsec3=$netsettings{'ORANGE_DEV'} " if ($lvpnsettings{'ENABLED_ORANGE'} eq 'on');
+    print CONF $interfaces . "\"\n";
+
     my $plutodebug = '';                       # build debug list
     map ($plutodebug .= $lvpnsettings{$_} eq 'on' ? lc (substr($_,4)).' ' : '',
        ('DBG_CRYPT','DBG_PARSING','DBG_EMITTING','DBG_CONTROL',
         'DBG_KLIPS','DBG_DNS','DBG_NAT_T'));
     $plutodebug = 'none' if $plutodebug eq '';  # if nothing selected, use 'none'.
-    print CONF "\tklipsdebug=none\n";
+    print CONF "\tklipsdebug=\"none\"\n";
     print CONF "\tplutodebug=\"$plutodebug\"\n";
     # deprecated in ipsec.conf version 2
     #print CONF "\tplutoload=%search\n";
     #print CONF "\tplutostart=%search\n";
+    print CONF "\tplutoload=%search\n";
+    print CONF "\tplutostart=%search\n";
     print CONF "\tuniqueids=yes\n";
     print CONF "\tnat_traversal=yes\n";
     print CONF "\toverridemtu=$lvpnsettings{'VPN_OVERRIDE_MTU'}\n" if ($lvpnsettings{'VPN_OVERRIDE_MTU'} ne '');
@@ -183,163 +293,154 @@ sub writeipsecfiles {
     if (-f "${General::swroot}/certs/hostkey.pem") {
         print SECRETS ": RSA ${General::swroot}/certs/hostkey.pem\n"
     }
-
+    my $last_secrets = ''; # old the less specifics connections
+    
     foreach my $key (keys %lconfighash) {
-       if ($lconfighash{$key}[0] eq 'on') {
-           if ($lconfighash{$key}[10] eq '') { $lconfighash{$key}[10] = '%any'; }
-
-           print CONF "conn $lconfighash{$key}[1]\n";
-           #always choose LEFT localside for roadwarrior
-           if ($lconfighash{$key}[3] eq 'host' || $lconfighash{$key}[6] eq 'left') {
-               if ($lconfighash{$key}[26] eq 'BLUE')
-               {
-                   print CONF "\tleft=$netsettings{'BLUE_ADDRESS'}\n";
-#                  print CONF "\tleftnexthop=$netsettings{'BLUE_NETADDRESS'}\n";
-               } 
-               elsif ($lconfighash{$key}[26] eq 'ORANGE')
-               {
-                   print CONF "\tleft=$netsettings{'ORANGE_ADDRESS'}\n";
-               } 
-               elsif ($lconfighash{$key}[26] eq 'GREEN')
-               {
-                   print CONF "\tleft=$netsettings{'GREEN_ADDRESS'}\n";
-               } 
-               elsif ($lconfighash{$key}[26] eq 'RED')
-               {
-                   print CONF "\tleft=$lvpnsettings{'VPN_IP'}\n";
-                   print CONF "\tleftnexthop=%defaultroute\n" if ($lvpnsettings{'VPN_IP'} ne '%defaultroute');
-               }
-               print CONF "\tleftsubnet=$lconfighash{$key}[8]\n";
-               print CONF "\tright=$lconfighash{$key}[10]\n";
-               if ($lconfighash{$key}[3] eq 'net') {
-                   print CONF "\trightsubnet=$lconfighash{$key}[11]\n";
-                   print CONF "\trightnexthop=%defaultroute\n";
-               } elsif ($lconfighash{$key}[10] eq '%any' && $lconfighash{$key}[14] eq 'on') {
-                   print CONF "\trightsubnet=vhost:%no,%priv\n";
-               }
-               if ($lconfighash{$key}[4] eq 'cert') {
-                   print CONF "\tleftcert=${General::swroot}/certs/hostcert.pem\n";
-                   print CONF "\trightcert=${General::swroot}/certs/$lconfighash{$key}[1]cert.pem\n";
-               }
-           } else {
-               print CONF "\tright=$lvpnsettings{'VPN_IP'}\n";
-               print CONF "\trightsubnet=$lconfighash{$key}[8]\n";
-               print CONF "\trightnexthop=%defaultroute\n"  if ($lvpnsettings{'VPN_IP'} ne '%defaultroute');
-               print CONF "\tleft=$lconfighash{$key}[10]\n";
-               if ($lconfighash{$key}[3] eq 'net') {
-                   print CONF "\tleftsubnet=$lconfighash{$key}[11]\n";
-                   print CONF "\tleftnexthop=%defaultroute\n";
-               }
-               if ($lconfighash{$key}[4] eq 'cert') {
-                   print CONF "\trightcert=${General::swroot}/certs/hostcert.pem\n";
-                   print CONF "\tleftcert=${General::swroot}/certs/$lconfighash{$key}[1]cert.pem\n";
-               }
-           }
-           print CONF "\tleftid=$lconfighash{$key}[7]\n" if ($lconfighash{$key}[7]);
-           print CONF "\trightid=$lconfighash{$key}[9]\n" if ($lconfighash{$key}[9]);
-
-           # Algorithms
-           if ($lconfighash{$key}[18] && $lconfighash{$key}[19] && $lconfighash{$key}[20]) {
-               print CONF "\tike=";
-               my @encs   = split('\|', $lconfighash{$key}[18]);
-               my @ints   = split('\|', $lconfighash{$key}[19]);
-               my @groups = split('\|', $lconfighash{$key}[20]);
-               my $comma = 0;
-               foreach my $i (@encs) {
-                   foreach my $j (@ints) {
-                       foreach my $k (@groups) {
-                           if ($comma != 0) { print CONF ","; } else { $comma = 1; }
-                           print CONF "$i-$j-modp$k";
-                       }
-                   }
-               }
-               if ($lconfighash{$key}[24] eq 'on') {
-                   print CONF "!\n";
-               } else {
-                   print CONF "\n";
-               }
-           }
-           if ($lconfighash{$key}[21] && $lconfighash{$key}[22]) {
-               print CONF "\tesp=";
-               my @encs   = split('\|', $lconfighash{$key}[21]);
-               my @ints   = split('\|', $lconfighash{$key}[22]);
-               my $comma = 0;
-               foreach my $i (@encs) {
-                   foreach my $j (@ints) {
-                       if ($comma != 0) { print CONF ","; } else { $comma = 1; }
-                       print CONF "$i-$j";
-                   }
-               }
-               if ($lconfighash{$key}[24] eq 'on') {
-                   print CONF "!\n";
-               } else {
-                   print CONF "\n";
-               }
-           }
-           if ($lconfighash{$key}[23]) {
-               print CONF "\tpfsgroup=$lconfighash{$key}[23]\n";
-           }
+       next if ($lconfighash{$key}[0] ne 'on');
 
-           # Lifetimes
-           if ($lconfighash{$key}[16]) {
-               print CONF "\tikelifetime=$lconfighash{$key}[16]h\n";
-           }
-           if ($lconfighash{$key}[17]) {
-               print CONF "\tkeylife=$lconfighash{$key}[17]h\n";
-           }
+       #remote peer is not set? => use '%any'
+       $lconfighash{$key}[10] = '%any' if ($lconfighash{$key}[10] eq '');
 
-           # Compression
-           if ($lconfighash{$key}[13] eq 'on') {
-               print CONF "\tcompress=yes\n";
-           }
+       my ($L,$R);     #Local & Remote sides
 
-           # Dead Peer Detection
-           print CONF "\tdpddelay=30\n";
-           print CONF "\tdpdtimeout=120\n";
-           print CONF "\tdpdaction=$lconfighash{$key}[27]\n";
-           
-           # Disable pfs ?
-           print CONF "\tpfs=$lconfighash{$key}[28]\n";
-
-           # Print Authentication details
-           if ($lconfighash{$key}[4] eq 'psk') {
-               if ($lconfighash{$key}[6] eq 'left'){
-                   if ($lconfighash{$key}[26] eq 'BLUE') {
-                       print SECRETS ($lconfighash{$key}[7] ? $lconfighash{$key}[7] : $netsettings{'BLUE_ADDRESS'}) . " ";
-                       print SECRETS $lconfighash{$key}[9] ? $lconfighash{$key}[9] : $lconfighash{$key}[10];
-                       print SECRETS " : PSK \"$lconfighash{$key}[5]\"\n";
-                   } else {
-                       print SECRETS ($lconfighash{$key}[7] ? $lconfighash{$key}[7] : $lvpnsettings{'VPN_IP'}) . " ";
-                       print SECRETS $lconfighash{$key}[9] ? $lconfighash{$key}[9] : $lconfighash{$key}[10];
-                       print SECRETS " : PSK \"$lconfighash{$key}[5]\"\n";
-                   }
-               } else {
-                   if ($lconfighash{$key}[26] eq 'BLUE') {
-                       print SECRETS ($lconfighash{$key}[9] ? $lconfighash{$key}[9] : $netsettings{'BLUE_ADDRESS'}) . " ";
-                       print SECRETS $lconfighash{$key}[7] ? $lconfighash{$key}[7] : $lconfighash{$key}[10];
-                       print SECRETS " : PSK \"$lconfighash{$key}[5]\"\n";
-                   } else {
-                       print SECRETS ($lconfighash{$key}[9] ? $lconfighash{$key}[9] : $lvpnsettings{'VPN_IP'}) . " ";
-                       print SECRETS $lconfighash{$key}[7] ? $lconfighash{$key}[7] : $lconfighash{$key}[10];
-                       print SECRETS " : PSK \"$lconfighash{$key}[5]\"\n";
-                   }
-               }
+       print CONF "conn $lconfighash{$key}[1]\n";
+       #always choose LEFT localside for roadwarrior
+       if ($lconfighash{$key}[3] eq 'host' || $lconfighash{$key}[6] eq 'left') {
+           $L = 'left';
+           $R = 'right';
+       } else {
+           $R = 'left';
+           $L = 'right';
+       }
+       print CONF "\t${L}=";
+       if ($lconfighash{$key}[26] eq 'BLUE') {
+           print CONF "$netsettings{'BLUE_ADDRESS'}\n";
+       } elsif ($lconfighash{$key}[26] eq 'ORANGE') {
+           print CONF "$netsettings{'ORANGE_ADDRESS'}\n";
+       } elsif ($lconfighash{$key}[26] eq 'GREEN') {
+           print CONF "$netsettings{'GREEN_ADDRESS'}\n";
+       } elsif ($lconfighash{$key}[26] eq 'RED') {
+           print CONF "$lvpnsettings{'VPN_IP'}\n";
+           print CONF "\t${L}nexthop=%defaultroute\n" if ($lvpnsettings{'VPN_IP'} ne '%defaultroute');
+       }
+       print CONF "\t${L}subnet=$lconfighash{$key}[8]\n";
+       print CONF "\t${R}=$lconfighash{$key}[10]\n";
 
-               print CONF "\tauthby=secret\n";
+       if ($lconfighash{$key}[3] eq 'net') {
+           print CONF "\t${R}subnet=$lconfighash{$key}[11]\n";
+           print CONF "\t${R}nexthop=%defaultroute\n";
+       } elsif ($lconfighash{$key}[10] eq '%any' && $lconfighash{$key}[14] eq 'on') { #vhost allowed?
+           print CONF "\trightsubnet=vhost:%no,%priv\n";
+       }
+
+       # Local Cert and Remote Cert (unless auth is DN dn-auth)
+       if ($lconfighash{$key}[4] eq 'cert') {
+           print CONF "\t${L}cert=${General::swroot}/certs/hostcert.pem\n";
+           print CONF "\t${R}cert=${General::swroot}/certs/$lconfighash{$key}[1]cert.pem\n" if ($lconfighash{$key}[2] ne '%auth-dn');
+       }
+
+       # Local and Remote IDs
+       print CONF "\t${L}id=\"$lconfighash{$key}[7]\"\n" if ($lconfighash{$key}[7]);
+       print CONF "\t${R}id=\"$lconfighash{$key}[9]\"\n" if ($lconfighash{$key}[9]);
+
+       # Algorithms
+       if ($lconfighash{$key}[18] && $lconfighash{$key}[19] && $lconfighash{$key}[20]) {
+           print CONF "\tike=";
+           my @encs   = split('\|', $lconfighash{$key}[18]);
+           my @ints   = split('\|', $lconfighash{$key}[19]);
+           my @groups = split('\|', $lconfighash{$key}[20]);
+           my $comma = 0;
+           foreach my $i (@encs) {
+               foreach my $j (@ints) {
+                   foreach my $k (@groups) {
+                       if ($comma != 0) { print CONF ","; } else { $comma = 1; }
+                   print CONF "$i-$j-modp$k";
+               }
+                   }
+           }
+           if ($lconfighash{$key}[24] eq 'on') {       #only proposed algorythms?
+               print CONF "!\n";
            } else {
-               print CONF "\tauthby=rsasig\n";
+               print CONF "\n";
+           }
+       }
+       if ($lconfighash{$key}[21] && $lconfighash{$key}[22]) {
+           print CONF "\tesp=";
+           my @encs   = split('\|', $lconfighash{$key}[21]);
+           my @ints   = split('\|', $lconfighash{$key}[22]);
+           my $comma = 0;
+           foreach my $i (@encs) {
+               foreach my $j (@ints) {
+                   if ($comma != 0) { print CONF ","; } else { $comma = 1; }
+                   print CONF "$i-$j";
+               }
            }
-
-           # Automatically start only if a net-to-net connection
-           if ($lconfighash{$key}[3] eq 'host') {
-               print CONF "\tauto=add\n";
+           if ($lconfighash{$key}[24] eq 'on') {       #only proposed algorythms?
+               print CONF "!\n";
+           } else {
+               print CONF "\n";
+           }
+       }
+       if ($lconfighash{$key}[23]) {
+           print CONF "\tpfsgroup=$lconfighash{$key}[23]\n";
+       }
+
+       # Lifetimes
+       print CONF "\tikelifetime=$lconfighash{$key}[16]h\n" if ($lconfighash{$key}[16]);
+       print CONF "\tkeylife=$lconfighash{$key}[17]h\n" if ($lconfighash{$key}[17]);
+
+       # Aggresive mode
+       print CONF "\taggrmode=yes\n" if ($lconfighash{$key}[12] eq 'on');
+
+       # Compression
+       print CONF "\tcompress=yes\n" if ($lconfighash{$key}[13] eq 'on');
+
+       # Dead Peer Detection
+       print CONF "\tdpddelay=30\n";
+       print CONF "\tdpdtimeout=120\n";
+       print CONF "\tdpdaction=$lconfighash{$key}[27]\n";
+
+       # Disable pfs ?
+       print CONF "\tpfs=". ($lconfighash{$key}[28] eq 'on' ? "yes\n" : "no\n");
+
+       # Build Authentication details:  LEFTid RIGHTid : PSK psk
+       my $psk_line;
+       if ($lconfighash{$key}[4] eq 'psk') {
+           my $localside;
+           if ($lconfighash{$key}[26] eq 'BLUE') {
+               $localside = $netsettings{'BLUE_ADDRESS'};
+           } elsif ($lconfighash{$key}[26] eq 'GREEN') {
+               $localside = $netsettings{'GREEN_ADDRESS'};
+           } elsif ($lconfighash{$key}[26] eq 'ORANGE') {
+               $localside = $netsettings{'ORANGE_ADDRESS'};
+           } else {    # it is RED
+               $localside = $lvpnsettings{'VPN_IP'};
+           }
+           $psk_line = ($lconfighash{$key}[7] ? $lconfighash{$key}[7] : $localside) . " " ;
+           $psk_line .= $lconfighash{$key}[9] ? $lconfighash{$key}[9] : $lconfighash{$key}[10];  #remoteid or remote address?
+           $psk_line .= " : PSK '$lconfighash{$key}[5]'\n";
+           # if the line contains %any, it is less specific than two IP or ID, so move it at end of file.
+           if ($psk_line =~ /%any/) {
+               $last_secrets .= $psk_line;
            } else {
-               print CONF "\tauto=start\n";
+               print SECRETS $psk_line;
            }
-           print CONF "\n";
-       }#on
-    }#foreach key
+           print CONF "\tauthby=secret\n";
+       } else {
+           print CONF "\tauthby=rsasig\n";
+           print CONF "\tleftrsasigkey=%cert\n";
+           print CONF "\trightrsasigkey=%cert\n";
+       }
 
+       # Automatically start only if a net-to-net connection
+       if ($lconfighash{$key}[3] eq 'host') {
+           print CONF "\tauto=add\n";
+       } else {
+           print CONF "\tauto=start\n";
+       }
+       print CONF "\n";
+    }#foreach key
+    print SECRETS $last_secrets if ($last_secrets);
     close(CONF);
     close(SECRETS);
 }
@@ -365,17 +466,22 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cg
        goto SAVE_ERROR;
     }
 
+    unless ($cgiparams{'VPN_WATCH'} =~ /^(|off|on)$/ ) {
+       $errormessage = $Lang::tr{'invalid input'};
+       goto SAVE_ERROR;
+    }
+
     map ($vpnsettings{$_} = $cgiparams{$_},
-       ('ENABLED','ENABLED_BLUE','DBG_CRYPT','DBG_PARSING','DBG_EMITTING','DBG_CONTROL',
+       ('ENABLED','ENABLED_GREEN','ENABLED_ORANGE','ENABLED_BLUE','DBG_CRYPT','DBG_PARSING','DBG_EMITTING','DBG_CONTROL',
         'DBG_KLIPS','DBG_DNS','DBG_NAT_T'));
 
     $vpnsettings{'VPN_IP'} = $cgiparams{'VPN_IP'};
     $vpnsettings{'VPN_DELAYED_START'} = $cgiparams{'VPN_DELAYED_START'};
     $vpnsettings{'VPN_OVERRIDE_MTU'} = $cgiparams{'VPN_OVERRIDE_MTU'};
+    $vpnsettings{'VPN_WATCH'} = $cgiparams{'VPN_WATCH'};
     &General::writehash("${General::swroot}/vpn/settings", \%vpnsettings);
     &writeipsecfiles();
-    if ($vpnsettings{'ENABLED'} eq 'on' ||
-       $vpnsettings{'ENABLED_BLUE'} eq 'on') {
+    if (&vpnenabled) {
        system('/usr/local/bin/ipsecctrl', 'S');
     } else {
        system('/usr/local/bin/ipsecctrl', 'D');
@@ -385,8 +491,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cg
 ###
 ### Reset all step 2
 ###
-} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'reset'} && $cgiparams{'AREUSURE'} eq 'yes') {
-    my $file = '';
+} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'remove x509'} && $cgiparams{'AREUSURE'} eq 'yes') {
     &General::readhasharray("${General::swroot}/vpn/config", \%confighash);
 
     foreach my $key (keys %confighash) {
@@ -394,7 +499,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cg
            delete $confighash{$key};
        }
     }
-    while ($file = glob("${General::swroot}/{ca,certs,crls,private}/*")) {
+    while (my $file = glob("${General::swroot}/{ca,certs,crls,private}/*")) {
        unlink $file
     }
     &cleanssldatabase();
@@ -410,19 +515,26 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cg
 ###
 ### Reset all step 1
 ###
-} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'reset'}) {
+} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'remove x509'}) {
     &Header::showhttpheaders();
     &Header::openpage($Lang::tr{'vpn configuration main'}, 1, '');
-    &Header::openbigbox('100%', 'LEFT', '', '');
-    &Header::openbox('100%', 'LEFT', $Lang::tr{'are you sure'});
+    &Header::openbigbox('100%', 'left', '', '');
+    &Header::openbox('100%', 'left', $Lang::tr{'are you sure'});
     print <<END
-       <table><form method='post'><input type='hidden' name='AREUSURE' value='yes' />
-           <tr><td align='center'>
-               <b><font color='${Header::colourred}'>$Lang::tr{'capswarning'}</font></b>: 
-               $Lang::tr{'resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections'}
-           <tr><td align='center'><input type='submit' name='ACTION' value='$Lang::tr{'reset'}' />
-               <input type='submit' name='ACTION' value='$Lang::tr{'cancel'}' /></td></tr>
-       </form></table>
+       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+       <table width='100%'>
+           <tr>
+               <td align='center'>
+               <input type='hidden' name='AREUSURE' value='yes' />
+               <b><font color='${Header::colourred}'>$Lang::tr{'capswarning'}</font></b>:
+               $Lang::tr{'resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections'}</td>
+           </tr><tr>
+               <td align='center'>
+               <input type='submit' name='ACTION' value='$Lang::tr{'remove x509'}' />
+               <input type='submit' name='ACTION' value='$Lang::tr{'cancel'}' /></td>
+           </tr>
+       </table>
+       </form>
 END
     ;
     &Header::closebox();
@@ -483,16 +595,9 @@ END
        }
     }
 
-    my $casubject = `/usr/bin/openssl x509 -text -in ${General::swroot}/ca/$cgiparams{'CA_NAME'}cert.pem`;
-    $casubject    =~ /Subject: (.*)[\n]/;
-    $casubject    = $1;
-    $casubject    =~ s+/Email+, E+;
-    $casubject    =~ s/ ST=/ S=/;
-    $casubject    = &Header::cleanhtml($casubject);
-
     my $key = &General::findhasharraykey (\%cahash);
     $cahash{$key}[0] = $cgiparams{'CA_NAME'};
-    $cahash{$key}[1] = $casubject;
+    $cahash{$key}[1] = &Header::cleanhtml(getsubjectfromcert ("${General::swroot}/ca/$cgiparams{'CA_NAME'}cert.pem"));
     &General::writehasharray("${General::swroot}/vpn/caconfig", \%cahash);
     system('/usr/local/bin/ipsecctrl', 'R');
     sleep $sleepDelay;
@@ -508,8 +613,8 @@ END
     if ( -f "${General::swroot}/ca/$cahash{$cgiparams{'KEY'}}[0]cert.pem") {
        &Header::showhttpheaders();
        &Header::openpage($Lang::tr{'vpn configuration main'}, 1, '');
-       &Header::openbigbox('100%', 'LEFT', '', '');
-       &Header::openbox('100%', 'LEFT', "$Lang::tr{'ca certificate'}:");
+       &Header::openbigbox('100%', 'left', '', '');
+       &Header::openbox('100%', 'left', "$Lang::tr{'ca certificate'}:");
        my $output = `/usr/bin/openssl x509 -text -in ${General::swroot}/ca/$cahash{$cgiparams{'KEY'}}[0]cert.pem`;
        $output = &Header::cleanhtml($output,"y");
        print "<pre>$output</pre>\n";
@@ -523,14 +628,15 @@ END
     }
 
 ###
-### Download ca certificate
+### Export ca certificate to browser
 ###
 } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'download ca certificate'}) {
     &General::readhasharray("${General::swroot}/vpn/caconfig", \%cahash);
 
     if ( -f "${General::swroot}/ca/$cahash{$cgiparams{'KEY'}}[0]cert.pem" ) {
+       print "Content-Type: application/force-download\n";
        print "Content-Type: application/octet-stream\r\n";
-       print "Content-Disposition: filename=$cahash{$cgiparams{'KEY'}}[0]cert.pem\r\n\r\n";
+       print "Content-Disposition: attachment; filename=$cahash{$cgiparams{'KEY'}}[0]cert.pem\r\n\r\n";
        print `/usr/bin/openssl x509 -in ${General::swroot}/ca/$cahash{$cgiparams{'KEY'}}[0]cert.pem`;
        exit(0);
     } else {
@@ -549,10 +655,7 @@ END
            my $test = `/usr/bin/openssl verify -CAfile ${General::swroot}/ca/$cahash{$cgiparams{'KEY'}}[0]cert.pem ${General::swroot}/certs/$confighash{$key}[1]cert.pem`;
            if ($test =~ /: OK/) {
                # Delete connection
-               if ($vpnsettings{'ENABLED'} eq 'on' ||
-                   $vpnsettings{'ENABLED_BLUE'} eq 'on') {
-                   system('/usr/local/bin/ipsecctrl', 'D', $key);
-               }
+               system('/usr/local/bin/ipsecctrl', 'D', $key) if (&vpnenabled);
                unlink ("${General::swroot}/certs/$confighash{$key}[1]cert.pem");
                unlink ("${General::swroot}/certs/$confighash{$key}[1].p12");
                delete $confighash{$key};
@@ -586,17 +689,26 @@ END
        if ($assignedcerts) {
            &Header::showhttpheaders();
            &Header::openpage($Lang::tr{'vpn configuration main'}, 1, '');
-           &Header::openbigbox('100%', 'LEFT', '', '');
-           &Header::openbox('100%', 'LEFT', $Lang::tr{'are you sure'});
+           &Header::openbigbox('100%', 'left', '', '');
+           &Header::openbox('100%', 'left', $Lang::tr{'are you sure'});
            print <<END
-               <table><form method='post'><input type='hidden' name='AREUSURE' value='yes' />
-                      <input type='hidden' name='KEY' value='$cgiparams{'KEY'}' />
-                   <tr><td align='center'>
-                       <b><font color='${Header::colourred}'>$Lang::tr{'capswarning'}</font></b>: $assignedcerts
-                       $Lang::tr{'connections are associated with this ca.  deleting the ca will delete these connections as well.'}
-                   <tr><td align='center'><input type='submit' name='ACTION' value='$Lang::tr{'remove ca certificate'}' />
-                       <input type='submit' name='ACTION' value='$Lang::tr{'cancel'}' /></td></tr>
-               </form></table>
+           <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+           <table width='100%'>
+               <tr>
+                   <td align='center'>
+                   <input type='hidden' name='KEY' value='$cgiparams{'KEY'}' />
+                   <input type='hidden' name='AREUSURE' value='yes' /></td>
+               </tr><tr>
+                   <td align='center'>
+                   <b><font color='${Header::colourred}'>$Lang::tr{'capswarning'}</font></b>
+                   $Lang::tr{'connections are associated with this ca.  deleting the ca will delete these connections as well.'}</td>
+               </tr><tr>
+                   <td align='center'>
+                   <input type='submit' name='ACTION' value='$Lang::tr{'remove ca certificate'}' />
+                   <input type='submit' name='ACTION' value='$Lang::tr{'cancel'}' /></td>
+               </tr>
+           </table>
+           </form>
 END
            ;
            &Header::closebox();
@@ -622,12 +734,12 @@ END
     my $output;
     &Header::showhttpheaders();
     &Header::openpage($Lang::tr{'vpn configuration main'}, 1, '');
-    &Header::openbigbox('100%', 'LEFT', '', '');
+    &Header::openbigbox('100%', 'left', '', '');
     if ($cgiparams{'ACTION'} eq $Lang::tr{'show root certificate'}) {
-       &Header::openbox('100%', 'LEFT', "$Lang::tr{'root certificate'}:");
+       &Header::openbox('100%', 'left', "$Lang::tr{'root certificate'}:");
        $output = `/usr/bin/openssl x509 -text -in ${General::swroot}/ca/cacert.pem`;
     } else {
-       &Header::openbox('100%', 'LEFT', "$Lang::tr{'host certificate'}:");
+       &Header::openbox('100%', 'left', "$Lang::tr{'host certificate'}:");
        $output = `/usr/bin/openssl x509 -text -in ${General::swroot}/certs/hostcert.pem`;
     }
     $output = &Header::cleanhtml($output,"y");
@@ -639,40 +751,40 @@ END
     exit(0);
 
 ###
-### Download root certificate
+### Export root certificate to browser
 ###
 } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'download root certificate'}) {
     if ( -f "${General::swroot}/ca/cacert.pem" ) {
-       print "Content-Type: application/octet-stream\r\n";
-       print "Content-Disposition: filename=cacert.pem\r\n\r\n";
+       print "Content-Type: application/force-download\n";
+       print "Content-Disposition: attachment; filename=cacert.pem\r\n\r\n";
        print `/usr/bin/openssl x509 -in ${General::swroot}/ca/cacert.pem`;
        exit(0);
     }
 ###
-### Download host certificate
+### Export host certificate to browser
 ###
 } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'download host certificate'}) {
     if ( -f "${General::swroot}/certs/hostcert.pem" ) {
-       print "Content-Type: application/octet-stream\r\n";
-       print "Content-Disposition: filename=hostcert.pem\r\n\r\n";
+       print "Content-Type: application/force-download\n";
+       print "Content-Disposition: attachment; filename=hostcert.pem\r\n\r\n";
        print `/usr/bin/openssl x509 -in ${General::swroot}/certs/hostcert.pem`;
        exit(0);
     }
 ###
-### Form for generating a root certificate
+### Form for generating/importing the caroot+host certificate
 ###
 } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'generate root/host certificates'} ||
         $cgiparams{'ACTION'} eq $Lang::tr{'upload p12 file'}) {
 
-    &General::readhash("${General::swroot}/vpn/settings", \%vpnsettings);
     if (-f "${General::swroot}/ca/cacert.pem") {
        $errormessage = $Lang::tr{'valid root certificate already exists'};
-       $cgiparams{'ACTION'} = '';
-       goto ROOTCERT_ERROR;
+       goto ROOTCERT_SKIP;
     }
 
-    if (($cgiparams{'ROOTCERT_HOSTNAME'} eq '') && -e "${General::swroot}/red/active") {
-       if (open(IPADDR, "${General::swroot}/red/local-ipaddress")) {
+    &General::readhash("${General::swroot}/vpn/settings", \%vpnsettings);
+    # fill in initial values
+    if ($cgiparams{'ROOTCERT_HOSTNAME'} eq '') {
+       if (-e "${General::swroot}/red/active" && open(IPADDR, "${General::swroot}/red/local-ipaddress")) {
            my $ipaddr = <IPADDR>;
            close IPADDR;
            chomp ($ipaddr);
@@ -681,7 +793,9 @@ END
                $cgiparams{'ROOTCERT_HOSTNAME'} = $ipaddr;
            }
        }
+       $cgiparams{'ROOTCERT_COUNTRY'} = $vpnsettings{'ROOTCERT_COUNTRY'} if (!$cgiparams{'ROOTCERT_COUNTRY'});
     } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'upload p12 file'}) {
+       &General::log("ipsec", "Importing from p12...");
 
        if (ref ($cgiparams{'FH'}) ne 'Fh') {
            $errormessage = $Lang::tr{'there was no file upload'};
@@ -695,124 +809,82 @@ END
            goto ROOTCERT_ERROR;
        }
 
-       # Create a temporary dirctory
-       my $tempdir = tempdir( CLEANUP => 1 );
-
        # Extract the CA certificate from the file
-       my $pid = open(OPENSSL, "|-");
-       $SIG{ALRM} = sub { $errormessage = $Lang::tr{'broken pipe'}; goto ROOTCERT_ERROR;};
-       if ($pid) {     # parent
-           if ($cgiparams{'P12_PASS'} ne '') {
-               print OPENSSL "$cgiparams{'P12_PASS'}\n";
-           }
-           close (OPENSSL);
-           if ($?) {
-               $errormessage = "$Lang::tr{'openssl produced an error'}: $?";
-               unlink ($filename);
-               goto ROOTCERT_ERROR;
-           }
-       } else {        # child
-           unless (exec ('/usr/bin/openssl', 'pkcs12', '-cacerts', '-nokeys',
-                   '-in', $filename,
-                   '-out', "$tempdir/cacert.pem")) {
-               $errormessage = "$Lang::tr{'cant start openssl'}: $!";
-               unlink ($filename);
-               goto ROOTCERT_ERROR;
-           }
+       &General::log("ipsec", "Extracting caroot from p12...");
+       if (open(STDIN, "-|")) {
+           my  $opt  = " pkcs12 -cacerts -nokeys";
+               $opt .= " -in $filename";
+               $opt .= " -out /tmp/newcacert";
+           $errormessage = &callssl ($opt);
+       } else {        #child
+           print "$cgiparams{'P12_PASS'}\n";
+           exit (0);
        }
 
-       # Extract the Host certificate from the file
-       $pid = open(OPENSSL, "|-");
-       $SIG{ALRM} = sub { $errormessage = $Lang::tr{'broken pipe'}; goto ROOTCERT_ERROR;};
-       if ($pid) {     # parent
-           if ($cgiparams{'P12_PASS'} ne '') {
-               print OPENSSL "$cgiparams{'P12_PASS'}\n";
-           }
-           close (OPENSSL);
-           if ($?) {
-               $errormessage = "$Lang::tr{'openssl produced an error'}: $?";
-               unlink ($filename);
-               goto ROOTCERT_ERROR;
-           }
-       } else {        # child
-           unless (exec ('/usr/bin/openssl', 'pkcs12', '-clcerts', '-nokeys',
-                   '-in', $filename,
-                   '-out', "$tempdir/hostcert.pem")) {
-               $errormessage = "$Lang::tr{'cant start openssl'}: $!";
-               unlink ($filename);
-               goto ROOTCERT_ERROR;
+       # Extract the Host certificate from the file
+       if (!$errormessage) {
+           &General::log("ipsec", "Extracting host cert from p12...");
+           if (open(STDIN, "-|")) {
+               my  $opt  = " pkcs12 -clcerts -nokeys";
+                   $opt .= " -in $filename";
+                   $opt .= " -out /tmp/newhostcert";
+               $errormessage = &callssl ($opt);
+           } else {    #child
+               print "$cgiparams{'P12_PASS'}\n";
+               exit (0);
            }
        }
 
        # Extract the Host key from the file
-       $pid = open(OPENSSL, "|-");
-       $SIG{ALRM} = sub { $errormessage = $Lang::tr{'broken pipe'}; goto ROOTCERT_ERROR;};
-       if ($pid) {     # parent
-           if ($cgiparams{'P12_PASS'} ne '') {
-               print OPENSSL "$cgiparams{'P12_PASS'}\n";
-           }
-           close (OPENSSL);
-           if ($?) {
-               $errormessage = "$Lang::tr{'openssl produced an error'}: $?";
-               unlink ($filename);
-               goto ROOTCERT_ERROR;
-           }
-       } else {        # child
-           unless (exec ('/usr/bin/openssl', 'pkcs12', '-nocerts',
-                   '-nodes',
-                   '-in', $filename,
-                   '-out', "$tempdir/hostkey.pem")) {
-               $errormessage = "$Lang::tr{'cant start openssl'}: $!";
-               unlink ($filename);
-               goto ROOTCERT_ERROR;
-           }
-       }
-
-       move("$tempdir/cacert.pem", "${General::swroot}/ca/cacert.pem");
-       if ($? ne 0) {
-           $errormessage = "$Lang::tr{'certificate file move failed'}: $!";
-           unlink ($filename);
-           unlink ("${General::swroot}/ca/cacert.pem");
-           unlink ("${General::swroot}/certs/hostcert.pem");
-           unlink ("${General::swroot}/certs/hostkey.pem");
-           goto ROOTCERT_ERROR;
+       if (!$errormessage) {
+           &General::log("ipsec", "Extracting private key from p12...");
+           if (open(STDIN, "-|")) {
+               my  $opt  = " pkcs12 -nocerts -nodes";
+                   $opt .= " -in $filename";
+                   $opt .= " -out /tmp/newhostkey";
+               $errormessage = &callssl ($opt);
+           } else {    #child
+               print "$cgiparams{'P12_PASS'}\n";
+               exit (0);
+           }
+       }
+
+       if (!$errormessage) {
+           &General::log("ipsec", "Moving cacert...");
+           move("/tmp/newcacert", "${General::swroot}/ca/cacert.pem");
+           $errormessage = "$Lang::tr{'certificate file move failed'}: $!" if ($? ne 0);
+       }
+
+       if (!$errormessage) {
+           &General::log("ipsec", "Moving host cert...");
+           move("/tmp/newhostcert", "${General::swroot}/certs/hostcert.pem");
+           $errormessage = "$Lang::tr{'certificate file move failed'}: $!" if ($? ne 0);
         }
 
-       move("$tempdir/hostcert.pem", "${General::swroot}/certs/hostcert.pem");
-       if ($? ne 0) {
-           $errormessage = "$Lang::tr{'certificate file move failed'}: $!";
-           unlink ($filename);
-           unlink ("${General::swroot}/ca/cacert.pem");
-           unlink ("${General::swroot}/certs/hostcert.pem");
-           unlink ("${General::swroot}/certs/hostkey.pem");
-           goto ROOTCERT_ERROR;
+       if (!$errormessage) {
+           &General::log("ipsec", "Moving private key...");
+           move("/tmp/newhostkey", "${General::swroot}/certs/hostkey.pem");
+           $errormessage = "$Lang::tr{'certificate file move failed'}: $!" if ($? ne 0);
         }
-
-       move("$tempdir/hostkey.pem", "${General::swroot}/certs/hostkey.pem");
-       if ($? ne 0) {
-           $errormessage = "$Lang::tr{'certificate file move failed'}: $!";
-           unlink ($filename);
+       
+       #cleanup temp files
+       unlink ($filename);
+       unlink ('/tmp/newcacert');
+       unlink ('/tmp/newhostcert');
+       unlink ('/tmp/newhostkey');
+       if ($errormessage) {
            unlink ("${General::swroot}/ca/cacert.pem");
            unlink ("${General::swroot}/certs/hostcert.pem");
            unlink ("${General::swroot}/certs/hostkey.pem");
            goto ROOTCERT_ERROR;
-        }
-
-       # Create an empty CRL
-       system('/usr/bin/openssl', 'ca', '-gencrl',
-               '-out', "${General::swroot}/crls/cacrl.pem");
-       if ($?) {
-           $errormessage = "$Lang::tr{'openssl produced an error'}: $?";
-           unlink ("${General::swroot}/certs/hostkey.pem");
-           unlink ("${General::swroot}/certs/hostcert.pem");
-           unlink ("${General::swroot}/ca/cacert.pem");
-           unlink ("${General::swroot}/crls/cacrl.pem");
-           &cleanssldatabase();
-           goto ROOTCERT_ERROR;
-       } else {
-           &cleanssldatabase();
        }
 
+       # Create empty CRL cannot be done because we don't have
+       # the private key for this CAROOT
+       # Ipcop can only import certificates
+
+       &General::log("ipsec", "p12 import completed!");
+       &cleanssldatabase();
        goto ROOTCERT_SUCCESS;
 
     } elsif ($cgiparams{'ROOTCERT_COUNTRY'} ne '') {
@@ -862,6 +934,18 @@ END
            $errormessage = $Lang::tr{'invalid input for country'};
            goto ROOTCERT_ERROR;
        }
+       #the exact syntax is a list comma separated of 
+       #  email:any-validemail
+       #       URI: a uniform resource indicator
+       #   DNS: a DNS domain name
+       #   RID: a registered OBJECT IDENTIFIER
+       #   IP: an IP address
+       # example: email:franck@foo.com,IP:10.0.0.10,DNS:franck.foo.com
+
+       if ($cgiparams{'SUBJECTALTNAME'} ne '' && $cgiparams{'SUBJECTALTNAME'} !~ /^(email|URI|DNS|RID|IP):[a-zA-Z0-9 :\/,\.\-_@]*$/) {
+           $errormessage = $Lang::tr{'vpn altname syntax'};
+           goto VPNCONF_ERROR;
+       }
 
        # Copy the cgisettings to vpnsettings and save the configfile
        $vpnsettings{'ROOTCERT_ORGANIZATION'}   = $cgiparams{'ROOTCERT_ORGANIZATION'};
@@ -879,193 +963,176 @@ END
        (my $state = $cgiparams{'ROOTCERT_STATE'}) =~ s/^\s*$/\./;
 
        # Create the CA certificate
-       my $pid = open(OPENSSL, "|-");
-       $SIG{ALRM} = sub { $errormessage = $Lang::tr{'broken pipe'}; goto ROOTCERT_ERROR;};
-       if ($pid) {     # parent
-           print OPENSSL "$cgiparams{'ROOTCERT_COUNTRY'}\n";
-           print OPENSSL "$state\n";
-           print OPENSSL "$city\n";
-           print OPENSSL "$cgiparams{'ROOTCERT_ORGANIZATION'}\n";
-           print OPENSSL "$ou\n";
-           print OPENSSL "$cgiparams{'ROOTCERT_ORGANIZATION'} CA\n";
-           print OPENSSL "$cgiparams{'ROOTCERT_EMAIL'}\n";
-           close (OPENSSL);
-           if ($?) {
-               $errormessage = "$Lang::tr{'openssl produced an error'}: $?";
-               unlink ("${General::swroot}/private/cakey.pem");
-               unlink ("${General::swroot}/ca/cacert.pem");
-               goto ROOTCERT_ERROR;
-           }
-       } else {        # child
-           unless (exec ('/usr/bin/openssl', 'req', '-x509', '-nodes', '-rand', '/proc/interrupts:/proc/net/rt_cache',
-                       '-days', '999999', '-newkey', 'rsa:2048',
-                       '-keyout', "${General::swroot}/private/cakey.pem",
-                       '-out', "${General::swroot}/ca/cacert.pem")) {
-               $errormessage = "$Lang::tr{'cant start openssl'}: $!";
-               goto ROOTCERT_ERROR;
+       if (!$errormessage) {
+           &General::log("ipsec", "Creating cacert...");
+           if (open(STDIN, "-|")) {
+               my $opt  = " req -x509 -nodes -rand /proc/interrupts:/proc/net/rt_cache";
+                  $opt .= " -days 999999";
+                  $opt .= " -newkey rsa:2048";
+                  $opt .= " -keyout ${General::swroot}/private/cakey.pem";
+                  $opt .= " -out ${General::swroot}/ca/cacert.pem";
+
+               $errormessage = &callssl ($opt);
+           } else {    #child
+               print  "$cgiparams{'ROOTCERT_COUNTRY'}\n";
+               print  "$state\n";
+               print  "$city\n";
+               print  "$cgiparams{'ROOTCERT_ORGANIZATION'}\n";
+               print  "$ou\n";
+               print  "$cgiparams{'ROOTCERT_ORGANIZATION'} CA\n";
+               print  "$cgiparams{'ROOTCERT_EMAIL'}\n";
+               exit (0);
            }
        }
 
        # Create the Host certificate request
-       $pid = open(OPENSSL, "|-");
-       $SIG{ALRM} = sub { $errormessage = $Lang::tr{'broken pipe'}; goto ROOTCERT_ERROR;};
-       if ($pid) {     # parent
-           print OPENSSL "$cgiparams{'ROOTCERT_COUNTRY'}\n";
-           print OPENSSL "$state\n";
-           print OPENSSL "$city\n";
-           print OPENSSL "$cgiparams{'ROOTCERT_ORGANIZATION'}\n";
-           print OPENSSL "$ou\n";
-           print OPENSSL "$cgiparams{'ROOTCERT_HOSTNAME'}\n";
-           print OPENSSL "$cgiparams{'ROOTCERT_EMAIL'}\n";
-           print OPENSSL ".\n";
-           print OPENSSL ".\n";
-           close (OPENSSL);
-           if ($?) {
-               $errormessage = "$Lang::tr{'openssl produced an error'}: $?";
-               unlink ("${General::swroot}/certs/hostkey.pem");
-               unlink ("${General::swroot}/certs/hostreq.pem");
-               goto ROOTCERT_ERROR;
-           }
-       } else {        # child
-           unless (exec ('/usr/bin/openssl', 'req', '-nodes', '-rand', '/proc/interrupts:/proc/net/rt_cache',
-                       '-newkey', 'rsa:1024',
-                       '-keyout', "${General::swroot}/certs/hostkey.pem",
-                       '-out', "${General::swroot}/certs/hostreq.pem")) {
-               $errormessage = "$Lang::tr{'cant start openssl'}: $!";
-               unlink ("${General::swroot}/certs/hostkey.pem");
-               unlink ("${General::swroot}/certs/hostreq.pem");
-               unlink ("${General::swroot}/private/cakey.pem");
-               unlink ("${General::swroot}/ca/cacert.pem");
-               goto ROOTCERT_ERROR;
+       if (!$errormessage) {
+           &General::log("ipsec", "Creating host cert...");
+           if (open(STDIN, "-|")) {
+               my $opt  = " req -nodes -rand /proc/interrupts:/proc/net/rt_cache";
+                  $opt .= " -newkey rsa:1024";
+                  $opt .= " -keyout ${General::swroot}/certs/hostkey.pem";
+                  $opt .= " -out ${General::swroot}/certs/hostreq.pem";
+               $errormessage = &callssl ($opt);
+           } else {    #child
+               print  "$cgiparams{'ROOTCERT_COUNTRY'}\n";
+               print  "$state\n";
+               print  "$city\n";
+               print  "$cgiparams{'ROOTCERT_ORGANIZATION'}\n";
+               print  "$ou\n";
+               print  "$cgiparams{'ROOTCERT_HOSTNAME'}\n";
+               print  "$cgiparams{'ROOTCERT_EMAIL'}\n";
+               print  ".\n";
+               print  ".\n";
+               exit (0);
            }
        }
-       
+
        # Sign the host certificate request
-       system('/usr/bin/openssl', 'ca', '-days', '999999',
-               '-batch', '-notext',
-               '-in',  "${General::swroot}/certs/hostreq.pem",
-               '-out', "${General::swroot}/certs/hostcert.pem");
-       if ($?) {
-           $errormessage = "$Lang::tr{'openssl produced an error'}: $?";
-           unlink ("${General::swroot}/private/cakey.pem");
-           unlink ("${General::swroot}/ca/cacert.pem");
-           unlink ("${General::swroot}/certs/hostkey.pem");
-           unlink ("${General::swroot}/certs/hostreq.pem");
-           unlink ("${General::swroot}/certs/hostcert.pem");
-           &cleanssldatabase();
-           goto ROOTCERT_ERROR;
-       } else {
-           unlink ("${General::swroot}/certs/hostreq.pem");
-           &cleanssldatabase();
+       if (!$errormessage) {
+           &General::log("ipsec", "Self signing host cert...");
+
+           #No easy way for specifying the contain of subjectAltName without writing a config file...
+           my ($fh, $v3extname) = tempfile ('/tmp/XXXXXXXX');
+           print $fh <<END
+           basicConstraints=CA:FALSE
+           nsComment="OpenSSL Generated Certificate"
+           subjectKeyIdentifier=hash
+           authorityKeyIdentifier=keyid,issuer:always
+END
+;
+           print $fh "subjectAltName=$cgiparams{'SUBJECTALTNAME'}" if ($cgiparams{'SUBJECTALTNAME'});
+           close ($fh);
+           
+           my  $opt  = " ca -days 999999";
+               $opt .= " -batch -notext";
+               $opt .= " -in ${General::swroot}/certs/hostreq.pem";
+               $opt .= " -out ${General::swroot}/certs/hostcert.pem";
+               $opt .= " -extfile $v3extname";
+           $errormessage = &callssl ($opt);
+           unlink ("${General::swroot}/certs/hostreq.pem"); #no more needed
+           unlink ($v3extname);
        }
 
        # Create an empty CRL
-       system('/usr/bin/openssl', 'ca', '-gencrl',
-               '-out', "${General::swroot}/crls/cacrl.pem");
-       if ($?) {
-           $errormessage = "$Lang::tr{'openssl produced an error'}: $?";
-           unlink ("${General::swroot}/certs/hostkey.pem");
-           unlink ("${General::swroot}/certs/hostcert.pem");
-           unlink ("${General::swroot}/ca/cacert.pem");
-           unlink ("${General::swroot}/crls/cacrl.pem");
-           &cleanssldatabase();
-           goto ROOTCERT_ERROR;
-       } else {
+       if (!$errormessage) {
+           &General::log("ipsec", "Creating emptycrl...");
+           my  $opt  = " ca -gencrl";
+               $opt .= " -out ${General::swroot}/crls/cacrl.pem";
+           $errormessage = &callssl ($opt);
+       }
+       
+       # Successfully build CA / CERT!
+       if (!$errormessage) {
            &cleanssldatabase();
+           goto ROOTCERT_SUCCESS;
        }
-       goto ROOTCERT_SUCCESS;
+       
+       #Cleanup
+       unlink ("${General::swroot}/ca/cacert.pem");
+       unlink ("${General::swroot}/certs/hostkey.pem");
+       unlink ("${General::swroot}/certs/hostcert.pem");
+       unlink ("${General::swroot}/crls/cacrl.pem");
+       &cleanssldatabase();
     }
+
     ROOTCERT_ERROR:
-    if ($cgiparams{'ACTION'} ne '') {
-       &Header::showhttpheaders();
-       &Header::openpage($Lang::tr{'vpn configuration main'}, 1, '');
-       &Header::openbigbox('100%', 'LEFT', '', $errormessage);
-       if ($errormessage) {
-           &Header::openbox('100%', 'LEFT', $Lang::tr{'error messages'});
-           print "<class name='base'>$errormessage";
-           print "&nbsp;</class>";
-           &Header::closebox();
-       }
-       &Header::openbox('100%', 'LEFT', "$Lang::tr{'generate root/host certificates'}:");
-       print <<END
-       <form method='post' enctype='multipart/form-data'>
-       <table width='100%' border='0' cellspacing='1' cellpadding='0'>
-       <tr><td width='30%' class='base'>$Lang::tr{'organization name'}:</td>
-           <td width='35%' class='base' nowrap='nowrap'><input type='text' name='ROOTCERT_ORGANIZATION' value='$cgiparams{'ROOTCERT_ORGANIZATION'}' size='32' /></td>
-           <td width='35%' colspan='2'>&nbsp;</td></tr>
-       <tr><td class='base'>$Lang::tr{'ipfires hostname'}:</td>
-           <td class='base' nowrap='nowrap'><input type='text' name='ROOTCERT_HOSTNAME' value='$cgiparams{'ROOTCERT_HOSTNAME'}' size='32' /></td>
-           <td colspan='2'>&nbsp;</td></tr>
-       <tr><td class='base'>$Lang::tr{'your e-mail'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
-           <td class='base' nowrap='nowrap'><input type='text' name='ROOTCERT_EMAIL' value='$cgiparams{'ROOTCERT_EMAIL'}' size='32' /></td>
-           <td colspan='2'>&nbsp;</td></tr>
-       <tr><td class='base'>$Lang::tr{'your department'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
-           <td class='base' nowrap='nowrap'><input type='text' name='ROOTCERT_OU' value='$cgiparams{'ROOTCERT_OU'}' size='32' /></td>
-           <td colspan='2'>&nbsp;</td></tr>
-       <tr><td class='base'>$Lang::tr{'city'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
-           <td class='base' nowrap='nowrap'><input type='text' name='ROOTCERT_CITY' value='$cgiparams{'ROOTCERT_CITY'}' size='32' /></td>
-           <td colspan='2'>&nbsp;</td></tr>
-       <tr><td class='base'>$Lang::tr{'state or province'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
-           <td class='base' nowrap='nowrap'><input type='text' name='ROOTCERT_STATE' value='$cgiparams{'ROOTCERT_STATE'}' size='32' /></td>
-           <td colspan='2'>&nbsp;</td></tr>
-       <tr><td class='base'>$Lang::tr{'country'}:</td>
-           <td class='base'><select name='ROOTCERT_COUNTRY'>
-END
-       ;
-       foreach my $country (sort keys %{Countries::countries}) {
-           print "<option value='$Countries::countries{$country}'";
-           if ( $Countries::countries{$country} eq $cgiparams{'ROOTCERT_COUNTRY'} ) {
-               print " selected='selected'";
-           }
-           print ">$country</option>";
-       }
-       print <<END
-           </select></td>
-           <td colspan='2'>&nbsp;</td></tr>
-       <tr><td>&nbsp;</td>
-           <td><br /><input type='submit' name='ACTION' value='$Lang::tr{'generate root/host certificates'}' /><br /><br /></td>
-           <td>&nbsp;</td><td>&nbsp;</td></tr>
-       <tr><td class='base' align='left' valign='top'>
-           <img src='/blob.gif' valign='top' alt='*' />&nbsp;$Lang::tr{'this field may be blank'}</td>
-           <td class='base' align='left'>
-           <b><font color='${Header::colourred}'>$Lang::tr{'capswarning'}</font></b>: 
-           $Lang::tr{'generating the root and host certificates may take a long time. it can take up to several minutes on older hardware. please be patient'}
-       </td></tr>
-       <tr><td colspan='4'><hr /></td></tr>
-       <tr><td class='base' nowrap='nowrap'>$Lang::tr{'upload p12 file'}:</td>
-           <td nowrap='nowrap'><input type='file' name='FH' size='32'></td>
-           <td colspan='2'>&nbsp;</td></tr>
-       <tr><td class='base'>$Lang::tr{'pkcs12 file password'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
-           <td class='base' nowrap='nowrap'><input type='password' name='P12_PASS' value='$cgiparams{'P12_PASS'}' size='32' /></td>
-            <td colspan='2'>&nbsp;</td></tr>
-       <tr><td>&nbsp;</td>
-           <td><input type='submit' name='ACTION' value='$Lang::tr{'upload p12 file'}' /></td>
-            <td colspan='2'>&nbsp;</td></tr>
-       <tr><td class='base' colspan='4' align='left'>
-           <img src='/blob.gif' valign='top' alt='*' />&nbsp;$Lang::tr{'this field may be blank'}</td></tr>
-       </form></table>
+    &Header::showhttpheaders();
+    &Header::openpage($Lang::tr{'vpn configuration main'}, 1, '');
+    &Header::openbigbox('100%', 'left', '', $errormessage);
+    if ($errormessage) {
+        &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
+        print "<class name='base'>$errormessage";
+        print "&nbsp;</class>";
+        &Header::closebox();
+    }
+    &Header::openbox('100%', 'left', "$Lang::tr{'generate root/host certificates'}:");
+    print <<END
+    <form method='post' enctype='multipart/form-data' action='$ENV{'SCRIPT_NAME'}'>
+    <table width='100%' border='0' cellspacing='1' cellpadding='0'>
+    <tr><td width='40%' class='base'>$Lang::tr{'organization name'}:</td>
+        <td width='60%' class='base' nowrap='nowrap'><input type='text' name='ROOTCERT_ORGANIZATION' value='$cgiparams{'ROOTCERT_ORGANIZATION'}' size='32' /></td></tr>
+    <tr><td class='base'>$Lang::tr{'ipcops hostname'}:</td>
+        <td class='base' nowrap='nowrap'><input type='text' name='ROOTCERT_HOSTNAME' value='$cgiparams{'ROOTCERT_HOSTNAME'}' size='32' /></td></tr>
+    <tr><td class='base'>$Lang::tr{'your e-mail'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
+        <td class='base' nowrap='nowrap'><input type='text' name='ROOTCERT_EMAIL' value='$cgiparams{'ROOTCERT_EMAIL'}' size='32' /></td></tr>
+    <tr><td class='base'>$Lang::tr{'your department'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
+        <td class='base' nowrap='nowrap'><input type='text' name='ROOTCERT_OU' value='$cgiparams{'ROOTCERT_OU'}' size='32' /></td></tr>
+    <tr><td class='base'>$Lang::tr{'city'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
+        <td class='base' nowrap='nowrap'><input type='text' name='ROOTCERT_CITY' value='$cgiparams{'ROOTCERT_CITY'}' size='32' /></td></tr>
+    <tr><td class='base'>$Lang::tr{'state or province'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
+        <td class='base' nowrap='nowrap'><input type='text' name='ROOTCERT_STATE' value='$cgiparams{'ROOTCERT_STATE'}' size='32' /></td></tr>
+    <tr><td class='base'>$Lang::tr{'country'}:</td>
+        <td class='base'><select name='ROOTCERT_COUNTRY'>
 END
-       ;
-       &Header::closebox();
-
-       &Header::closebigbox();
-       &Header::closepage();
-        exit(0)
+    ;
+    foreach my $country (sort keys %{Countries::countries}) {
+        print "<option value='$Countries::countries{$country}'";
+        if ( $Countries::countries{$country} eq $cgiparams{'ROOTCERT_COUNTRY'} ) {
+            print " selected='selected'";
+        }
+        print ">$country</option>";
     }
+    print <<END
+        </select></td></tr>
+    <tr><td class='base'>$Lang::tr{'vpn subjectaltname'} (subjectAltName=email:*,URI:*,DNS:*,RID:*) <img src='/blob.gif' alt='*' /></td>
+       <td class='base' nowrap='nowrap'><input type='text' name='SUBJECTALTNAME' value='$cgiparams{'SUBJECTALTNAME'}' size='32' /></td></tr>
+    <tr><td>&nbsp;</td>
+        <td><br /><input type='submit' name='ACTION' value='$Lang::tr{'generate root/host certificates'}' /><br /><br /></td></tr>
+    <tr><td class='base' colspan='2' align='left'>
+        <b><font color='${Header::colourred}'>$Lang::tr{'capswarning'}</font></b>: 
+        $Lang::tr{'generating the root and host certificates may take a long time. it can take up to several minutes on older hardware. please be patient'}
+    </td></tr>
+    <tr><td colspan='2'><hr /></td></tr>
+    <tr><td class='base' nowrap='nowrap'>$Lang::tr{'upload p12 file'}:</td>
+        <td nowrap='nowrap'><input type='file' name='FH' size='32' /></td></tr>
+    <tr><td class='base'>$Lang::tr{'pkcs12 file password'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
+        <td class='base' nowrap='nowrap'><input type='password' name='P12_PASS' value='$cgiparams{'P12_PASS'}' size='32' /></td></tr>
+    <tr><td>&nbsp;</td>
+        <td><input type='submit' name='ACTION' value='$Lang::tr{'upload p12 file'}' /></td></tr>
+    <tr><td class='base' colspan='2' align='left'>
+        <img src='/blob.gif' alt='*' />&nbsp;$Lang::tr{'this field may be blank'}</td></tr>
+    </table></form>
+END
+    ;
+    &Header::closebox();
+    &Header::closebigbox();
+    &Header::closepage();
+    exit(0);
 
     ROOTCERT_SUCCESS:
-    if ($vpnsettings{'ENABLED'} eq 'on' ||
-       $vpnsettings{'ENABLE_BLUE'} eq 'on') {
+    if (&vpnenabled) {
        system('/usr/local/bin/ipsecctrl', 'S');
        sleep $sleepDelay;
     }
+    ROOTCERT_SKIP:
 ###
-### Download PKCS12 file
+### Export PKCS12 file to browser
 ###
 } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'download pkcs12 file'}) {
     &General::readhasharray("${General::swroot}/vpn/config", \%confighash);
-
-    print "Content-Disposition: filename=" . $confighash{$cgiparams{'KEY'}}[1] . ".p12\r\n";
+    print "Content-Type: application/force-download\n";
+    print "Content-Disposition: attachment; filename=" . $confighash{$cgiparams{'KEY'}}[1] . ".p12\r\n";
     print "Content-Type: application/octet-stream\r\n\r\n";
     print `/bin/cat ${General::swroot}/certs/$confighash{$cgiparams{'KEY'}}[1].p12`;
     exit (0);
@@ -1079,8 +1146,8 @@ END
     if ( -f "${General::swroot}/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem") {
        &Header::showhttpheaders();
        &Header::openpage($Lang::tr{'vpn configuration main'}, 1, '');
-       &Header::openbigbox('100%', 'LEFT', '', '');
-       &Header::openbox('100%', 'LEFT', "$Lang::tr{'certificate'}:");
+       &Header::openbigbox('100%', 'left', '', '');
+       &Header::openbox('100%', 'left', "$Lang::tr{'cert'}:");
        my $output = `/usr/bin/openssl x509 -text -in ${General::swroot}/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem`;
        $output = &Header::cleanhtml($output,"y");
        print "<pre>$output</pre>\n";
@@ -1092,14 +1159,14 @@ END
     }
 
 ###
-### Download Certificate
+### Export Certificate to browser
 ###
 } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'download certificate'}) {
     &General::readhasharray("${General::swroot}/vpn/config", \%confighash);
 
     if ( -f "${General::swroot}/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem") {
-       print "Content-Disposition: filename=" . $confighash{$cgiparams{'KEY'}}[1] . "cert.pem\r\n";
-       print "Content-Type: application/octet-stream\r\n\r\n";
+       print "Content-Type: application/force-download\n";
+       print "Content-Disposition: attachment; filename=" . $confighash{$cgiparams{'KEY'}}[1] . "cert.pem\n\n";
        print `/bin/cat ${General::swroot}/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem`;
        exit (0);
     }
@@ -1117,20 +1184,14 @@ END
            $confighash{$cgiparams{'KEY'}}[0] = 'on';
            &General::writehasharray("${General::swroot}/vpn/config", \%confighash);
            &writeipsecfiles();
-           if ($vpnsettings{'ENABLED'} eq 'on' ||
-               $vpnsettings{'ENABLED_BLUE'} eq 'on') {
-               system('/usr/local/bin/ipsecctrl', 'S', $cgiparams{'KEY'});
-               sleep $sleepDelay;
-           }
+           system('/usr/local/bin/ipsecctrl', 'S', $cgiparams{'KEY'}) if (&vpnenabled);
        } else {
            $confighash{$cgiparams{'KEY'}}[0] = 'off';
-           if ($vpnsettings{'ENABLED'} eq 'on' ||
-               $vpnsettings{'ENABLED_BLUE'} eq 'on') {
-               system('/usr/local/bin/ipsecctrl', 'D', $cgiparams{'KEY'});
-           }
            &General::writehasharray("${General::swroot}/vpn/config", \%confighash);
            &writeipsecfiles();
+           system('/usr/local/bin/ipsecctrl', 'D', $cgiparams{'KEY'}) if (&vpnenabled);
        }
+       sleep $sleepDelay;
     } else {
        $errormessage = $Lang::tr{'invalid key'};
     }
@@ -1143,8 +1204,7 @@ END
     &General::readhasharray("${General::swroot}/vpn/config", \%confighash);
 
     if ($confighash{$cgiparams{'KEY'}}) {
-       if ($vpnsettings{'ENABLED'} eq 'on' ||
-           $vpnsettings{'ENABLED_BLUE'} eq 'on') {
+       if (&vpnenabled) {
            system('/usr/local/bin/ipsecctrl', 'S', $cgiparams{'KEY'});
            sleep $sleepDelay;
        }
@@ -1160,10 +1220,7 @@ END
     &General::readhasharray("${General::swroot}/vpn/config", \%confighash);
 
     if ($confighash{$cgiparams{'KEY'}}) {
-       if ($vpnsettings{'ENABLED'} eq 'on' ||
-           $vpnsettings{'ENABLED_BLUE'} eq 'on') {
-           system('/usr/local/bin/ipsecctrl', 'D', $cgiparams{'KEY'});
-       }
+       system('/usr/local/bin/ipsecctrl', 'D', $cgiparams{'KEY'}) if (&vpnenabled);
        unlink ("${General::swroot}/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem");
        unlink ("${General::swroot}/certs/$confighash{$cgiparams{'KEY'}}[1].p12");
        delete $confighash{$cgiparams{'KEY'}};
@@ -1177,20 +1234,23 @@ END
 ### Choose between adding a host-net or net-net connection
 ###
 } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'add'} && $cgiparams{'TYPE'} eq '') {
-       &General::readhash("${General::swroot}/vpn/settings", \%vpnsettings);
        &Header::showhttpheaders();
        &Header::openpage($Lang::tr{'vpn configuration main'}, 1, '');
-       &Header::openbigbox('100%', 'LEFT', '', '');
-       &Header::openbox('100%', 'LEFT', $Lang::tr{'connection type'});
+       &Header::openbigbox('100%', 'left', '', '');
+       &Header::openbox('100%', 'left', $Lang::tr{'connection type'});
        print <<END
+           <form method='post' action='$ENV{'SCRIPT_NAME'}'>
            <b>$Lang::tr{'connection type'}:</b><br />
-           <table><form method='post'>
-           <tr><td><input type='radio' name='TYPE' value='host' checked /></td>
-               <td class='base'>$Lang::tr{'host to net vpn'}</td></tr>
-           <tr><td><input type='radio' name='TYPE' value='net' /></td>
-               <td class='base'>$Lang::tr{'net to net vpn'}</td></tr>
-           <tr><td align='center' colspan='2'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /></td></tr>
-           </form></table>
+           <table>
+           <tr><td><input type='radio' name='TYPE' value='host' checked='checked' /></td>
+               <td class='base'>$Lang::tr{'host to net vpn'}</td>
+           </tr><tr>
+               <td><input type='radio' name='TYPE' value='net' /></td>
+               <td class='base'>$Lang::tr{'net to net vpn'}</td>
+           </tr><tr>
+               <td align='center' colspan='2'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /></td>
+           </tr>
+           </table></form>
 END
        ;
        &Header::closebox();
@@ -1198,7 +1258,7 @@ END
        &Header::closepage();
        exit (0);
 ###
-### Adding a new connection
+### Adding/Editing/Saving a  connection
 ###
 } elsif (($cgiparams{'ACTION'} eq $Lang::tr{'add'}) ||
         ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}) ||
@@ -1213,21 +1273,33 @@ END
            $errormessage = $Lang::tr{'invalid key'};
            goto VPNCONF_END;
        }
-       $cgiparams{'ENABLED'}   = $confighash{$cgiparams{'KEY'}}[0];
-       $cgiparams{'NAME'}      = $confighash{$cgiparams{'KEY'}}[1];
-       $cgiparams{'TYPE'}      = $confighash{$cgiparams{'KEY'}}[3];
-       $cgiparams{'AUTH'}      = $confighash{$cgiparams{'KEY'}}[4];
-       $cgiparams{'PSK'}       = $confighash{$cgiparams{'KEY'}}[5];
-       $cgiparams{'SIDE'}      = $confighash{$cgiparams{'KEY'}}[6];
-       $cgiparams{'LOCAL_ID'}  = $confighash{$cgiparams{'KEY'}}[7];
-       $cgiparams{'LOCAL_SUBNET'} = $confighash{$cgiparams{'KEY'}}[8];
-       $cgiparams{'REMOTE_ID'} = $confighash{$cgiparams{'KEY'}}[9];
-       $cgiparams{'REMOTE'}    = $confighash{$cgiparams{'KEY'}}[10];
-       $cgiparams{'REMOTE_SUBNET'} = $confighash{$cgiparams{'KEY'}}[11];
-       $cgiparams{'REMARK'}    = $confighash{$cgiparams{'KEY'}}[25];
-       $cgiparams{'INTERFACE'} = $confighash{$cgiparams{'KEY'}}[26];
-       $cgiparams{'DPD_ACTION'}= $confighash{$cgiparams{'KEY'}}[27];
-       $cgiparams{'PFS_YES_NO'}= $confighash{$cgiparams{'KEY'}}[28];
+       $cgiparams{'ENABLED'}           = $confighash{$cgiparams{'KEY'}}[0];
+       $cgiparams{'NAME'}              = $confighash{$cgiparams{'KEY'}}[1];
+       $cgiparams{'TYPE'}              = $confighash{$cgiparams{'KEY'}}[3];
+       $cgiparams{'AUTH'}              = $confighash{$cgiparams{'KEY'}}[4];
+       $cgiparams{'PSK'}               = $confighash{$cgiparams{'KEY'}}[5];
+       $cgiparams{'SIDE'}              = $confighash{$cgiparams{'KEY'}}[6];
+       $cgiparams{'LOCAL_ID'}          = $confighash{$cgiparams{'KEY'}}[7];
+       $cgiparams{'LOCAL_SUBNET'}      = $confighash{$cgiparams{'KEY'}}[8];
+       $cgiparams{'REMOTE_ID'}         = $confighash{$cgiparams{'KEY'}}[9];
+       $cgiparams{'REMOTE'}            = $confighash{$cgiparams{'KEY'}}[10];
+       $cgiparams{'REMOTE_SUBNET'}     = $confighash{$cgiparams{'KEY'}}[11];
+       $cgiparams{'REMARK'}            = $confighash{$cgiparams{'KEY'}}[25];
+       $cgiparams{'INTERFACE'}         = $confighash{$cgiparams{'KEY'}}[26];
+       $cgiparams{'DPD_ACTION'}        = $confighash{$cgiparams{'KEY'}}[27];
+       $cgiparams{'IKE_ENCRYPTION'}    = $confighash{$cgiparams{'KEY'}}[18];
+       $cgiparams{'IKE_INTEGRITY'}     = $confighash{$cgiparams{'KEY'}}[19];
+       $cgiparams{'IKE_GROUPTYPE'}     = $confighash{$cgiparams{'KEY'}}[20];
+       $cgiparams{'IKE_LIFETIME'}      = $confighash{$cgiparams{'KEY'}}[16];
+       $cgiparams{'ESP_ENCRYPTION'}    = $confighash{$cgiparams{'KEY'}}[21];
+       $cgiparams{'ESP_INTEGRITY'}     = $confighash{$cgiparams{'KEY'}}[22];
+       $cgiparams{'ESP_GROUPTYPE'}     = $confighash{$cgiparams{'KEY'}}[23];
+       $cgiparams{'ESP_KEYLIFE'}       = $confighash{$cgiparams{'KEY'}}[17];
+       $cgiparams{'AGGRMODE'}          = $confighash{$cgiparams{'KEY'}}[12];
+       $cgiparams{'COMPRESSION'}       = $confighash{$cgiparams{'KEY'}}[13];
+       $cgiparams{'ONLY_PROPOSED'}     = $confighash{$cgiparams{'KEY'}}[24];
+       $cgiparams{'PFS'}               = $confighash{$cgiparams{'KEY'}}[28];
+       $cgiparams{'VHOST'}             = $confighash{$cgiparams{'KEY'}}[14];
 
     } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) {
        $cgiparams{'REMARK'} = &Header::cleanhtml($cgiparams{'REMARK'});
@@ -1252,12 +1324,12 @@ END
        }
 
        if (($cgiparams{'TYPE'} eq 'net') && ($cgiparams{'SIDE'} !~ /^(left|right)$/)) {
-           $errormessage = $Lang::tr{'ipfire side is invalid'};
+           $errormessage = $Lang::tr{'ipcop side is invalid'};
            goto VPNCONF_ERROR;
        }
 
        # Check if there is no other entry with this name
-       if (! $cgiparams{'KEY'}) {
+       if (! $cgiparams{'KEY'}) {  #only for add
            foreach my $key (keys %confighash) {
                if ($confighash{$key}[1] eq $cgiparams{'NAME'}) {
                    $errormessage = $Lang::tr{'a connection with this name already exists'};
@@ -1289,12 +1361,12 @@ END
            goto VPNCONF_ERROR;
        }
 
-       # Check if there is no other entry without IP-address and PSK
-       if ($cgiparams{'REMOTE'} eq '') {
+       # Allow only one roadwarrior/psk without remote IP-address
+       if ($cgiparams{'REMOTE'} eq '' && $cgiparams{'AUTH'} eq 'psk') {
            foreach my $key (keys %confighash) {
-               if(($cgiparams{'KEY'} ne $key) && 
-                  ($confighash{$key}[4] eq 'psk' || $cgiparams{'AUTH'} eq 'psk') && 
-                   $confighash{$key}[10] eq '') {
+               if ( ($cgiparams{'KEY'} ne $key) && 
+                     ($confighash{$key}[4] eq 'psk') && 
+                     ($confighash{$key}[10] eq '') ) {
                        $errormessage = $Lang::tr{'you can only define one roadwarrior connection when using pre-shared key authentication'};
                        goto VPNCONF_ERROR;
                }
@@ -1314,20 +1386,34 @@ END
            goto VPNCONF_ERROR;
        }
 
-       if (($cgiparams{'LOCAL_ID'} !~ /^(|@[a-zA-Z0-9_.-]*)$/) ||
-           ($cgiparams{'REMOTE_ID'} !~ /^(|@[a-zA-Z0-9_.-]*)$/) ||
+       # Allow nothing or a string (DN,FDQN,) beginning with @
+       # with no comma but slashes between RID eg @O=FR/C=Paris/OU=myhome/CN=franck
+       if ( ($cgiparams{'LOCAL_ID'} !~ /^(|[\w.-]*@[\w. =*\/-]+|\d\.\d\.\d\.\d)$/) ||
+           ($cgiparams{'REMOTE_ID'} !~ /^(|[\w.-]*@[\w. =*\/-]+|\d\.\d\.\d\.\d)$/) ||
            (($cgiparams{'REMOTE_ID'} eq $cgiparams{'LOCAL_ID'}) && ($cgiparams{'LOCAL_ID'} ne ''))
           ) {
-           $errormessage = $Lang::tr{'invalid local-remote id'};
+           $errormessage = $Lang::tr{'invalid local-remote id'} . '<br />' .
+           'DER_ASN1_DN: @c=FR/ou=Paris/ou=Home/cn=*<br />' .
+           'FQDN: @ipcop.org<br />' .
+           'USER_FQDN: franck@ipcop.org<br />' .
+           'IPV4_ADDR: @123.123.123.123';
            goto VPNCONF_ERROR;
        }
-       
-       if ($cgiparams{'AUTH'} eq 'psk')  {
+       # If Auth is DN, verify existance of Remote ID.
+       if ( $cgiparams{'REMOTE_ID'} eq '' && (
+               $cgiparams{'AUTH'} eq 'auth-dn'||                  # while creation
+               $confighash{$cgiparams{'KEY'}}[2] eq '%auth-dn')){ # while editing
+           $errormessage = $Lang::tr{'vpn missing remote id'};
+           goto VPNCONF_ERROR;
+       }
+
+       if ($cgiparams{'AUTH'} eq 'psk') {
            if (! length($cgiparams{'PSK'}) ) {
                $errormessage = $Lang::tr{'pre-shared key is too short'};
                goto VPNCONF_ERROR;
            }
-           if ($cgiparams{'PSK'} =~ /['",&]/) {        # " ' correct coloring syntax editor !
+           if ($cgiparams{'PSK'} =~ /'/) {
+                $cgiparams{'PSK'} =~ tr/'/ /;
                $errormessage = $Lang::tr{'invalid characters found in pre-shared key'};
                goto VPNCONF_ERROR;
            }
@@ -1348,35 +1434,116 @@ END
                goto VPNCONF_ERROR;
            }
 
-           # Sign the certificate request and move it
-           # Sign the host certificate request
-           system('/usr/bin/openssl', 'ca', '-days', '999999',
-               '-batch', '-notext',
-               '-in', $filename,
-               '-out', "${General::swroot}/certs/$cgiparams{'NAME'}cert.pem");
-           if ($?) {
-               $errormessage = "$Lang::tr{'openssl produced an error'}: $?";
+           # Sign the certificate request
+           &General::log("ipsec", "Signing your cert $cgiparams{'NAME'}...");
+           my  $opt  = " ca -days 999999";
+               $opt .= " -batch -notext";
+               $opt .= " -in $filename";
+               $opt .= " -out ${General::swroot}/certs/$cgiparams{'NAME'}cert.pem";
+
+           if ( $errormessage = &callssl ($opt) ) {
                unlink ($filename);
                unlink ("${General::swroot}/certs/$cgiparams{'NAME'}cert.pem");
                &cleanssldatabase();
                goto VPNCONF_ERROR;
            } else {
-               unlink ($filename);
-               &cleanssldatabase();
+               unlink ($filename);
+               &cleanssldatabase();
            }
 
-           my $temp = `/usr/bin/openssl x509 -text -in ${General::swroot}/certs/$cgiparams{'NAME'}cert.pem`;
-           $temp =~ /Subject:.*CN=(.*)[\n]/;
-           $temp = $1;
-           $temp =~ s+/Email+, E+;
-           $temp =~ s/ ST=/ S=/;
-           $cgiparams{'CERT_NAME'} = $temp;
-           $cgiparams{'CERT_NAME'} =~ s/,//g;
-           $cgiparams{'CERT_NAME'} =~ s/\'//g;
+           $cgiparams{'CERT_NAME'} = getCNfromcert ("${General::swroot}/certs/$cgiparams{'NAME'}cert.pem");
            if ($cgiparams{'CERT_NAME'} eq '') {
                $errormessage = $Lang::tr{'could not retrieve common name from certificate'};
                goto VPNCONF_ERROR;
            }
+       } elsif ($cgiparams{'AUTH'} eq 'pkcs12') {
+               &General::log("ipsec", "Importing from p12...");
+
+               if (ref ($cgiparams{'FH'}) ne 'Fh') {
+                   $errormessage = $Lang::tr{'there was no file upload'};
+                   goto ROOTCERT_ERROR;
+               }
+
+               # Move uploaded certificate request to a temporary file
+               (my $fh, my $filename) = tempfile( );
+               if (copy ($cgiparams{'FH'}, $fh) != 1) {
+                   $errormessage = $!;
+                   goto ROOTCERT_ERROR;
+               }
+
+               # Extract the CA certificate from the file
+               &General::log("ipsec", "Extracting caroot from p12...");
+               if (open(STDIN, "-|")) {
+                   my  $opt  = " pkcs12 -cacerts -nokeys";
+                       $opt .= " -in $filename";
+                       $opt .= " -out /tmp/newcacert";
+                   $errormessage = &callssl ($opt);
+               } else {        #child
+                   print "$cgiparams{'P12_PASS'}\n";
+                   exit (0);
+               }
+
+               # Extract the Host certificate from the file
+               if (!$errormessage) {
+                   &General::log("ipsec", "Extracting host cert from p12...");
+                   if (open(STDIN, "-|")) {
+                       my  $opt  = " pkcs12 -clcerts -nokeys";
+                       $opt .= " -in $filename";
+                       $opt .= " -out /tmp/newhostcert";
+                       $errormessage = &callssl ($opt);
+                   } else {    #child
+                       print "$cgiparams{'P12_PASS'}\n";
+                       exit (0);
+                   }
+               }
+
+               if (!$errormessage) {           
+                   &General::log("ipsec", "Moving cacert...");
+                   #If CA have new subject, add it to our list of CA
+                   my $casubject = &Header::cleanhtml(getsubjectfromcert ('/tmp/newcacert'));
+                   my @names;
+                   foreach my $x (keys %cahash) {
+                       $casubject='' if ($cahash{$x}[1] eq $casubject);
+                       unshift (@names,$cahash{$x}[0]);
+                   }
+                   if ($casubject) { # a new one!
+                       my $temp = `/usr/bin/openssl x509 -text -in /tmp/newcacert`;
+                       if ($temp !~ /CA:TRUE/i) {
+                           $errormessage = $Lang::tr{'not a valid ca certificate'};
+                       } else {
+                           #compute a name for it
+                           my $idx=0;
+                           while (grep(/Imported-$idx/, @names) ) {$idx++};
+                           $cgiparams{'CA_NAME'}="Imported-$idx";
+                           $cgiparams{'CERT_NAME'}=&Header::cleanhtml(getCNfromcert ('/tmp/newhostcert'));
+                           move("/tmp/newcacert", "${General::swroot}/ca/$cgiparams{'CA_NAME'}cert.pem");
+                           $errormessage = "$Lang::tr{'certificate file move failed'}: $!" if ($? ne 0);
+                           if (!$errormessage) {
+                               my $key = &General::findhasharraykey (\%cahash);
+                               $cahash{$key}[0] = $cgiparams{'CA_NAME'};
+                               $cahash{$key}[1] = $casubject;
+                               &General::writehasharray("${General::swroot}/vpn/caconfig", \%cahash);
+                               system('/usr/local/bin/ipsecctrl', 'R');
+                           }
+                       }
+                   }   
+               }
+               if (!$errormessage) {
+                   &General::log("ipsec", "Moving host cert...");
+                   move("/tmp/newhostcert", "${General::swroot}/certs/$cgiparams{'NAME'}cert.pem");
+                   $errormessage = "$Lang::tr{'certificate file move failed'}: $!" if ($? ne 0);
+               }
+
+               #cleanup temp files
+               unlink ($filename);
+               unlink ('/tmp/newcacert');
+               unlink ('/tmp/newhostcert');
+               if ($errormessage) {
+                   unlink ("${General::swroot}/ca/$cgiparams{'CA_NAME'}cert.pem");
+                   unlink ("${General::swroot}/certs/$cgiparams{'NAME'}cert.pem");
+                   goto VPNCONF_ERROR;
+               }
+               &General::log("ipsec", "p12 import completed!");
        } elsif ($cgiparams{'AUTH'} eq 'certfile') {
            if ($cgiparams{'KEY'}) {
                $errormessage = $Lang::tr{'cant change certificates'};
@@ -1394,15 +1561,16 @@ END
            }
 
            # Verify the certificate has a valid CA and move it
-           my $validca = 0;
+           &General::log("ipsec", "Validating imported cert against our known CA...");
+           my $validca = 1;  #assume ok
            my $test = `/usr/bin/openssl verify -CAfile ${General::swroot}/ca/cacert.pem $filename`;
-           if ($test =~ /: OK/) {
-               $validca = 1;
-           } else {
+           if ($test !~ /: OK/) {
+               my $validca = 0;
                foreach my $key (keys %cahash) {
                    $test = `/usr/bin/openssl verify -CAfile ${General::swroot}/ca/$cahash{$key}[0]cert.pem $filename`;
                    if ($test =~ /: OK/) {
                        $validca = 1;
+                       last;
                    }
                }
            }
@@ -1419,14 +1587,7 @@ END
                }
            }
 
-           my $temp = `/usr/bin/openssl x509 -text -in ${General::swroot}/certs/$cgiparams{'NAME'}cert.pem`;
-           $temp =~ /Subject:.*CN=(.*)[\n]/;
-           $temp = $1;
-           $temp =~ s+/Email+, E+;
-           $temp =~ s/ ST=/ S=/;
-           $cgiparams{'CERT_NAME'} = $temp;
-           $cgiparams{'CERT_NAME'} =~ s/,//g;
-           $cgiparams{'CERT_NAME'} =~ s/\'//g;
+           $cgiparams{'CERT_NAME'} = getCNfromcert ("${General::swroot}/certs/$cgiparams{'NAME'}cert.pem");
            if ($cgiparams{'CERT_NAME'} eq '') {
                unlink ("${General::swroot}/certs/$cgiparams{'NAME'}cert.pem");
                $errormessage = $Lang::tr{'could not retrieve common name from certificate'};
@@ -1478,6 +1639,19 @@ END
                $errormessage = $Lang::tr{'invalid input for country'};
                goto VPNCONF_ERROR;
            }
+           #the exact syntax is a list comma separated of 
+           #  email:any-validemail
+           #   URI: a uniform resource indicator
+           #   DNS: a DNS domain name
+           #   RID: a registered OBJECT IDENTIFIER
+           #   IP: an IP address
+           # example: email:franck@foo.com,IP:10.0.0.10,DNS:franck.foo.com
+
+           if ($cgiparams{'SUBJECTALTNAME'} ne '' && $cgiparams{'SUBJECTALTNAME'} !~ /^(email|URI|DNS|RID|IP):[a-zA-Z0-9 :\/,\.\-_@]*$/) {
+               $errormessage = $Lang::tr{'vpn altname syntax'};
+               goto VPNCONF_ERROR;
+           }
+
            if (length($cgiparams{'CERT_PASS1'}) < 5) {
                $errormessage = $Lang::tr{'password too short'};
                goto VPNCONF_ERROR;
@@ -1493,65 +1667,77 @@ END
            (my $state = $cgiparams{'CERT_STATE'}) =~ s/^\s*$/\./;
 
            # Create the Host certificate request
-           my $pid = open(OPENSSL, "|-");
-           $SIG{ALRM} = sub { $errormessage = $Lang::tr{'broken pipe'}; goto VPNCONF_ERROR;};
-           if ($pid) { # parent
-               print OPENSSL "$cgiparams{'CERT_COUNTRY'}\n";
-               print OPENSSL "$state\n";
-               print OPENSSL "$city\n";
-               print OPENSSL "$cgiparams{'CERT_ORGANIZATION'}\n";
-               print OPENSSL "$ou\n";
-               print OPENSSL "$cgiparams{'CERT_NAME'}\n";
-               print OPENSSL "$cgiparams{'CERT_EMAIL'}\n";
-               print OPENSSL ".\n";
-               print OPENSSL ".\n";
-               close (OPENSSL);
-               if ($?) {
-                   $errormessage = "$Lang::tr{'openssl produced an error'}: $?";
-                   unlink ("${General::swroot}/certs/$cgiparams{'NAME'}key.pem");
-                   unlink ("${General::swroot}/certs/$cgiparams{'NAME'}req.pem");
-                   goto VPNCONF_ERROR;
-               }
-           } else {    # child
-               unless (exec ('/usr/bin/openssl', 'req', '-nodes', '-rand', '/proc/interrupts:/proc/net/rt_cache',
-                       '-newkey', 'rsa:1024',
-                       '-keyout', "${General::swroot}/certs/$cgiparams{'NAME'}key.pem",
-                       '-out', "${General::swroot}/certs/$cgiparams{'NAME'}req.pem")) {
-                   $errormessage = "$Lang::tr{'cant start openssl'}: $!";
+           &General::log("ipsec", "Creating a cert...");
+
+           if (open(STDIN, "-|")) {
+               my $opt  = " req -nodes -rand /proc/interrupts:/proc/net/rt_cache";
+                  $opt .= " -newkey rsa:1024";
+                  $opt .= " -keyout ${General::swroot}/certs/$cgiparams{'NAME'}key.pem";
+                  $opt .= " -out ${General::swroot}/certs/$cgiparams{'NAME'}req.pem";
+
+               if ( $errormessage = &callssl ($opt) ) {
                    unlink ("${General::swroot}/certs/$cgiparams{'NAME'}key.pem");
                    unlink ("${General::swroot}/certs/$cgiparams{'NAME'}req.pem");
                    goto VPNCONF_ERROR;
-               }
+               }
+           } else {    #child
+               print  "$cgiparams{'CERT_COUNTRY'}\n";
+               print  "$state\n";
+               print  "$city\n";
+               print  "$cgiparams{'CERT_ORGANIZATION'}\n";
+               print  "$ou\n";
+               print  "$cgiparams{'CERT_NAME'}\n";
+               print  "$cgiparams{'CERT_EMAIL'}\n";
+               print  ".\n";
+               print  ".\n";
+               exit (0);
            }
-       
+           
            # Sign the host certificate request
-           system('/usr/bin/openssl', 'ca', '-days', '999999',
-               '-batch', '-notext',
-               '-in',  "${General::swroot}/certs/$cgiparams{'NAME'}req.pem",
-               '-out', "${General::swroot}/certs/$cgiparams{'NAME'}cert.pem");
-           if ($?) {
-               $errormessage = "$Lang::tr{'openssl produced an error'}: $?";
+           &General::log("ipsec", "Signing the cert $cgiparams{'NAME'}...");
+
+           #No easy way for specifying the contain of subjectAltName without writing a config file...
+           my ($fh, $v3extname) = tempfile ('/tmp/XXXXXXXX');
+           print $fh <<END
+           basicConstraints=CA:FALSE
+           nsComment="OpenSSL Generated Certificate"
+           subjectKeyIdentifier=hash
+           authorityKeyIdentifier=keyid,issuer:always
+END
+;
+           print $fh "subjectAltName=$cgiparams{'SUBJECTALTNAME'}" if ($cgiparams{'SUBJECTALTNAME'});
+           close ($fh);
+
+           my $opt  = " ca -days 999999 -batch -notext";
+              $opt .= " -in ${General::swroot}/certs/$cgiparams{'NAME'}req.pem";
+              $opt .= " -out ${General::swroot}/certs/$cgiparams{'NAME'}cert.pem";
+              $opt .= " -extfile $v3extname";
+
+           if ( $errormessage = &callssl ($opt) ) {
+               unlink ($v3extname);
                unlink ("${General::swroot}/certs/$cgiparams{'NAME'}key.pem");
                unlink ("${General::swroot}/certs/$cgiparams{'NAME'}req.pem");
                unlink ("${General::swroot}/certs/$cgiparams{'NAME'}cert.pem");
                &cleanssldatabase();
                goto VPNCONF_ERROR;
            } else {
+               unlink ($v3extname);
                unlink ("${General::swroot}/certs/$cgiparams{'NAME'}req.pem");
                &cleanssldatabase();
            }
 
            # Create the pkcs12 file
-           system('/usr/bin/openssl', 'pkcs12', '-export', 
-               '-inkey', "${General::swroot}/certs/$cgiparams{'NAME'}key.pem",
-               '-in', "${General::swroot}/certs/$cgiparams{'NAME'}cert.pem",
-               '-name', $cgiparams{'NAME'},
-               '-passout', "pass:$cgiparams{'CERT_PASS1'}",
-               '-certfile', "${General::swroot}/ca/cacert.pem", 
-               '-caname', "$vpnsettings{'ROOTCERT_ORGANIZATION'} CA",
-               '-out', "${General::swroot}/certs/$cgiparams{'NAME'}.p12");
-           if ($?) {
-               $errormessage = "$Lang::tr{'openssl produced an error'}: $?";
+           &General::log("ipsec", "Packing a pkcs12 file...");
+              $opt  = " pkcs12 -export"; 
+              $opt .= " -inkey ${General::swroot}/certs/$cgiparams{'NAME'}key.pem";
+              $opt .= " -in ${General::swroot}/certs/$cgiparams{'NAME'}cert.pem";
+              $opt .= " -name \"$cgiparams{'NAME'}\"";
+              $opt .= " -passout pass:$cgiparams{'CERT_PASS1'}";
+              $opt .= " -certfile ${General::swroot}/ca/cacert.pem";
+              $opt .= " -caname \"$vpnsettings{'ROOTCERT_ORGANIZATION'} CA\"";
+              $opt .= " -out ${General::swroot}/certs/$cgiparams{'NAME'}.p12";
+
+           if ( $errormessage = &callssl ($opt) ) {
                unlink ("${General::swroot}/certs/$cgiparams{'NAME'}key.pem");
                unlink ("${General::swroot}/certs/$cgiparams{'NAME'}cert.pem");
                unlink ("${General::swroot}/certs/$cgiparams{'NAME'}.p12");
@@ -1561,22 +1747,27 @@ END
            }
        } elsif ($cgiparams{'AUTH'} eq 'cert') {
            ;# Nothing, just editing
+       } elsif ($cgiparams{'AUTH'} eq 'auth-dn') {
+           $cgiparams{'CERT_NAME'} = '%auth-dn';       # a special value saying 'no cert file'     
        } else {
            $errormessage = $Lang::tr{'invalid input for authentication method'};
            goto VPNCONF_ERROR;
        }
 
-       # Check if there is no other entry with this common name
-       if ((! $cgiparams{'KEY'}) && ($cgiparams{'AUTH'} ne 'psk')) {
-           foreach my $key (keys %confighash) {
-               if ($confighash{$key}[2] eq $cgiparams{'CERT_NAME'}) {
-                   $errormessage = $Lang::tr{'a connection with this common name already exists'};
-                   goto VPNCONF_ERROR;
-               }
-           }
-       }
-
+       # 1)Error message here is not accurate.
+       # 2)Test is superfluous, openswan can reference same cert multiple times
+       # 3)Present since initial version (1.3.2.11), it isn't a bug correction
+       # Check if there is no other entry with this certificate name
+       #if ((! $cgiparams{'KEY'}) && ($cgiparams{'AUTH'} ne 'psk') && ($cgiparams{'AUTH'} ne 'auth-dn')) {
+       #    foreach my $key (keys %confighash) {
+       #       if ($confighash{$key}[2] eq $cgiparams{'CERT_NAME'}) {
+       #           $errormessage = $Lang::tr{'a connection with this common name already exists'};
+       #           goto VPNCONF_ERROR;
+       #       }
+       #    }
+       #}
         # Save the config
+
        my $key = $cgiparams{'KEY'};
        if (! $key) {
            $key = &General::findhasharraykey (\%confighash);
@@ -1605,29 +1796,28 @@ END
        $confighash{$key}[25] = $cgiparams{'REMARK'};
        $confighash{$key}[26] = $cgiparams{'INTERFACE'};
        $confighash{$key}[27] = $cgiparams{'DPD_ACTION'};
-       $confighash{$key}[28] = $cgiparams{'PFS_YES_NO'};
 
-       #use default advanced value
-       $confighash{$key}[14] = 'on';
-       $confighash{$key}[13] = 'off';
-       $confighash{$key}[18] = 'aes128|3des';
-       $confighash{$key}[19] = 'sha|md5';
-       $confighash{$key}[20] = '1536|1024';
-       $confighash{$key}[16] = '1';
-       $confighash{$key}[21] = 'aes128|3des';
-       $confighash{$key}[22] = 'sha1|md5';
-       $confighash{$key}[23] = '';
-       $confighash{$key}[17] = '8';
-       $confighash{$key}[24] = 'off';
+       #dont forget advanced value
+       $confighash{$key}[18] = $cgiparams{'IKE_ENCRYPTION'};
+       $confighash{$key}[19] = $cgiparams{'IKE_INTEGRITY'};
+       $confighash{$key}[20] = $cgiparams{'IKE_GROUPTYPE'};
+       $confighash{$key}[16] = $cgiparams{'IKE_LIFETIME'};
+       $confighash{$key}[21] = $cgiparams{'ESP_ENCRYPTION'};
+       $confighash{$key}[22] = $cgiparams{'ESP_INTEGRITY'};
+       $confighash{$key}[23] = $cgiparams{'ESP_GROUPTYPE'};
+       $confighash{$key}[17] = $cgiparams{'ESP_KEYLIFE'};
+       $confighash{$key}[12] = $cgiparams{'AGGRMODE'};
+       $confighash{$key}[13] = $cgiparams{'COMPRESSION'};
+       $confighash{$key}[24] = $cgiparams{'ONLY_PROPOSED'};
+       $confighash{$key}[28] = $cgiparams{'PFS'};
+       $confighash{$key}[14] = $cgiparams{'VHOST'};
 
        #free unused fields!
-       #$confighash{$key}[12] = '';
-       #$confighash{$key}[15] = '';
+       $confighash{$key}[15] = 'off';
 
        &General::writehasharray("${General::swroot}/vpn/config", \%confighash);
        &writeipsecfiles();
-       if ($vpnsettings{'ENABLED'} eq 'on' ||
-           $vpnsettings{'ENABLED_BLUE'} eq 'on') {
+       if (&vpnenabled) {
            system('/usr/local/bin/ipsecctrl', 'S', $key);
            sleep $sleepDelay;
        }
@@ -1647,6 +1837,8 @@ END
             $cgiparams{'AUTH'} = 'certgen';
        }
        $cgiparams{'LOCAL_SUBNET'}      ="$netsettings{'GREEN_NETADDRESS'}/$netsettings{'GREEN_NETMASK'}";
+       $cgiparams{'CERT_EMAIL'}        = $vpnsettings{'ROOTCERT_EMAIL'};
+       $cgiparams{'CERT_OU'}           = $vpnsettings{'ROOTCERT_OU'};
        $cgiparams{'CERT_ORGANIZATION'} = $vpnsettings{'ROOTCERT_ORGANIZATION'};
        $cgiparams{'CERT_CITY'}         = $vpnsettings{'ROOTCERT_CITY'};
        $cgiparams{'CERT_STATE'}        = $vpnsettings{'ROOTCERT_STATE'};
@@ -1656,22 +1848,42 @@ END
        if ($cgiparams{'TYPE'} eq 'host') {
            $cgiparams{'DPD_ACTION'} = 'clear';
        } else {
-           $cgiparams{'DPD_ACTION'} = 'hold';  #restart when available!
+           $cgiparams{'DPD_ACTION'} = 'restart';
        }
 
        # Default is yes for 'pfs'
-       $cgiparams{'PFS_YES_NO'}     = 'yes';
+       $cgiparams{'PFS'}     = 'on';
        
        # ID are empty
        $cgiparams{'LOCAL_ID'}  = '';
        $cgiparams{'REMOTE_ID'} = '';
-       
+
+       #use default advanced value
+       $cgiparams{'IKE_ENCRYPTION'} = 'aes128|3des';   #[18];
+       $cgiparams{'IKE_INTEGRITY'}  = 'sha|md5';       #[19];
+       $cgiparams{'IKE_GROUPTYPE'}  = '1536|1024';     #[20];
+       $cgiparams{'IKE_LIFETIME'}   = '1';             #[16];
+       $cgiparams{'ESP_ENCRYPTION'} = 'aes128|3des';   #[21];
+       $cgiparams{'ESP_INTEGRITY'}  = 'sha1|md5';      #[22];
+       $cgiparams{'ESP_GROUPTYPE'}  = '';              #[23];
+       $cgiparams{'ESP_KEYLIFE'}    = '8';             #[17];
+       $cgiparams{'AGGRMODE'}       = 'off';           #[12];
+       $cgiparams{'COMPRESSION'}    = 'off';           #[13];
+       $cgiparams{'ONLY_PROPOSED'}  = 'off';           #[24];
+       $cgiparams{'PFS'}            = 'on';            #[28];
+       $cgiparams{'VHOST'}          = 'on';            #[14];
     }
 
     VPNCONF_ERROR:
     $checked{'ENABLED'}{'off'} = '';
     $checked{'ENABLED'}{'on'} = '';
     $checked{'ENABLED'}{$cgiparams{'ENABLED'}} = "checked='checked'";
+    $checked{'ENABLED_GREEN'}{'off'} = '';
+    $checked{'ENABLED_GREEN'}{'on'} = '';
+    $checked{'ENABLED_GREEN'}{$cgiparams{'ENABLED_GREEN'}} = "checked='checked'";
+    $checked{'ENABLED_ORANGE'}{'off'} = '';
+    $checked{'ENABLED_ORANGE'}{'on'} = '';
+    $checked{'ENABLED_ORANGE'}{$cgiparams{'ENABLED_ORANGE'}} = "checked='checked'";
     $checked{'ENABLED_BLUE'}{'off'} = '';
     $checked{'ENABLED_BLUE'}{'on'} = '';
     $checked{'ENABLED_BLUE'}{$cgiparams{'ENABLED_BLUE'}} = "checked='checked'";
@@ -1688,195 +1900,233 @@ END
     $checked{'AUTH'}{'certreq'} = '';
     $checked{'AUTH'}{'certgen'} = '';
     $checked{'AUTH'}{'certfile'} = '';
+    $checked{'AUTH'}{'pkcs12'} = '';
+    $checked{'AUTH'}{'auth-dn'} = '';
     $checked{'AUTH'}{$cgiparams{'AUTH'}} = "checked='checked'";
 
+    $selected{'INTERFACE'}{'RED'} = '';
+    $selected{'INTERFACE'}{'ORANGE'} = '';
+    $selected{'INTERFACE'}{'GREEN'} = '';
+    $selected{'INTERFACE'}{'BLUE'} = '';
     $selected{'INTERFACE'}{$cgiparams{'INTERFACE'}} = "selected='selected'";
+
+    $selected{'DPD_ACTION'}{'clear'} = '';
+    $selected{'DPD_ACTION'}{'hold'} = '';
+    $selected{'DPD_ACTION'}{'restart'} = '';
     $selected{'DPD_ACTION'}{$cgiparams{'DPD_ACTION'}} = "selected='selected'";
-    $selected{'PFS_YES_NO'}{$cgiparams{'PFS_YES_NO'}} = "selected='selected'";
 
-    if (1) {
-       &Header::showhttpheaders();
-       &Header::openpage($Lang::tr{'vpn configuration main'}, 1, '');
-       &Header::openbigbox('100%', 'LEFT', '', $errormessage);
-       if ($errormessage) {
-           &Header::openbox('100%', 'LEFT', $Lang::tr{'error messages'});
-           print "<class name='base'>$errormessage";
-           print "&nbsp;</class>";
-           &Header::closebox();
-       }
+    &Header::showhttpheaders();
+    &Header::openpage($Lang::tr{'vpn configuration main'}, 1, '');
+    &Header::openbigbox('100%', 'left', '', $errormessage);
+    if ($errormessage) {
+       &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
+       print "<class name='base'>$errormessage";
+       print "&nbsp;</class>";
+       &Header::closebox();
+    }
 
-       if ($warnmessage) {
-           &Header::openbox('100%', 'LEFT', "$Lang::tr{'warning messages'}:");
-           print "<class name='base'>$warnmessage";
-           print "&nbsp;</class>";
-           &Header::closebox();
-       }
+    if ($warnmessage) {
+       &Header::openbox('100%', 'left', "$Lang::tr{'warning messages'}:");
+       print "<class name='base'>$warnmessage";
+       print "&nbsp;</class>";
+       &Header::closebox();
+    }
 
-       print "<form method='post' enctype='multipart/form-data'>";
-       print "<input type='hidden' name='TYPE' value='$cgiparams{'TYPE'}' />";
+    print "<form method='post' enctype='multipart/form-data' action='$ENV{'SCRIPT_NAME'}'>";
+    print<<END
+       <input type='hidden' name='TYPE' value='$cgiparams{'TYPE'}' />
+       <input type='hidden' name='IKE_ENCRYPTION' value='$cgiparams{'IKE_ENCRYPTION'}' />
+       <input type='hidden' name='IKE_INTEGRITY' value='$cgiparams{'IKE_INTEGRITY'}' />
+       <input type='hidden' name='IKE_GROUPTYPE' value='$cgiparams{'IKE_GROUPTYPE'}' />
+       <input type='hidden' name='IKE_LIFETIME' value='$cgiparams{'IKE_LIFETIME'}' />
+       <input type='hidden' name='ESP_ENCRYPTION' value='$cgiparams{'ESP_ENCRYPTION'}' />
+       <input type='hidden' name='ESP_INTEGRITY' value='$cgiparams{'ESP_INTEGRITY'}' />
+       <input type='hidden' name='ESP_GROUPTYPE' value='$cgiparams{'ESP_GROUPTYPE'}' />
+       <input type='hidden' name='ESP_KEYLIFE' value='$cgiparams{'ESP_KEYLIFE'}' />
+       <input type='hidden' name='AGGRMODE' value='$cgiparams{'AGGRMODE'}' />
+       <input type='hidden' name='COMPRESSION' value='$cgiparams{'COMPRESSION'}' />
+       <input type='hidden' name='ONLY_PROPOSED' value='$cgiparams{'ONLY_PROPOSED'}' />
+       <input type='hidden' name='PFS' value='$cgiparams{'PFS'}' />
+       <input type='hidden' name='VHOST' value='$cgiparams{'VHOST'}' />
+END
+    ;
+    if ($cgiparams{'KEY'}) {
+       print "<input type='hidden' name='KEY' value='$cgiparams{'KEY'}' />";
+       print "<input type='hidden' name='AUTH' value='$cgiparams{'AUTH'}' />";
+    }
 
-       if ($cgiparams{'KEY'}) {
-           print "<input type='hidden' name='KEY' value='$cgiparams{'KEY'}' />";
-           print "<input type='hidden' name='AUTH' value='$cgiparams{'AUTH'}' />";
-       }
+    &Header::openbox('100%', 'left', "$Lang::tr{'connection'}:");
+    print "<table width='100%'>";
+    print "<tr><td width='25%' class='boldbase'>$Lang::tr{'name'}:</td>";
+    if ($cgiparams{'KEY'}) {
+       print "<td width='25%' class='base'><input type='hidden' name='NAME' value='$cgiparams{'NAME'}' /><b>$cgiparams{'NAME'}</b></td>";
+    } else {
+       print "<td width='25%'><input type='text' name='NAME' value='$cgiparams{'NAME'}' size='30' /></td>";
+    }
+    print "<td>$Lang::tr{'enabled'}</td><td><input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td></tr>";
 
-       &Header::openbox('100%', 'LEFT', "$Lang::tr{'connection'}:");
-       print "<table width='100%'>";
-       print "<tr><td width='25%' class='boldbase'>$Lang::tr{'name'}:</td>";
-       if ($cgiparams{'KEY'}) {
-           print "<td width='25%' class='base'><input type='hidden' name='NAME' value='$cgiparams{'NAME'}' /><b>$cgiparams{'NAME'}</b></td>";
-       } else {
-           print "<td width='25%'><input type='text' name='NAME' value='$cgiparams{'NAME'}' maxlength='20' size='30' /></td>";
-       }
-       print "<td>$Lang::tr{'enabled'}</td><td><input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td></tr>";
-       
-       if ($cgiparams{'TYPE'} eq 'host') {
+    if ($cgiparams{'TYPE'} eq 'host') {
 
-           print "<tr><td>$Lang::tr{'interface'}</td>";
-           print "<td><select name='INTERFACE'>";
-           print "<option value='RED' $selected{'INTERFACE'}{'RED'}>RED</option>";
-           print "<option value='BLUE' $selected{'INTERFACE'}{'BLUE'}>BLUE</option>" if ($netsettings{'BLUE_DEV'} ne '');
-#          print "<option value='GREEN' $selected{'INTERFACE'}{'GREEN'}>GREEN</option>";
-#          print "<option value='ORANGE' $selected{'INTERFACE'}{'ORANGE'}>ORANGE</option>";
-           print "</select></td></tr>";
-           print <<END
-               <tr><td class='boldbase'>$Lang::tr{'local subnet'}</td>
-                   <td><input type='text' name='LOCAL_SUBNET' value='$cgiparams{'LOCAL_SUBNET'}' size='30' /></td>
-                   <td colspan='2'>&nbsp;</td></tr>
-               <tr><td class='boldbase'>$Lang::tr{'remote host/ip'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
-                   <td><input type='text' name='REMOTE' value='$cgiparams{'REMOTE'}' size='30' /></td>
-                   <td colspan='2'>&nbsp;</td></tr>
+       print "<tr><td>$Lang::tr{'interface'}</td>";
+       print "<td><select name='INTERFACE'>";
+       print "<option value='RED' $selected{'INTERFACE'}{'RED'}>RED</option>";
+       print "<option value='BLUE' $selected{'INTERFACE'}{'BLUE'}>BLUE</option>" if ($netsettings{'BLUE_DEV'} ne '');
+       print "<option value='GREEN' $selected{'INTERFACE'}{'GREEN'}>GREEN</option>";
+#      print "<option value='ORANGE' $selected{'INTERFACE'}{'ORANGE'}>ORANGE</option>";
+       print "</select></td></tr>";
+       print <<END
+        <tr><td class='boldbase'>$Lang::tr{'local subnet'}</td>
+           <td><input type='text' name='LOCAL_SUBNET' value='$cgiparams{'LOCAL_SUBNET'}' size='30' /></td>
+           <td colspan='2'>&nbsp;</td>
+       </tr><tr>
+           <td class='boldbase'>$Lang::tr{'remote host/ip'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
+           <td><input type='text' name='REMOTE' value='$cgiparams{'REMOTE'}' size='30' /></td>
+           <td colspan='2'>&nbsp;</td>
+       </tr>
 END
            ;
-       } else {
-           print <<END
-               <tr><input type='hidden' name='INTERFACE' value='RED' />
-                   <td class='boldbase' nowrap='nowrap'>$Lang::tr{'ipfire side'}</td>
-                   <td><select name='SIDE'><option value='left' $selected{'SIDE'}{'left'}>left</option>
-                                           <option value='right' $selected{'SIDE'}{'right'}>right</option></select></td>
-                   <td class='boldbase'>$Lang::tr{'remote host/ip'}:</td>
-                   <td><input type='TEXT' name='REMOTE' value='$cgiparams{'REMOTE'}' size ='30' /></td></tr>
-               <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'local subnet'}</td>
-                   <td><input type='TEXT' name='LOCAL_SUBNET' value='$cgiparams{'LOCAL_SUBNET'}' size='30' /></td>
-                   <td class='boldbase' nowrap='nowrap'>$Lang::tr{'remote subnet'}</td>
-                   <td><input type='text' name='REMOTE_SUBNET' value='$cgiparams{'REMOTE_SUBNET'}' size='30' /></td></tr>
+    } else {
+        print <<END
+       <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'ipcop side'}
+               <input type='hidden' name='INTERFACE' value='RED' /></td>
+           <td><select name='SIDE'><option value='left' $selected{'SIDE'}{'left'}>left</option>
+                                   <option value='right' $selected{'SIDE'}{'right'}>right</option></select></td>
+           <td class='boldbase'>$Lang::tr{'remote host/ip'}:</td>
+           <td><input type='text' name='REMOTE' value='$cgiparams{'REMOTE'}' size ='30' /></td>
+       </tr><tr>
+           <td class='boldbase' nowrap='nowrap'>$Lang::tr{'local subnet'}</td>
+           <td><input type='text' name='LOCAL_SUBNET' value='$cgiparams{'LOCAL_SUBNET'}' size='30' /></td>
+           <td class='boldbase' nowrap='nowrap'>$Lang::tr{'remote subnet'}</td>
+           <td><input type='text' name='REMOTE_SUBNET' value='$cgiparams{'REMOTE_SUBNET'}' size='30' /></td>
+       </tr>
 END
-           ;
-       }
-       print <<END
-       <tr><td>$Lang::tr{'dpd action'}:</td>
+       ;
+    }
+    print <<END
+    <tr>
+       <td>$Lang::tr{'dpd action'}:</td>
        <td><select name='DPD_ACTION'>
-           <option value='clear' $selected{'DPD_ACTION'}{'clear'}>clear</option>
-           <option value='hold' $selected{'DPD_ACTION'}{'hold'}>hold</option>
-           <option value='restart' $selected{'DPD_ACTION'}{'restart'}>restart</option>
-       </select>&nbsp; <a href='http://www.openswan.com/docs/local/README.DPD'>?</a></td>
-<!--   http://www.openswan.com/docs/local/README.DPD
-       http://bugs.xelerance.com/view.php?id=156
-       restart = clear + reinitiate connection
--->    <td width='25%'>$Lang::tr{'pfs yes no'}:</td>
-       <td width='25%'><select name='PFS_YES_NO'>
-           <option value='yes' $selected{'PFS_YES_NO'}{'yes'}>$Lang::tr{'yes'}</option>
-           <option value='no' $selected{'PFS_YES_NO'}{'no'}>$Lang::tr{'no'}</option>
-       </select></td></tr>
+           <option value='clear' $selected{'DPD_ACTION'}{'clear'}>clear</option>
+           <option value='hold' $selected{'DPD_ACTION'}{'hold'}>hold</option>
+           <option value='restart' $selected{'DPD_ACTION'}{'restart'}>restart</option>
+           </select>&nbsp; <a href='http://www.openswan.com/docs/local/README.DPD'>?</a>
+       </td>
+    </tr><tr>
+<!--http://www.openswan.com/docs/local/README.DPD
+    http://bugs.xelerance.com/view.php?id=156
+    restart = clear + reinitiate connection
+-->
        <td><b>$Lang::tr{'options'}</b></td>
-       <tr><td class='boldbase'>leftid:&nbsp;<img src='/blob.gif' alt='*' />
-       <br />($Lang::tr{'eg'} <tt>&#64;xy.example.com</tt>)</td>
-       <td><input type='text' name='LOCAL_ID' value='$cgiparams{'LOCAL_ID'}' maxlength='50' /></td>
-       <td class='boldbase'>rightid:&nbsp;<img src='/blob.gif' alt='*' /></td>
-       <td><input type='text' name='REMOTE_ID' value='$cgiparams{'REMOTE_ID'}' maxlength='50' /></td></tr>
-       <tr><td class='boldbase'>$Lang::tr{'remark title'}&nbsp;<img src='/blob.gif' alt='*' /></td>
-       <td colspan='3'><input type='text' name='REMARK' value='$cgiparams{'REMARK'}' size='55' maxlength='50' /></td></tr>
+    </tr><tr>
+       <td class='boldbase'>$Lang::tr{'vpn local id'}:&nbsp;<img src='/blob.gif' alt='*' />
+           <br />($Lang::tr{'eg'} <tt>&#64;xy.example.com</tt>)</td>
+       <td><input type='text' name='LOCAL_ID' value='$cgiparams{'LOCAL_ID'}' /></td>
+       <td class='boldbase'>$Lang::tr{'vpn remote id'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
+       <td><input type='text' name='REMOTE_ID' value='$cgiparams{'REMOTE_ID'}' /></td>
+    </tr><tr>
+       <td class='boldbase'>$Lang::tr{'remark title'}&nbsp;<img src='/blob.gif' alt='*' /></td>
+       <td colspan='3'><input type='text' name='REMARK' value='$cgiparams{'REMARK'}' size='55' maxlength='50' /></td>
+    </tr>
 END
-       ;
-       if (!$cgiparams{'KEY'}) {
-           print "<tr><td colspan='3'><input type='checkbox' name='EDIT_ADVANCED' $checked{'EDIT_ADVANCED'}{'on'} /> $Lang::tr{'edit advanced settings when done'}</td></tr>";
-       }
-       print "</table>";
-       &Header::closebox();
+    ;
+    if (!$cgiparams{'KEY'}) {
+        print "<tr><td colspan='3'><input type='checkbox' name='EDIT_ADVANCED' $checked{'EDIT_ADVANCED'}{'on'} /> $Lang::tr{'edit advanced settings when done'}</td></tr>";
+    }
+    print "</table>";
+    &Header::closebox();
        
-       if ($cgiparams{'KEY'} && $cgiparams{'AUTH'} eq 'psk') {
-           &Header::openbox('100%', 'LEFT', $Lang::tr{'authentication'});
-           print <<END
-           <table width='100%' cellpadding='0' cellspacing='5' border='0'>
-           <tr><td class='base' width='50%'>$Lang::tr{'use a pre-shared key'}</td>
-               <td class='base' width='50%'><input type='text' name='PSK' size='30' value='$cgiparams{'PSK'}' /></td></tr>
-           </table>
+    if ($cgiparams{'KEY'} && $cgiparams{'AUTH'} eq 'psk') {
+       &Header::openbox('100%', 'left', $Lang::tr{'authentication'});
+       print <<END
+       <table width='100%' cellpadding='0' cellspacing='5' border='0'>
+       <tr><td class='base' width='50%'>$Lang::tr{'use a pre-shared key'}</td>
+           <td class='base' width='50%'><input type='text' name='PSK' size='30' value='$cgiparams{'PSK'}' /></td>
+       </tr>
+       </table>
 END
-           ;
-           &Header::closebox();
-       } elsif (! $cgiparams{'KEY'}) {
-           my $disabled='';
-           my $cakeydisabled='';
-           my $cacrtdisabled='';
-           if ( ! -f "${General::swroot}/private/cakey.pem" ) { $cakeydisabled = "disabled='disabled'" } else { $cakeydisabled = "" };
-           if ( ! -f "${General::swroot}/ca/cacert.pem" ) { $cacrtdisabled = "disabled='disabled'" } else { $cacrtdisabled = "" };
-           &Header::openbox('100%', 'LEFT', $Lang::tr{'authentication'});
-           print <<END
-           <table width='100%' cellpadding='0' cellspacing='5' border='0'>
-           <tr><td width='5%'><input type='radio' name='AUTH' value='psk' $checked{'AUTH'}{'psk'} /></td>
-               <td class='base' width='45%'>$Lang::tr{'use a pre-shared key'}</td>
-               <td class='base' width='50%'><input type='text' name='PSK' size='30' value='$cgiparams{'PSK'}' /></td></tr>
-           <tr><td colspan='3' bgcolor='#000000'><img src='/images/null.gif' width='1' height='1' border='0' /></td></tr>
-           <tr><td><input type='radio' name='AUTH' value='certreq' $checked{'AUTH'}{'certreq'} $cakeydisabled /></td>
-               <td class='base'>$Lang::tr{'upload a certificate request'}</td>
-               <td class='base' rowspan='2'><input type='file' name='FH' size='30' $cacrtdisabled></td></tr>
-           <tr><td><input type='radio' name='AUTH' value='certfile' $checked{'AUTH'}{'certfile'} $cacrtdisabled /></td>
-               <td class='base'>$Lang::tr{'upload a certificate'}</td></tr>
-           <tr><td colspan='3' bgcolor='#000000'><img src='/images/null.gif' width='1' height='1' BORDER='0' /></td></tr>
-           <tr><td><input type='radio' name='AUTH' value='certgen' $checked{'AUTH'}{'certgen'} $cakeydisabled /></td>
-               <td class='base'>$Lang::tr{'generate a certificate'}</td><td>&nbsp;</td></tr>
-           <tr><td>&nbsp;</td>
-               <td class='base'>$Lang::tr{'users fullname or system hostname'}:</td>
-               <td class='base' nowrap='nowrap'><input type='text' name='CERT_NAME' value='$cgiparams{'CERT_NAME'}' SIZE='32' $cakeydisabled /></td></tr>
-           <tr><td>&nbsp;</td>
-               <td class='base'>$Lang::tr{'users email'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
-               <td class='base' nowrap='nowrap'><input type='text' name='CERT_EMAIL' value='$cgiparams{'CERT_EMAIL'}' SIZE='32' $cakeydisabled /></td></tr>
-           <tr><td>&nbsp;</td>
-               <td class='base'>$Lang::tr{'users department'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
-               <td class='base' nowrap='nowrap'><input type='text' name='CERT_OU' value='$cgiparams{'CERT_OU'}' SIZE='32' $cakeydisabled /></td></tr>
-           <tr><td>&nbsp;</td>
-               <td class='base'>$Lang::tr{'organization name'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
-               <td class='base' nowrap='nowrap'><input type='text' name='CERT_ORGANIZATION' value='$cgiparams{'CERT_ORGANIZATION'}' SIZE='32' $cakeydisabled /></td></tr>
-           <tr><td>&nbsp;</td>
-               <td class='base'>$Lang::tr{'city'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
-               <td class='base' nowrap='nowrap'><input type='text' name='CERT_CITY' value='$cgiparams{'CERT_CITY'}' SIZE='32' $cakeydisabled /></td></tr>
-           <tr><td>&nbsp;</td>
-               <td class='base'>$Lang::tr{'state or province'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
-               <td class='base' nowrap='nowrap'><input type='text' name='CERT_STATE' value='$cgiparams{'CERT_STATE'}' SIZE='32' $cakeydisabled /></td></tr>
-           <tr><td>&nbsp;</td>
-               <td class='base'>$Lang::tr{'country'}:</td>
-               <td class='base'><select name='CERT_COUNTRY' $cakeydisabled>
+       ;
+       &Header::closebox();
+    } elsif (! $cgiparams{'KEY'}) {
+       my $pskdisabled = ($vpnsettings{'VPN_IP'} eq '%defaultroute') ? "disabled='disabled'" : '' ;
+        $cgiparams{'PSK'} =  $Lang::tr{'vpn incompatible use of defaultroute'} if ($pskdisabled);
+       my $cakeydisabled = ( ! -f "${General::swroot}/private/cakey.pem" ) ? "disabled='disabled'" : '';
+        $cgiparams{'CERT_NAME'} = $Lang::tr{'vpn no full pki'} if ($cakeydisabled);
+       my $cacrtdisabled = ( ! -f "${General::swroot}/ca/cacert.pem" ) ? "disabled='disabled'" : '';
+
+       &Header::openbox('100%', 'left', $Lang::tr{'authentication'});
+       print <<END
+       <table width='100%' cellpadding='0' cellspacing='5' border='0'>
+       <tr><td width='5%'><input type='radio' name='AUTH' value='psk' $checked{'AUTH'}{'psk'} $pskdisabled/></td>
+           <td class='base' width='55%'>$Lang::tr{'use a pre-shared key'}</td>
+           <td class='base' width='40%'><input type='text' name='PSK' size='30' value='$cgiparams{'PSK'}' $pskdisabled/></td></tr>
+       <tr><td colspan='3' bgcolor='#000000'></td></tr>
+       <tr><td><input type='radio' name='AUTH' value='certreq' $checked{'AUTH'}{'certreq'} $cakeydisabled /></td>
+           <td class='base'><hr />$Lang::tr{'upload a certificate request'}</td>
+           <td class='base' rowspan='3' valign='middle'><input type='file' name='FH' size='30' $cacrtdisabled /></td></tr>
+       <tr><td><input type='radio' name='AUTH' value='certfile' $checked{'AUTH'}{'certfile'} $cacrtdisabled /></td>
+           <td class='base'>$Lang::tr{'upload a certificate'}</td></tr>
+       <tr><td><input type='radio' name='AUTH' value='pkcs12' $cacrtdisabled /></td>
+           <td class='base'>$Lang::tr{'upload p12 file'} $Lang::tr{'pkcs12 file password'}:<input type='password' name='P12_PASS'/></td></tr>
+       <tr><td><input type='radio' name='AUTH' value='auth-dn' $checked{'AUTH'}{'auth-dn'} $cacrtdisabled /></td>
+           <td class='base'><hr />$Lang::tr{'vpn auth-dn'}</td></tr>
+       <tr><td colspan='3' bgcolor='#000000'></td></tr>
+       <tr><td><input type='radio' name='AUTH' value='certgen' $checked{'AUTH'}{'certgen'} $cakeydisabled /></td>
+           <td class='base'><hr />$Lang::tr{'generate a certificate'}</td><td>&nbsp;</td></tr>
+       <tr><td>&nbsp;</td>
+           <td class='base'>$Lang::tr{'users fullname or system hostname'}:</td>
+           <td class='base' nowrap='nowrap'><input type='text' name='CERT_NAME' value='$cgiparams{'CERT_NAME'}' size='32' $cakeydisabled /></td></tr>
+       <tr><td>&nbsp;</td>
+           <td class='base'>$Lang::tr{'users email'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
+           <td class='base' nowrap='nowrap'><input type='text' name='CERT_EMAIL' value='$cgiparams{'CERT_EMAIL'}' size='32' $cakeydisabled /></td></tr>
+       <tr><td>&nbsp;</td>
+           <td class='base'>$Lang::tr{'users department'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
+           <td class='base' nowrap='nowrap'><input type='text' name='CERT_OU' value='$cgiparams{'CERT_OU'}' size='32' $cakeydisabled /></td></tr>
+       <tr><td>&nbsp;</td>
+           <td class='base'>$Lang::tr{'organization name'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
+           <td class='base' nowrap='nowrap'><input type='text' name='CERT_ORGANIZATION' value='$cgiparams{'CERT_ORGANIZATION'}' size='32' $cakeydisabled /></td></tr>
+       <tr><td>&nbsp;</td>
+           <td class='base'>$Lang::tr{'city'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
+           <td class='base' nowrap='nowrap'><input type='text' name='CERT_CITY' value='$cgiparams{'CERT_CITY'}' size='32' $cakeydisabled /></td></tr>
+       <tr><td>&nbsp;</td>
+           <td class='base'>$Lang::tr{'state or province'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
+           <td class='base' nowrap='nowrap'><input type='text' name='CERT_STATE' value='$cgiparams{'CERT_STATE'}' size='32' $cakeydisabled /></td></tr>
+       <tr><td>&nbsp;</td>
+           <td class='base'>$Lang::tr{'country'}:</td>
+           <td class='base'><select name='CERT_COUNTRY' $cakeydisabled>
 END
-           ;
-           foreach my $country (sort keys %{Countries::countries}) {
-               print "\t\t\t<option value='$Countries::countries{$country}'";
-               if ( $Countries::countries{$country} eq $cgiparams{'CERT_COUNTRY'} ) {
-                   print " selected='selected'";
-               }
-               print ">$country</option>\n";
+       ;
+       foreach my $country (sort keys %{Countries::countries}) {
+           print "\t\t\t<option value='$Countries::countries{$country}'";
+           if ( $Countries::countries{$country} eq $cgiparams{'CERT_COUNTRY'} ) {
+               print " selected='selected'";
            }
-           print <<END
-               </select></td></tr>
-           <tr><td>&nbsp;</td>
-               <td class='base'>$Lang::tr{'pkcs12 file password'}:</td>
-               <td class='base' nowrap='nowrap'><input type='password' name='CERT_PASS1' value='$cgiparams{'CERT_PASS1'}' size='32' $cakeydisabled /></td></tr>
-           <tr><td>&nbsp;</td><td class='base'>$Lang::tr{'pkcs12 file password'}:<BR>($Lang::tr{'confirmation'})</td>
-               <td class='base' nowrap='nowrap'><input type='password' name='CERT_PASS2' value='$cgiparams{'CERT_PASS2'}' size='32' $cakeydisabled /></td></tr>
-           </table>
-END
-           ;
-           &Header::closebox();
+           print ">$country</option>\n";
        }
+       print <<END
+           </select></td></tr>
 
-       print "<div align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' />";
-       if ($cgiparams{'KEY'}) {
-           print "<input type='submit' name='ACTION' value='$Lang::tr{'advanced'}' />";
-       }
-       print "<input type='submit' name='ACTION' value='$Lang::tr{'cancel'}' /></div></form>";
-       &Header::closebigbox();
-       &Header::closepage();
-       exit (0);
+       <tr><td>&nbsp;</td><td class='base'>$Lang::tr{'vpn subjectaltname'} (subjectAltName=email:*,URI:*,DNS:*,RID:*)<img src='/blob.gif' alt='*' /></td>
+           <td class='base' nowrap='nowrap'><input type='text' name='SUBJECTALTNAME' value='$cgiparams{'SUBJECTALTNAME'}' size='32' $cakeydisabled /></td></tr>
+       <tr><td>&nbsp;</td>
+           <td class='base'>$Lang::tr{'pkcs12 file password'}:</td>
+           <td class='base' nowrap='nowrap'><input type='password' name='CERT_PASS1' value='$cgiparams{'CERT_PASS1'}' size='32' $cakeydisabled /></td></tr>
+       <tr><td>&nbsp;</td><td class='base'>$Lang::tr{'pkcs12 file password'}:($Lang::tr{'confirmation'})</td>
+           <td class='base' nowrap='nowrap'><input type='password' name='CERT_PASS2' value='$cgiparams{'CERT_PASS2'}' size='32' $cakeydisabled /></td></tr>
+       </table>
+END
+       ;
+       &Header::closebox();
+    }
+
+    print "<div align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' />";
+    if ($cgiparams{'KEY'}) {
+        print "<input type='submit' name='ACTION' value='$Lang::tr{'advanced'}' />";
     }
+    print "<input type='submit' name='ACTION' value='$Lang::tr{'cancel'}' /></div></form>";
+    &Header::closebigbox();
+    &Header::closepage();
+    exit (0);
+    
     VPNCONF_END:
 }
 
@@ -1893,18 +2143,11 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
     }
 
     if ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) {
-       if ($cgiparams{'NAT'} !~ /^(on|off)$/) {
-           $errormessage = $Lang::tr{'invalid input'};
-           goto ADVANCED_ERROR;
-       }
-       if ($cgiparams{'COMPRESSION'} !~ /^(on|off)$/) {
-           $errormessage = $Lang::tr{'invalid input'};
-           goto ADVANCED_ERROR;
-       }
-       if ($cgiparams{'NAT'} eq 'on' && $cgiparams{'COMPRESSION'} eq 'on') {
-           $errormessage = $Lang::tr{'cannot enable both nat traversal and compression'};
-           goto ADVANCED_ERROR;
-       }
+       # I didn't read any incompatibilities here....
+       #if ($cgiparams{'VHOST'} eq 'on' && $cgiparams{'COMPRESSION'} eq 'on') {
+       #    $errormessage = $Lang::tr{'cannot enable both nat traversal and compression'};
+       #    goto ADVANCED_ERROR;
+       #}
        my @temp = split('\|', $cgiparams{'IKE_ENCRYPTION'});
        if ($#temp < 0) {
            $errormessage = $Lang::tr{'invalid input'};
@@ -1982,12 +2225,18 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
            $errormessage = $Lang::tr{'esp keylife should be between 1 and 24 hours'};
            goto ADVANCED_ERROR;
        }
-       if ($cgiparams{'ONLY_PROPOSED'} !~ /^(on|off)$/) {
+
+       if (
+           ($cgiparams{'AGGRMODE'} !~ /^(|on|off)$/) ||
+           ($cgiparams{'COMPRESSION'} !~ /^(|on|off)$/) ||
+           ($cgiparams{'ONLY_PROPOSED'} !~ /^(|on|off)$/) ||
+           ($cgiparams{'PFS'} !~ /^(|on|off)$/) ||
+           ($cgiparams{'VHOST'} !~ /^(|on|off)$/)
+       ){
            $errormessage = $Lang::tr{'invalid input'};
            goto ADVANCED_ERROR;
        }
-       $confighash{$cgiparams{'KEY'}}[14] = $cgiparams{'NAT'};
-       $confighash{$cgiparams{'KEY'}}[13] = $cgiparams{'COMPRESSION'};
+
        $confighash{$cgiparams{'KEY'}}[18] = $cgiparams{'IKE_ENCRYPTION'};
        $confighash{$cgiparams{'KEY'}}[19] = $cgiparams{'IKE_INTEGRITY'};
        $confighash{$cgiparams{'KEY'}}[20] = $cgiparams{'IKE_GROUPTYPE'};
@@ -1996,19 +2245,19 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
        $confighash{$cgiparams{'KEY'}}[22] = $cgiparams{'ESP_INTEGRITY'};
        $confighash{$cgiparams{'KEY'}}[23] = $cgiparams{'ESP_GROUPTYPE'};
        $confighash{$cgiparams{'KEY'}}[17] = $cgiparams{'ESP_KEYLIFE'};
+       $confighash{$cgiparams{'KEY'}}[12] = $cgiparams{'AGGRMODE'};
+       $confighash{$cgiparams{'KEY'}}[13] = $cgiparams{'COMPRESSION'};
        $confighash{$cgiparams{'KEY'}}[24] = $cgiparams{'ONLY_PROPOSED'};
+       $confighash{$cgiparams{'KEY'}}[28] = $cgiparams{'PFS'};
+       $confighash{$cgiparams{'KEY'}}[14] = $cgiparams{'VHOST'};
        &General::writehasharray("${General::swroot}/vpn/config", \%confighash);
        &writeipsecfiles();
-       if ($vpnsettings{'ENABLED'} eq 'on' ||
-           $vpnsettings{'ENABLED_BLUE'} eq 'on') {
+       if (&vpnenabled) {
            system('/usr/local/bin/ipsecctrl', 'S', $cgiparams{'KEY'});
            sleep $sleepDelay;
        }
        goto ADVANCED_END;
     } else {
-
-       $cgiparams{'NAT'}            = $confighash{$cgiparams{'KEY'}}[14];
-       $cgiparams{'COMPRESSION'}    = $confighash{$cgiparams{'KEY'}}[13];
        $cgiparams{'IKE_ENCRYPTION'} = $confighash{$cgiparams{'KEY'}}[18];
        $cgiparams{'IKE_INTEGRITY'}  = $confighash{$cgiparams{'KEY'}}[19];
        $cgiparams{'IKE_GROUPTYPE'}  = $confighash{$cgiparams{'KEY'}}[20];
@@ -2017,20 +2266,18 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
        $cgiparams{'ESP_INTEGRITY'}  = $confighash{$cgiparams{'KEY'}}[22];
        $cgiparams{'ESP_GROUPTYPE'}  = $confighash{$cgiparams{'KEY'}}[23];
        $cgiparams{'ESP_KEYLIFE'}    = $confighash{$cgiparams{'KEY'}}[17];
+       $cgiparams{'AGGRMODE'}       = $confighash{$cgiparams{'KEY'}}[12];
+       $cgiparams{'COMPRESSION'}    = $confighash{$cgiparams{'KEY'}}[13];
        $cgiparams{'ONLY_PROPOSED'}  = $confighash{$cgiparams{'KEY'}}[24];
+       $cgiparams{'PFS'}            = $confighash{$cgiparams{'KEY'}}[28];
+       $cgiparams{'VHOST'}          = $confighash{$cgiparams{'KEY'}}[14];
+
        if ($confighash{$cgiparams{'KEY'}}[3] eq 'net' || $confighash{$cgiparams{'KEY'}}[10]) {
-           $cgiparams{'NAT'}            = 'off';
+           $cgiparams{'VHOST'}            = 'off';
        }
     }
 
     ADVANCED_ERROR:
-    $checked{'NAT'}{'off'} = '';
-    $checked{'NAT'}{'on'} = '';
-    $checked{'NAT'}{$cgiparams{'NAT'}} = "checked='checked'";
-    $checked{'COMPRESSION'}{'off'} = '';
-    $checked{'COMPRESSION'}{'on'} = '';
-    $checked{'COMPRESSION'}{$cgiparams{'COMPRESSION'}} = "checked='checked'";
     $checked{'IKE_ENCRYPTION'}{'aes256'} = '';
     $checked{'IKE_ENCRYPTION'}{'aes128'} = '';
     $checked{'IKE_ENCRYPTION'}{'3des'} = '';
@@ -2083,112 +2330,140 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
     $checked{'ESP_GROUPTYPE'}{'modp3072'} = '';
     $checked{'ESP_GROUPTYPE'}{'modp4096'} = '';
     $checked{'ESP_GROUPTYPE'}{$cgiparams{'ESP_GROUPTYPE'}} = "selected='selected'";
-    $checked{'ONLY_PROPOSED'}{'off'} = '';
-    $checked{'ONLY_PROPOSED'}{'on'} = '';
-    $checked{'ONLY_PROPOSED'}{$cgiparams{'ONLY_PROPOSED'}} = "checked='checked'";
+
+    $checked{'AGGRMODE'} = $cgiparams{'AGGRMODE'} eq 'on' ? "checked='checked'" : '' ;
+    $checked{'COMPRESSION'} = $cgiparams{'COMPRESSION'} eq 'on' ? "checked='checked'" : '' ;
+    $checked{'ONLY_PROPOSED'} = $cgiparams{'ONLY_PROPOSED'} eq 'on' ? "checked='checked'" : '' ;
+    $checked{'PFS'} = $cgiparams{'PFS'} eq 'on' ? "checked='checked'" : '' ;
+    $checked{'VHOST'} = $cgiparams{'VHOST'} eq 'on' ? "checked='checked'" : '' ;
 
     &Header::showhttpheaders();
     &Header::openpage($Lang::tr{'vpn configuration main'}, 1, '');
-    &Header::openbigbox('100%', 'LEFT', '', $errormessage);
+    &Header::openbigbox('100%', 'left', '', $errormessage);
 
     if ($errormessage) {
-       &Header::openbox('100%', 'LEFT', $Lang::tr{'error messages'});
+       &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
        print "<class name='base'>$errormessage";
        print "&nbsp;</class>";
        &Header::closebox();
     }
 
     if ($warnmessage) {
-       &Header::openbox('100%', 'LEFT', $Lang::tr{'warning messages'});
+       &Header::openbox('100%', 'left', $Lang::tr{'warning messages'});
        print "<class name='base'>$warnmessage";
        print "&nbsp;</class>";
        &Header::closebox();
     }
 
-    print "<form method='post' enctype='multipart/form-data'>\n";
-    print "<input type='hidden' name='ADVANCED' value='yes' />\n";
-    print "<input type='hidden' name='KEY' value='$cgiparams{'KEY'}' />\n";
+    &Header::openbox('100%', 'left', "$Lang::tr{'advanced'}:");
+    print <<EOF
+    <form method='post' enctype='multipart/form-data' action='$ENV{'SCRIPT_NAME'}'>
+    <input type='hidden' name='ADVANCED' value='yes' />
+    <input type='hidden' name='KEY' value='$cgiparams{'KEY'}' />
 
-    &Header::openbox('100%', 'LEFT', "$Lang::tr{'advanced'}:");
-    print "<table width='100%'>\n";
-    print "<tr><td width='25%' class='boldbase'>$Lang::tr{'compression'}</td>\n";
-    print "<td width='25%'><input type='checkbox' name='COMPRESSION' $checked{'COMPRESSION'}{'on'} /></td>\n";
+    <table width='100%'>
+       <tr><td class='boldbase' align='right' valign='top'>$Lang::tr{'ike encryption'}</td><td class='boldbase' valign='top'>
+               <select name='IKE_ENCRYPTION' multiple='multiple' size='4'>
+               <option value='aes256' $checked{'IKE_ENCRYPTION'}{'aes256'}>AES (256 bit)</option>
+               <option value='aes128' $checked{'IKE_ENCRYPTION'}{'aes128'}>AES (128 bit)</option>
+               <option value='3des' $checked{'IKE_ENCRYPTION'}{'3des'}>3DES</option>
+               <option value='twofish256' $checked{'IKE_ENCRYPTION'}{'twofish256'}>Twofish (256 bit)</option>
+               <option value='twofish128' $checked{'IKE_ENCRYPTION'}{'twofish128'}>Twofish (128 bit)</option>
+               <option value='serpent256' $checked{'IKE_ENCRYPTION'}{'serpent256'}>Serpent (256 bit)</option>
+               <option value='serpent128' $checked{'IKE_ENCRYPTION'}{'serpent128'}>Serpent (128 bit)</option>
+               <option value='blowfish256' $checked{'IKE_ENCRYPTION'}{'blowfish256'}>Blowfish (256 bit)</option>
+               <option value='blowfish128' $checked{'IKE_ENCRYPTION'}{'blowfish128'}>Blowfish (128 bit)</option>
+               <option value='cast128' $checked{'IKE_ENCRYPTION'}{'cast128'}>Cast (128 bit)</option>
+               </select></td>
+
+           <td class='boldbase' align='right' valign='top'>$Lang::tr{'ike integrity'}</td><td class='boldbase' valign='top'>
+               <select name='IKE_INTEGRITY' multiple='multiple' size='4'>
+               <option value='sha2_512' $checked{'IKE_INTEGRITY'}{'sha2_512'}>SHA2 (512)</option>
+               <option value='sha2_256' $checked{'IKE_INTEGRITY'}{'sha2_256'}>SHA2 (256)</option>
+               <option value='sha' $checked{'IKE_INTEGRITY'}{'sha'}>SHA</option>
+               <option value='md5' $checked{'IKE_INTEGRITY'}{'md5'}>MD5</option>
+               </select></td>
+       
+           <td class='boldbase' align='right' valign='top'>$Lang::tr{'ike grouptype'}</td><td class='boldbase' valign='top'>
+               <select name='IKE_GROUPTYPE' multiple='multiple' size='4'>
+               <option value='8192' $checked{'IKE_GROUPTYPE'}{'8192'}>MODP-8192</option>
+               <option value='6144' $checked{'IKE_GROUPTYPE'}{'6144'}>MODP-6144</option>
+               <option value='4096' $checked{'IKE_GROUPTYPE'}{'4096'}>MODP-4096</option>
+               <option value='3072' $checked{'IKE_GROUPTYPE'}{'3072'}>MODP-3072</option>
+               <option value='2048' $checked{'IKE_GROUPTYPE'}{'2048'}>MODP-2048</option>
+               <option value='1536' $checked{'IKE_GROUPTYPE'}{'1536'}>MODP-1536</option>
+               <option value='1024' $checked{'IKE_GROUPTYPE'}{'1024'}>MODP-1024</option>
+               <option value='768'  $checked{'IKE_GROUPTYPE'}{'768'}>MODP-768</option>
+               </select></td>
+       </tr><tr>
+           <td class='boldbase' align='right' valign='top'>$Lang::tr{'ike lifetime'}</td><td class='boldbase' valign='top'>
+           <input type='text' name='IKE_LIFETIME' value='$cgiparams{'IKE_LIFETIME'}' size='5' /> $Lang::tr{'hours'}</td>
+
+       </tr><tr>
+           <td colspan='1'><hr /></td>
+       </tr><tr>
+           <td class='boldbase' align='right' valign='top'>$Lang::tr{'esp encryption'}</td><td class='boldbase' valign='top'>
+               <select name='ESP_ENCRYPTION' multiple='multiple' size='4'>
+               <option value='aes256' $checked{'ESP_ENCRYPTION'}{'aes256'}>AES (256 bit)</option>
+               <option value='aes128' $checked{'ESP_ENCRYPTION'}{'aes128'}>AES (128 bit)</option>
+               <option value='3des' $checked{'ESP_ENCRYPTION'}{'3des'}>3DES</option>
+               <option value='twofish256' $checked{'ESP_ENCRYPTION'}{'twofish256'}>Twofish (256 bit)</option>
+               <option value='twofish128' $checked{'ESP_ENCRYPTION'}{'twofish128'}>Twofish (128 bit)</option>
+               <option value='serpent256' $checked{'ESP_ENCRYPTION'}{'serpent256'}>Serpent (256 bit)</option>
+               <option value='serpent128' $checked{'ESP_ENCRYPTION'}{'serpent128'}>Serpent (128 bit)</option>
+               <option value='blowfish256' $checked{'ESP_ENCRYPTION'}{'blowfish256'}>Blowfish (256 bit)</option>
+               <option value='blowfish128' $checked{'ESP_ENCRYPTION'}{'blowfish128'}>Blowfish (128 bit)</option></select></td>
+
+           <td class='boldbase' align='right' valign='top'>$Lang::tr{'esp integrity'}</td><td class='boldbase' valign='top'>
+               <select name='ESP_INTEGRITY' multiple='multiple' size='4'>
+               <option value='sha2_512' $checked{'ESP_INTEGRITY'}{'sha2_512'}>SHA2 (512)</option>
+               <option value='sha2_256' $checked{'ESP_INTEGRITY'}{'sha2_256'}>SHA2 (256)</option>
+               <option value='sha1' $checked{'ESP_INTEGRITY'}{'sha1'}>SHA1</option>
+               <option value='md5' $checked{'ESP_INTEGRITY'}{'md5'}>MD5</option></select></td>
+
+           <td class='boldbase' align='right' valign='top'>$Lang::tr{'esp grouptype'}</td><td class='boldbase' valign='top'>
+               <select name='ESP_GROUPTYPE'>
+               <option value=''>$Lang::tr{'phase1 group'}</option>
+               <option value='modp4096' $checked{'ESP_GROUPTYPE'}{'modp4096'}>MODP-4096</option>
+               <option value='modp3072' $checked{'ESP_GROUPTYPE'}{'modp3072'}>MODP-3072</option>
+               <option value='modp2048' $checked{'ESP_GROUPTYPE'}{'modp2048'}>MODP-2048</option>
+               <option value='modp1536' $checked{'ESP_GROUPTYPE'}{'modp1536'}>MODP-1536</option>
+               <option value='modp1024' $checked{'ESP_GROUPTYPE'}{'modp1024'}>MODP-1024</option>
+               <option value='modp768'  $checked{'ESP_GROUPTYPE'}{'modp768'}>MODP-768</option></select></td>
+       </tr><tr>
+           <td class='boldbase' align='right' valign='top'>$Lang::tr{'esp keylife'}</td><td class='boldbase' valign='top'>
+               <input type='text' name='ESP_KEYLIFE' value='$cgiparams{'ESP_KEYLIFE'}' size='5' /> $Lang::tr{'hours'}</td>
+       </tr><tr>
+           <td colspan='1'><hr /></td>
+       </tr><tr>
+           <td colspan='5'><input type='checkbox' name='ONLY_PROPOSED' $checked{'ONLY_PROPOSED'} />
+               IKE+ESP: $Lang::tr{'use only proposed settings'}</td>
+       </tr><tr>
+           <td colspan='5'><input type='checkbox' name='AGGRMODE' $checked{'AGGRMODE'} />
+               $Lang::tr{'vpn aggrmode'}</td>
+       </tr><tr>
+           <td colspan='5'><input type='checkbox' name='PFS' $checked{'PFS'} />
+               $Lang::tr{'pfs yes no'}</td>
+               <td align='right'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
+       </tr><tr>
+           <td colspan='5'><input type='checkbox' name='COMPRESSION' $checked{'COMPRESSION'} />
+               $Lang::tr{'vpn payload compression'}</td>
+               <td align='right'><input type='submit' name='ACTION' value='$Lang::tr{'cancel'}' /></td>
+       </tr>
+EOF
+    ;
     if ($confighash{$cgiparams{'KEY'}}[3] eq 'net') {
-       print "<td width='25%'><input type='hidden' name='NAT' value='off' /></td><td width='25%'>&nbsp;</td></tr>\n";
+       print "<tr><td><input type='hidden' name='VHOST' value='off' /></td></tr>";
     } elsif ($confighash{$cgiparams{'KEY'}}[10]) {
-       print "<td width='25%' class='boldbase'>$Lang::tr{'nat-traversal'}</td>\n";
-       print "<td width='25%'><input type='checkbox' name='NAT' $checked{'NAT'}{'on'} disabled='disabled' /></td></tr>\n";
+       print "<tr><td colspan='5'><input type='checkbox' name='VHOST' $checked{'VHOST'} disabled='disabled' />";
+       print " $Lang::tr{'vpn vhost'}</td></tr>";
     } else {
-       print "<td width='25%' class='boldbase'>$Lang::tr{'nat-traversal'}</td>\n";
-       print "<td width='25%'><input type='checkbox' name='NAT' $checked{'NAT'}{'on'} /></td></tr>\n";
+       print "<tr><td colspan='5'><input type='checkbox' name='VHOST' $checked{'VHOST'} />";
+       print " $Lang::tr{'vpn vhost'}</td></tr>";
     }
-    print <<EOF
-       <tr><td width='25%' class='boldbase' valign='top'>$Lang::tr{'ike encryption'}</td>
-           <td width='25%' valign='top'><select name='IKE_ENCRYPTION' multiple='multiple' size='4'>
-                       <option value='aes256' $checked{'IKE_ENCRYPTION'}{'aes256'}>AES (256 bit)</option>
-                       <option value='aes128' $checked{'IKE_ENCRYPTION'}{'aes128'}>AES (128 bit)</option>
-                       <option value='3des' $checked{'IKE_ENCRYPTION'}{'3des'}>3DES</option>
-                       <option value='twofish256' $checked{'IKE_ENCRYPTION'}{'twofish256'}>Twofish (256 bit)</option>
-                       <option value='twofish128' $checked{'IKE_ENCRYPTION'}{'twofish128'}>Twofish (128 bit)</option>
-                       <option value='serpent256' $checked{'IKE_ENCRYPTION'}{'serpent256'}>Serpent (256 bit)</option>
-                       <option value='serpent128' $checked{'IKE_ENCRYPTION'}{'serpent128'}>Serpent (128 bit)</option>
-                       <option value='blowfish256' $checked{'IKE_ENCRYPTION'}{'blowfish256'}>Blowfish (256 bit)</option>
-                       <option value='blowfish128' $checked{'IKE_ENCRYPTION'}{'blowfish128'}>Blowfish (128 bit)</option>
-                       <option value='cast128' $checked{'IKE_ENCRYPTION'}{'cast128'}>Cast (128 bit)</option></SELECT></td>
-           <td width='25%' class='boldbase' valign='top'>$Lang::tr{'ike integrity'}</td>
-           <td width='25%' valign='top'><select name='IKE_INTEGRITY' multiple='multiple' size='4'>
-                       <option value='sha2_512' $checked{'IKE_INTEGRITY'}{'sha2_512'}>SHA2 (512)</option>
-                       <option value='sha2_256' $checked{'IKE_INTEGRITY'}{'sha2_256'}>SHA2 (256)</option>
-                       <option value='sha' $checked{'IKE_INTEGRITY'}{'sha'}>SHA</option>
-                       <option value='md5' $checked{'IKE_INTEGRITY'}{'md5'}>MD5</option></SELECT></td></tr>
-       <tr><td width='25%' class='boldbase' valign='top'>$Lang::tr{'ike lifetime'}</td>
-           <td width='25%' valign='top'><input type='text' name='IKE_LIFETIME' value='$cgiparams{'IKE_LIFETIME'}' SIZE='5'> $Lang::tr{'hours'}</td>
-           <td width='25%' class='boldbase' valign='top'>$Lang::tr{'ike grouptype'}</td>
-           <td width='25%' valign='top'><select name='IKE_GROUPTYPE' multiple='multiple' size='4'>
-                       <option value='8192' $checked{'IKE_GROUPTYPE'}{'8192'}>MODP-8192</option>
-                       <option value='6144' $checked{'IKE_GROUPTYPE'}{'6144'}>MODP-6144</option>
-                       <option value='4096' $checked{'IKE_GROUPTYPE'}{'4096'}>MODP-4096</option>
-                       <option value='3072' $checked{'IKE_GROUPTYPE'}{'3072'}>MODP-3072</option>
-                       <option value='2048' $checked{'IKE_GROUPTYPE'}{'2048'}>MODP-2048</option>
-                       <option value='1536' $checked{'IKE_GROUPTYPE'}{'1536'}>MODP-1536</option>
-                       <option value='1024' $checked{'IKE_GROUPTYPE'}{'1024'}>MODP-1024</option>
-                       <option value='768'  $checked{'IKE_GROUPTYPE'}{'768'}>MODP-768</option></select></td></tr>
-       <tr><td width='25%' class='boldbase' valign='top'>$Lang::tr{'esp encryption'}</td>
-           <td width='25%' valign='top'><select name='ESP_ENCRYPTION' multiple='multiple' size='4'>
-                       <option value='aes256' $checked{'ESP_ENCRYPTION'}{'aes256'}>AES (256 bit)</option>
-                       <option value='aes128' $checked{'ESP_ENCRYPTION'}{'aes128'}>AES (128 bit)</option>
-                       <option value='3des' $checked{'ESP_ENCRYPTION'}{'3des'}>3DES</option>
-                       <option value='twofish256' $checked{'ESP_ENCRYPTION'}{'twofish256'}>Twofish (256 bit)</option>
-                       <option value='twofish128' $checked{'ESP_ENCRYPTION'}{'twofish128'}>Twofish (128 bit)</option>
-                       <option value='serpent256' $checked{'ESP_ENCRYPTION'}{'serpent256'}>Serpent (256 bit)</option>
-                       <option value='serpent128' $checked{'ESP_ENCRYPTION'}{'serpent128'}>Serpent (128 bit)</option>
-                       <option value='blowfish256' $checked{'ESP_ENCRYPTION'}{'blowfish256'}>Blowfish (256 bit)</option>
-                       <option value='blowfish128' $checked{'ESP_ENCRYPTION'}{'blowfish128'}>Blowfish (128 bit)</option></select></td>
-           <td width='25%' class='boldbase' valign='top'>$Lang::tr{'esp integrity'}</td>
-           <td width='25%' valign='top'><select name='ESP_INTEGRITY' multiple='multiple' size='4'>
-                       <option value='sha2_512' $checked{'ESP_INTEGRITY'}{'sha2_512'}>SHA2 (512)</option>
-                       <option value='sha2_256' $checked{'ESP_INTEGRITY'}{'sha2_256'}>SHA2 (256)</option>
-                       <option value='sha1' $checked{'ESP_INTEGRITY'}{'sha1'}>SHA1</option>
-                       <option value='md5' $checked{'ESP_INTEGRITY'}{'md5'}>MD5</option></select></td></tr>
-       <tr><td width='25%' class='boldbase' valign='top'>$Lang::tr{'esp keylife'}</td>
-           <td width='25%' valign='top'><input type='text' name='ESP_KEYLIFE' value='$cgiparams{'ESP_KEYLIFE'}' size='5' /> $Lang::tr{'hours'}</td>
-           <td width='25%' class='boldbase' valign='top'>$Lang::tr{'esp grouptype'}</td>
-           <td width='25%' valign='top'><select name='ESP_GROUPTYPE'>
-                       <option value=''>$Lang::tr{'phase1 group'}</option>
-                       <option value='modp4096' $checked{'ESP_GROUPTYPE'}{'modp4096'}>MODP-4096</option>
-                       <option value='modp3072' $checked{'ESP_GROUPTYPE'}{'modp3072'}>MODP-3072</option>
-                       <option value='modp2048' $checked{'ESP_GROUPTYPE'}{'modp2048'}>MODP-2048</option>
-                       <option value='modp1536' $checked{'ESP_GROUPTYPE'}{'modp1536'}>MODP-1536</option>
-                       <option value='modp1024' $checked{'ESP_GROUPTYPE'}{'modp1024'}>MODP-1024</option>
-                       <option value='modp768'  $checked{'ESP_GROUPTYPE'}{'modp768'}>MODP-768</option></select></td></tr>
-       <tr><td colspan='4'><input type='CHECKBOX' name='ONLY_PROPOSED' $checked{'ONLY_PROPOSED'}{'on'} />
-               $Lang::tr{'use only proposed settings'}</td></tr>
-       </table>
-EOF
-    ;
+
+    print "</table></form>";
     &Header::closebox();
-    print "<div align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' />";
-    print "<input type='submit' name='ACTION' value='$Lang::tr{'cancel'}' /></div></form>";
     &Header::closebigbox();
     &Header::closepage();
     exit(0);
@@ -2205,6 +2480,7 @@ EOF
     &General::readhash("${General::swroot}/vpn/settings", \%cgiparams);
     &General::readhasharray("${General::swroot}/vpn/caconfig", \%cahash);
     &General::readhasharray("${General::swroot}/vpn/config", \%confighash);
+    $cgiparams{'CA_NAME'} = '';
 
     my @status = `/usr/sbin/ipsec auto --status`;
 
@@ -2224,64 +2500,86 @@ EOF
     $cgiparams{'VPN_IP'} ='%defaultroute' if ($cgiparams{'VPN_IP'} eq '');
     
     $cgiparams{'VPN_DELAYED_START'} = 0 if (! defined ($cgiparams{'VPN_DELAYED_START'}));
+    $checked{'VPN_WATCH'} = $cgiparams{'VPN_WATCH'} eq 'on' ? "checked='checked'" : '' ;
     map ($checked{$_} = $cgiparams{$_} eq 'on' ? "checked='checked'" : '',
-       ('ENABLED','ENABLED_BLUE','DBG_CRYPT','DBG_PARSING','DBG_EMITTING','DBG_CONTROL',
+       ('ENABLED','ENABLED_GREEN','ENABLED_ORANGE','ENABLED_BLUE','DBG_CRYPT','DBG_PARSING','DBG_EMITTING','DBG_CONTROL',
         'DBG_KLIPS','DBG_DNS','DBG_NAT_T'));
 
 
     &Header::showhttpheaders();
     &Header::openpage($Lang::tr{'vpn configuration main'}, 1, '');
-    &Header::openbigbox('100%', 'LEFT', '', $errormessage);
+    &Header::openbigbox('100%', 'left', '', $errormessage);
 
     if ($errormessage) {
-       &Header::openbox('100%', 'LEFT', $Lang::tr{'error messages'});
+       &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
        print "<class name='base'>$errormessage\n";
        print "&nbsp;</class>\n";
        &Header::closebox();
     }
 
-    &Header::openbox('100%', 'LEFT', $Lang::tr{'global settings'});
+    &Header::openbox('100%', 'left', $Lang::tr{'global settings'});
+    my $checkbox="";
     print <<END
-    <form method='post'>
+    <form method='post' action='$ENV{'SCRIPT_NAME'}'>
     <table width='100%'>
     <tr>
-       <td width='25%' class='base' nowrap='nowrap'>$Lang::tr{'local vpn hostname/ip'}:</td>
-       <td width='25%'><input type='text' name='VPN_IP' value='$cgiparams{'VPN_IP'}' /></td>
-       <td width='25%' class='base'>$Lang::tr{'enabled'}<input type='checkbox' name='ENABLED' $checked{'ENABLED'} /></td>
+       <td width='20%' class='base' nowrap='nowrap'>$Lang::tr{'local vpn hostname/ip'}:</td>
+       <td width='20%'><input type='text' name='VPN_IP' value='$cgiparams{'VPN_IP'}' /></td>
+       <td width='20%' class='base'>$Lang::tr{'enabled'}<input type='checkbox' name='ENABLED' $checked{'ENABLED'} /></td>
+       <td width='20%' class='base' nowrap='nowrap'>$Lang::tr{'vpn on green'}:</td>
+       <td width='20%' class='base'>$Lang::tr{'enabled'}<input type='checkbox' name='ENABLED_GREEN' $checked{'ENABLED_GREEN'} /></td>
     </tr>
 END
     ;
-    if ($netsettings{'BLUE_DEV'} ne '') {
+    if ($netsettings{'ORANGE_DEV'} ne '') {
+       $checkbox=<<END
+       <td class='base' nowrap='nowrap'>$Lang::tr{'vpn on orange'}:</td>
+       <td class='base'>$Lang::tr{'enabled'}<input type='checkbox' name='ENABLED_ORANGE' $checked{'ENABLED_ORANGE'} /></td>
+END
+    ;}
+
     print <<END
     <tr>
-       <td width='25%' class='base' nowrap='nowrap'>$Lang::tr{'vpn on blue'}:</td>
+       <td class='base' nowrap='nowrap'>$Lang::tr{'override mtu'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
+       <td ><input type='text' name='VPN_OVERRIDE_MTU' value='$cgiparams{'VPN_OVERRIDE_MTU'}' /></td>
        <td></td>
-       <td width='25%' class='base'>$Lang::tr{'enabled'}<input type='checkbox' name='ENABLED_BLUE' $checked{'ENABLED_BLUE'} /></td>
+       $checkbox
     </tr>
 END
     ;
-    }
+    if ($netsettings{'BLUE_DEV'} ne '') {
+       $checkbox=<<END
+       <td class='base' nowrap='nowrap'>$Lang::tr{'vpn on blue'}:</td>
+       <td class='base'>$Lang::tr{'enabled'}<input type='checkbox' name='ENABLED_BLUE' $checked{'ENABLED_BLUE'} /></td>
+END
+    ;}
 print <<END
-       <td width='25%' class='base' nowrap='nowrap'>$Lang::tr{'vpn delayed start'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
-       <td width='25%'><input type='text' name='VPN_DELAYED_START' value='$cgiparams{'VPN_DELAYED_START'}' /></td>
-       <td width='25%' class='base' nowrap='nowrap'>$Lang::tr{'override mtu'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
-       <td width='25%'><input type='text' name='VPN_OVERRIDE_MTU' value='$cgiparams{'VPN_OVERRIDE_MTU'}' /></td>
-</table>
-<table width='100%'>
-<tr><td>PLUTO DEBUG</td>
-    <td>crypt:<input type='checkbox' name='DBG_CRYPT' $checked{'DBG_CRYPT'} /></td>
-    <td>parsing:<input type='checkbox' name='DBG_PARSING' $checked{'DBG_PARSING'} /></td>
-    <td>emitting:<input type='checkbox' name='DBG_EMITTING' $checked{'DBG_EMITTING'} /></td>
-    <td>control:<input type='checkbox' name='DBG_CONTROL' $checked{'DBG_CONTROL'} /></td>
-    <td>klips:<input type='checkbox' name='DBG_KLIPS' $checked{'DBG_KLIPS'} /></td>
-    <td>dns:<input type='checkbox' name='DBG_DNS' $checked{'DBG_DNS'} /></td>
-    <td>nat_t:<input type='checkbox' name='DBG_NAT_T' $checked{'DBG_NAT_T'} /></td>
-</tr></table>
+    <tr>
+       <td  class='base' nowrap='nowrap'>$Lang::tr{'vpn delayed start'}:&nbsp;<img src='/blob.gif' alt='*' /><img src='/blob.gif' alt='*' /></td>
+       <td ><input type='text' name='VPN_DELAYED_START' value='$cgiparams{'VPN_DELAYED_START'}' /></td>
+       <td></td>
+       $checkbox
+    </tr>
+ </table>
+<p>$Lang::tr{'vpn watch'}:<input type='checkbox' name='VPN_WATCH' $checked{'VPN_WATCH'} /></p>
+<p>PLUTO DEBUG&nbsp;=
+crypt:<input type='checkbox' name='DBG_CRYPT' $checked{'DBG_CRYPT'} />,&nbsp;
+parsing:<input type='checkbox' name='DBG_PARSING' $checked{'DBG_PARSING'} />,&nbsp;
+emitting:<input type='checkbox' name='DBG_EMITTING' $checked{'DBG_EMITTING'} />,&nbsp;
+control:<input type='checkbox' name='DBG_CONTROL' $checked{'DBG_CONTROL'} />,&nbsp;
+klips:<input type='checkbox' name='DBG_KLIPS' $checked{'DBG_KLIPS'} />,&nbsp;
+dns:<input type='checkbox' name='DBG_DNS' $checked{'DBG_DNS'} />,&nbsp;
+nat_t:<input type='checkbox' name='DBG_NAT_T' $checked{'DBG_NAT_T'} /></p>
+
 <hr />
 <table width='100%'>
 <tr>
     <td class='base' valign='top'><img src='/blob.gif' alt='*' /></td>
-    <td width='70%' class='base'>$Lang::tr{'vpn delayed start help'}</td>
+    <td width='70%' class='base' valign='top'>$Lang::tr{'this field may be blank'}</td>
+</tr>
+<tr>
+    <td class='base' valign='top' nowrap='nowrap'><img src='/blob.gif' alt='*' /><img src='/blob.gif' alt='*' />&nbsp;</td>
+    <td class='base'>  <font class='base'>$Lang::tr{'vpn delayed start help'}</font></td>
     <td width='30%' align='center' class='base'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
 </tr>
 </table>
@@ -2289,17 +2587,18 @@ END
 ;              
     print "</form>";
     &Header::closebox();
+    undef ($checkbox);
 
-    &Header::openbox('100%', 'LEFT', $Lang::tr{'connection status and controlc'});
+    &Header::openbox('100%', 'left', $Lang::tr{'connection status and controlc'});
     print <<END
     <table width='100%' border='0' cellspacing='1' cellpadding='0'>
     <tr>
        <td width='10%' class='boldbase' align='center'><b>$Lang::tr{'name'}</b></td>
        <td width='22%' class='boldbase' align='center'><b>$Lang::tr{'type'}</b></td>
        <td width='23%' class='boldbase' align='center'><b>$Lang::tr{'common name'}</b></td>
-       <td width='30%' class='boldbase' align='center'><b>$Lang::tr{'remark'}</b><br /><img src='/images/null.gif' width='125' height='1' border='0' alt='L2089' /></td>
+       <td width='30%' class='boldbase' align='center'><b>$Lang::tr{'remark'}</b></td>
        <td width='10%' class='boldbase' align='center'><b>$Lang::tr{'status'}</b></td>
-       <td width='5%' class='boldbase' colspan='6' align='center'><b>$Lang::tr{'action'}</b></td>
+       <td class='boldbase' align='center' colspan='6'><b>$Lang::tr{'action'}</b></td>
     </tr>
 END
     ;
@@ -2315,7 +2614,9 @@ END
        }
        print "<td align='center' nowrap='nowrap'>$confighash{$key}[1]</td>";
        print "<td align='center' nowrap='nowrap'>" . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ")</td>";
-       if ($confighash{$key}[4] eq 'cert') {
+       if ($confighash{$key}[2] eq '%auth-dn') {
+           print "<td align='left' nowrap='nowrap'>$confighash{$key}[9]</td>";
+       } elsif ($confighash{$key}[4] eq 'cert') {
            print "<td align='left' nowrap='nowrap'>$confighash{$key}[2]</td>";
        } else {
            print "<td align='left'>&nbsp;</td>";
@@ -2333,66 +2634,80 @@ END
        }
        print <<END
        <td align='center'>$active</td>
-       <form method='post' name='frm${key}a'><td align='center'>
-           <input type='image'  name='$Lang::tr{'restart'}' src='/images/reload.gif' alt='$Lang::tr{'restart'}' title='$Lang::tr{'restart'}' border='0' />
+       <td align='center'>
+           <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+           <input type='image'  name='$Lang::tr{'restart'}' src='/images/reload.gif' alt='$Lang::tr{'restart'}' title='$Lang::tr{'restart'}' />
            <input type='hidden' name='ACTION' value='$Lang::tr{'restart'}' />
            <input type='hidden' name='KEY' value='$key' />
-       </td></form>
+           </form>
+       </td>
 END
        ;
-       if ($confighash{$key}[4] eq 'cert') {
+       if (($confighash{$key}[4] eq 'cert') && ($confighash{$key}[2] ne '%auth-dn')) {
            print <<END
-           <form method='post' name='frm${key}b'><td align='center'>
-               <input type='image' name='$Lang::tr{'show certificate'}' src='/images/info.gif' alt='$Lang::tr{'show certificate'}' title='$Lang::tr{'show certificate'}' border='0' />
+           <td align='center'>
+           <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+               <input type='image' name='$Lang::tr{'show certificate'}' src='/images/info.gif' alt='$Lang::tr{'show certificate'}' title='$Lang::tr{'show certificate'}' />
                <input type='hidden' name='ACTION' value='$Lang::tr{'show certificate'}' />
                <input type='hidden' name='KEY' value='$key' />
-           </td></form>
+           </form>
+           </td>
 END
        ; } else {
-           print "<td>&nbsp;</td>";
+           print "<td width='2%'>&nbsp;</td>";
        }
        if ($confighash{$key}[4] eq 'cert' && -f "${General::swroot}/certs/$confighash{$key}[1].p12") { 
            print <<END
-           <form method='post' name='frm${key}c'><td align='center'>
-               <input type='image' name='$Lang::tr{'download pkcs12 file'}' src='/images/floppy.gif' alt='$Lang::tr{'download pkcs12 file'}' title='$Lang::tr{'download pkcs12 file'}' border='0' />
+           <td align='center'>
+           <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+               <input type='image' name='$Lang::tr{'download pkcs12 file'}' src='/images/floppy.gif' alt='$Lang::tr{'download pkcs12 file'}' title='$Lang::tr{'download pkcs12 file'}' />
                <input type='hidden' name='ACTION' value='$Lang::tr{'download pkcs12 file'}' />
                <input type='hidden' name='KEY' value='$key' />
-           </td></form>
+           </form>
+       </td>
 END
-       ; } elsif ($confighash{$key}[4] eq 'cert') {
+       ; } elsif (($confighash{$key}[4] eq 'cert') && ($confighash{$key}[2] ne '%auth-dn')) {
            print <<END
-           <form method='post' name='frm${key}c'><td align='center'>
-               <input type='image' name='$Lang::tr{'download certificate'}' src='/images/floppy.gif' alt='$Lang::tr{'download certificate'}' title='$Lang::tr{'download certificate'}' border='0' />
+           <td align='center'>
+           <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+               <input type='image' name='$Lang::tr{'download certificate'}' src='/images/floppy.gif' alt='$Lang::tr{'download certificate'}' title='$Lang::tr{'download certificate'}' />
                <input type='hidden' name='ACTION' value='$Lang::tr{'download certificate'}' />
                <input type='hidden' name='KEY' value='$key' />
-           </td></form>
+           </form>
+       </td>
 END
        ; } else {
-           print "<td>&nbsp;</td>";
+           print "<td width='2%'>&nbsp;</td>";
        }
        print <<END
-       <form method='post' name='frm${key}d'><td align='center'>
-           <input type='image' name='$Lang::tr{'toggle enable disable'}' src='/images/$gif' alt='$Lang::tr{'toggle enable disable'}' title='$Lang::tr{'toggle enable disable'}' border='0' />
+       <td align='center'>
+           <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+           <input type='image' name='$Lang::tr{'toggle enable disable'}' src='/images/$gif' alt='$Lang::tr{'toggle enable disable'}' title='$Lang::tr{'toggle enable disable'}' />
            <input type='hidden' name='ACTION' value='$Lang::tr{'toggle enable disable'}' />
            <input type='hidden' name='KEY' value='$key' />
-       </td></form>
+           </form>
+       </td>
 
-       <form method='post' name='frm${key}e'><td align='center'>
+       <td align='center'>
+           <form method='post' action='$ENV{'SCRIPT_NAME'}'>
            <input type='hidden' name='ACTION' value='$Lang::tr{'edit'}' />
-           <input type='image' name='$Lang::tr{'edit'}' src='/images/edit.gif' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' width='20' height='20' border='0'/>
+           <input type='image' name='$Lang::tr{'edit'}' src='/images/edit.gif' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' />
            <input type='hidden' name='KEY' value='$key' />
-       </td></form>
-       <form method='post' name='frm${key}f'><td align='center'>
+           </form>
+       </td>
+       <td align='center' >
+           <form method='post' action='$ENV{'SCRIPT_NAME'}'>
            <input type='hidden' name='ACTION' value='$Lang::tr{'remove'}' />
-           <input type='image'  name='$Lang::tr{'remove'}' src='/images/delete.gif' alt='$Lang::tr{'remove'}' title='$Lang::tr{'remove'}' width='20' height='20' border='0' />
+           <input type='image'  name='$Lang::tr{'remove'}' src='/images/delete.gif' alt='$Lang::tr{'remove'}' title='$Lang::tr{'remove'}' />
            <input type='hidden' name='KEY' value='$key' />
-       </td></form>
+           </form>
+       </td>
        </tr>
 END
        ;
        $id++;
     }
-    ;
+    print "</table>";
 
     # If the config file contains entries, print Key to action icons
     if ( $id ) {
@@ -2425,15 +2740,17 @@ END
 
     print <<END
     <table width='100%'>
-    <form method='post'>
-    <tr><td align='center' colspan='9'><input type='submit' name='ACTION' value='$Lang::tr{'add'}' /></td></tr>
-    </form>
+    <tr><td align='center' colspan='9'>
+       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+       <input type='submit' name='ACTION' value='$Lang::tr{'add'}' />
+       </form>
+    </td></tr>
     </table>
 END
     ;
     &Header::closebox();
 
-    &Header::openbox('100%', 'LEFT', "$Lang::tr{'certificate authorities'}:");
+    &Header::openbox('100%', 'left', "$Lang::tr{'certificate authorities'}:");
     print <<EOF
     <table width='100%' border='0' cellspacing='1' cellpadding='0'>
     <tr>
@@ -2444,24 +2761,24 @@ END
 EOF
     ;
     if (-f "${General::swroot}/ca/cacert.pem") {
-       my $casubject = `/usr/bin/openssl x509 -text -in ${General::swroot}/ca/cacert.pem`;
-       $casubject    =~ /Subject: (.*)[\n]/;
-       $casubject    = $1;
-       $casubject    =~ s+/Email+, E+;
-       $casubject    =~ s/ ST=/ S=/;
+       my $casubject = &Header::cleanhtml(getsubjectfromcert ("${General::swroot}/ca/cacert.pem"));
 
        print <<END
        <tr bgcolor='${Header::table2colour}'>
        <td class='base'>$Lang::tr{'root certificate'}</td>
        <td class='base'>$casubject</td>
-       <form method='post' name='frmrootcrta'><td width='3%' align='center'>
+       <td width='3%' align='center'>
+           <form method='post' action='$ENV{'SCRIPT_NAME'}'>
            <input type='hidden' name='ACTION' value='$Lang::tr{'show root certificate'}' />
-           <input type='image' name='$Lang::tr{'edit'}' src='/images/info.gif' alt='$Lang::tr{'show root certificate'}' title='$Lang::tr{'show root certificate'}' width='20' height='20' border='0' />
-       </td></form>
-       <form method='post' name='frmrootcrtb'><td width='3%' align='center'>
-           <input type='image' name='$Lang::tr{'download root certificate'}' src='/images/floppy.gif' alt='$Lang::tr{'download root certificate'}' title='$Lang::tr{'download root certificate'}' border='0' />
+           <input type='image' name='$Lang::tr{'edit'}' src='/images/info.gif' alt='$Lang::tr{'show root certificate'}' title='$Lang::tr{'show root certificate'}' />
+           </form>
+       </td>
+       <td width='3%' align='center'>
+           <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+           <input type='image' name='$Lang::tr{'download root certificate'}' src='/images/floppy.gif' alt='$Lang::tr{'download root certificate'}' title='$Lang::tr{'download root certificate'}' />
            <input type='hidden' name='ACTION' value='$Lang::tr{'download root certificate'}' />
-       </td></form>
+           </form>
+       </td>
        <td width='4%'>&nbsp;</td></tr>
 END
        ;
@@ -2477,24 +2794,24 @@ END
     }
 
     if (-f "${General::swroot}/certs/hostcert.pem") {
-       my $hostsubject = `/usr/bin/openssl x509 -text -in ${General::swroot}/certs/hostcert.pem`;
-       $hostsubject    =~ /Subject: (.*)[\n]/;
-       $hostsubject    = $1;
-       $hostsubject    =~ s+/Email+, E+;
-       $hostsubject    =~ s/ ST=/ S=/;
+       my $hostsubject = &Header::cleanhtml(getsubjectfromcert ("${General::swroot}/certs/hostcert.pem"));
 
        print <<END
        <tr bgcolor='${Header::table1colour}'>
        <td class='base'>$Lang::tr{'host certificate'}</td>
        <td class='base'>$hostsubject</td>
-       <form method='post' name='frmhostcrta'><td width='3%' align='center'>
+       <td width='3%' align='center'>
+           <form method='post' action='$ENV{'SCRIPT_NAME'}'>
            <input type='hidden' name='ACTION' value='$Lang::tr{'show host certificate'}' />
-           <input type='image' name='$Lang::tr{'show host certificate'}' src='/images/info.gif' alt='$Lang::tr{'show host certificate'}' title='$Lang::tr{'show host certificate'}' width='20' height='20' border='0' />
-       </td></form>
-       <form method='post' name='frmhostcrtb'><td width='3%' align='center'>
-           <input type='image' name='$Lang::tr{'download host certificate'}' src='/images/floppy.gif' alt='$Lang::tr{'download host certificate'}' title='$Lang::tr{'download host certificate'}' border='0' />
+           <input type='image' name='$Lang::tr{'show host certificate'}' src='/images/info.gif' alt='$Lang::tr{'show host certificate'}' title='$Lang::tr{'show host certificate'}' />
+           </form>
+       </td>
+       <td width='3%' align='center'>
+           <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+           <input type='image' name='$Lang::tr{'download host certificate'}' src='/images/floppy.gif' alt='$Lang::tr{'download host certificate'}' title='$Lang::tr{'download host certificate'}' />
            <input type='hidden' name='ACTION' value='$Lang::tr{'download host certificate'}' />
-       </td></form>
+           </form>
+       </td>
        <td width='4%'>&nbsp;</td></tr>
 END
        ;
@@ -2504,17 +2821,11 @@ END
        <tr bgcolor='${Header::table1colour}'>
        <td width='25%' class='base'>$Lang::tr{'host certificate'}:</td>
        <td class='base'>$Lang::tr{'not present'}</td>
-       </td><td colspan='3'>&nbsp;</td></tr>
+       <td colspan='3'>&nbsp;</td></tr>
 END
        ;
     }
 
-    if (! -f "${General::swroot}/ca/cacert.pem") {
-        print "<tr><td colspan='5' align='center'><form method='post'>";
-       print "<input type='submit' name='ACTION' value='$Lang::tr{'generate root/host certificates'}' />";
-        print "</form></td></tr>\n";
-    }
-
     if (keys %cahash > 0) {
        foreach my $key (keys %cahash) {
            if (($key + 1) % 2) {
@@ -2525,56 +2836,69 @@ END
            print "<td class='base'>$cahash{$key}[0]</td>\n";
            print "<td class='base'>$cahash{$key}[1]</td>\n";
            print <<END
-           <form method='post' name='cafrm${key}a'><td align='center'>
-               <input type='image' name='$Lang::tr{'show ca certificate'}' src='/images/info.gif' alt='$Lang::tr{'show ca certificate'}' title='$Lang::tr{'show ca certificate'}' border='0' />
+           <td align='center'>
+               <form method='post' name='cafrm${key}a' action='$ENV{'SCRIPT_NAME'}'>
+               <input type='image' name='$Lang::tr{'show ca certificate'}' src='/images/info.gif' alt='$Lang::tr{'show ca certificate'}' title='$Lang::tr{'show ca certificate'}' />
                <input type='hidden' name='ACTION' value='$Lang::tr{'show ca certificate'}' />
                <input type='hidden' name='KEY' value='$key' />
-           </td></form>
-           <form method='post' name='cafrm${key}b'><td align='center'>
-               <input type='image' name='$Lang::tr{'download ca certificate'}' src='/images/floppy.gif' alt='$Lang::tr{'download ca certificate'}' title='$Lang::tr{'download ca certificate'}' border='0' />
+               </form>
+           </td>
+           <td align='center'>
+               <form method='post' name='cafrm${key}b' action='$ENV{'SCRIPT_NAME'}'>
+               <input type='image' name='$Lang::tr{'download ca certificate'}' src='/images/floppy.gif' alt='$Lang::tr{'download ca certificate'}' title='$Lang::tr{'download ca certificate'}' />
                <input type='hidden' name='ACTION' value='$Lang::tr{'download ca certificate'}' />
                <input type='hidden' name='KEY' value='$key' />
-           </td></form>
-           <form method='post' name='cafrm${key}c'><td align='center'>
+               </form>
+           </td>
+           <td align='center'>
+               <form method='post' name='cafrm${key}c' action='$ENV{'SCRIPT_NAME'}'>
                <input type='hidden' name='ACTION' value='$Lang::tr{'remove ca certificate'}' />
-               <input type='image'  name='$Lang::tr{'remove ca certificate'}' src='/images/delete.gif' alt='$Lang::tr{'remove ca certificate'}' title='$Lang::tr{'remove ca certificate'}' width='20' height='20' border='0' />
+               <input type='image'  name='$Lang::tr{'remove ca certificate'}' src='/images/delete.gif' alt='$Lang::tr{'remove ca certificate'}' title='$Lang::tr{'remove ca certificate'}' />
                <input type='hidden' name='KEY' value='$key' />
-           </td></form></tr>
+               </form>
+           </td>
+           </tr>
 END
            ;
        }
     }
-
     print "</table>";
 
     # If the file contains entries, print Key to action icons
     if ( -f "${General::swroot}/ca/cacert.pem") {
-    print <<END
-    <table>
-    <tr>
+       print <<END
+       <table><tr>
        <td class='boldbase'>&nbsp; <b>$Lang::tr{'legend'}:</b></td>
        <td>&nbsp; &nbsp; <img src='/images/info.gif' alt='$Lang::tr{'show certificate'}' /></td>
        <td class='base'>$Lang::tr{'show certificate'}</td>
        <td>&nbsp; &nbsp; <img src='/images/floppy.gif' alt='$Lang::tr{'download certificate'}' /></td>
        <td class='base'>$Lang::tr{'download certificate'}</td>
-    </tr>
-    </table>
+       </tr></table>
 END
-    ;
+       ;
     }
+    my $createCA = -f "${General::swroot}/ca/cacert.pem" ? '' : "<tr><td colspan='3'></td><td><input type='submit' name='ACTION' value='$Lang::tr{'generate root/host certificates'}' /></td></tr>";
     print <<END
-    <form method='post' enctype='multipart/form-data'>
+    <hr />
+    <form method='post' enctype='multipart/form-data' action='$ENV{'SCRIPT_NAME'}'>
     <table width='100%' border='0' cellspacing='1' cellpadding='0'>
-    <tr><td class='base' nowrap='nowrap'>$Lang::tr{'ca name'}:</td>
-    <td nowrap='nowrap'><input type='text' name='CA_NAME' value='$cgiparams{'CA_NAME'}' size='15' />
-    <td nowrap='nowrap'><input type='file' name='FH' size='30' /></td>
-    <td nowrap='nowrap'><input type='submit' name='ACTION' value='$Lang::tr{'upload ca certificate'}' /></td>
-    </tr></table></form>
+    $createCA
+    <tr>
+       <td class='base' nowrap='nowrap'>$Lang::tr{'ca name'}:</td>
+       <td nowrap='nowrap'><input type='text' name='CA_NAME' value='$cgiparams{'CA_NAME'}' size='15' /> </td>
+       <td nowrap='nowrap'><input type='file' name='FH' size='30' /></td>
+       <td nowrap='nowrap'><input type='submit' name='ACTION' value='$Lang::tr{'upload ca certificate'}' /></td>
+    </tr>
+    <tr>
+       <td colspan='3'>$Lang::tr{'resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections'}:</td>
+       <td><input type='submit' name='ACTION' value='$Lang::tr{'remove x509'}' /></td>
+    </tr>
+    </table>
+    </form>
 END
     ;
     &Header::closebox();
 
-    print "<div align='center'><form method='post'><input type='submit' name='ACTION' value='$Lang::tr{'reset'}' /></div></form>\n";
     print "$Lang::tr{'this feature has been sponsored by'} : ";
     print "<a href='http://www.seminolegas.com/' target='_blank'>Seminole Canada Gas Company</a>.\n";