vpnmain.cgi: Do not use an other DH key exchange in ESP

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / vpnmain.cgi

diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 0d23d0d0917fa8de6f2ac938c27a43cffa48d9b6..94900765f523107efed7327e88e0491c87716436 100644 (file)
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -363,12 +363,12 @@ sub writeipsecfiles {
                        print CONF "\tdpddelay=0\n";
                }
        } else {
-               my $dpddelay = $lconfighash{$key}[30];
+               my $dpddelay = $lconfighash{$key}[31];
                if (!$dpddelay) {
                        $dpddelay = 30;
                }
                print CONF "\tdpddelay=$dpddelay\n";
-               my $dpdtimeout = $lconfighash{$key}[31];
+               my $dpdtimeout = $lconfighash{$key}[30];
                if (!$dpdtimeout) {
                        $dpdtimeout = 120;
                }
@@ -3017,7 +3017,7 @@ sub make_algos($$$$$) {
                                if ($mode eq "ike") {
                                        push(@algo, $int);
 
-                                       if ($grp =~ m/^e(\d+)/) {
+                                       if ($grp =~ m/^e(.*)$/) {
                                                push(@algo, "ecp$1");
                                        } else {
                                                push(@algo, "modp$grp");
@@ -3029,12 +3029,6 @@ sub make_algos($$$$$) {
                                        if (!$is_aead) {
                                                push(@algo, $int);
                                        }
-
-                                       if ($grp =~ m/^e\d+/) {
-                                               push(@algo, $grp);
-                                       } else {
-                                               push(@algo, "modp$grp");
-                                       }
                                }
 
                                push(@algos, join("-", @algo));