]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
add missing check for Curve25519 in vpnmain.cgi
authorPeter Müller <peter.mueller@link38.eu>
Sun, 8 Oct 2017 18:41:10 +0000 (20:41 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 9 Oct 2017 13:54:37 +0000 (14:54 +0100)
This fixes bug #11501 which causes IPsec connections to crash if
Curve25519 has been enabled.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
html/cgi-bin/vpnmain.cgi

index f9508b53de2fe4f9f5cf8821e30b7d877efb6dc3..c17ebd6aa29ff832e66bb8d010bad0cca3003d4d 100644 (file)
@@ -3125,6 +3125,8 @@ sub make_algos($$$$$) {
 
                                        if ($grp =~ m/^e(.*)$/) {
                                                push(@algo, "ecp$1");
+                                       } elsif ($grp =~ m/curve25519/) {
+                                               push(@algo, "$grp");
                                        } else {
                                                push(@algo, "modp$grp");
                                        }
@@ -3140,6 +3142,8 @@ sub make_algos($$$$$) {
                                                # noop
                                        } elsif ($grp =~ m/^e(.*)$/) {
                                                push(@algo, "ecp$1");
+                                       } elsif ($grp =~ m/curve25519/) {
+                                               push(@algo, "$grp");
                                        } else {
                                                push(@algo, "modp$grp");
                                        }