[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 27ca856f728c840d90130abd41576ef57e65eae5

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 27ca856f728c840d90130abd41576ef57e65eae5

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 5102 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  27ca856f728c840d90130abd41576ef57e65eae5 (commit)
       via  05de8ec3c85950387f1e0da7f4074f7b2b207b3a (commit)
       via  f56040805375784a7c695d7324365c115262eb72 (commit)
       via  016859ffe4910a0b7b3a71875d67c31aab369a1b (commit)
       via  8f73d902e34466ca85023e2cddaad68ea2cb91f5 (commit)
      from  556edb5adc8c37d07acf141a14d10b562a9cab73 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 27ca856f728c840d90130abd41576ef57e65eae5
Merge: f56040805 05de8ec3c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Jun 21 19:41:25 2021 +0000

    Merge branch 'core157'

commit f56040805375784a7c695d7324365c115262eb72
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Mon Jun 21 17:45:05 2021 +0200

    ovpnmain.cgi: Fix detection of used DH key lenght.
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 016859ffe4910a0b7b3a71875d67c31aab369a1b
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Mon Jun 21 14:44:58 2021 +0200

    vpnmain.cgi: Fix typo.
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 8f73d902e34466ca85023e2cddaad68ea2cb91f5
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Mon Jun 21 14:44:57 2021 +0200

    pppsetup.cgi: Fix typos.
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 .../rootfiles/{oldcore/100 => core/158}/filelists/lua   |  0
 html/cgi-bin/ovpnmain.cgi                               | 17 +++++++++++++----
 html/cgi-bin/pppsetup.cgi                               |  6 +++---
 html/cgi-bin/vpnmain.cgi                                |  2 +-
 4 files changed, 17 insertions(+), 8 deletions(-)
 copy config/rootfiles/{oldcore/100 => core/158}/filelists/lua (100%)

Difference in files:
diff --git a/config/rootfiles/core/158/filelists/lua b/config/rootfiles/core/158/filelists/lua
new file mode 120000
index 000000000..951f661c5
--- /dev/null
+++ b/config/rootfiles/core/158/filelists/lua
@@ -0,0 +1 @@
+../../../common/lua
\ No newline at end of file
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 077f5ab6c..d9e26de2f 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -221,14 +221,23 @@ sub pkiconfigcheck
 	# Warning if DH parameter is 1024 bit
 	if (-f "${General::swroot}/ovpn/ca/$cgiparams{'DH_NAME'}") {
 		my @dhparameter = &General::system_output("/usr/bin/openssl", "dhparam", "-text", "-in", "${General::swroot}/ovpn/ca/$cgiparams{'DH_NAME'}");
+		my $dhbit;
 
+		# Loop through the output and search for the DH bit lenght.
 		foreach my $line (@dhparameter) {
-			my @dhbit = ($line =~ /(\d+)/);
-			if ($1 < 2048) {
-				$cryptoerror = "$Lang::tr{'ovpn error dh'}";
-				goto CRYPTO_ERROR;
+			if ($line =~ (/(\d+)/)) {
+				# Assign match to dhbit value.
+				$dhbit = $1;
+
+				last;
 			}
 		}
+
+		# Check if the used key lenght is at least 2048 bit.
+		if ($dhbit < 2048) {
+			$cryptoerror = "$Lang::tr{'ovpn error dh'}";
+			goto CRYPTO_ERROR;
+		}
 	}
 
 	# Warning if md5 is in usage
diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi
index 519a062bc..beb7fabc7 100644
--- a/html/cgi-bin/pppsetup.cgi
+++ b/html/cgi-bin/pppsetup.cgi
@@ -180,8 +180,8 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'})
                 goto ERROR; }
 
 	# Read-in ddns config file, to check if at least one provider is enabled.
-	open(FILE, "${General::swroot}/ddns/config)";
-	my @ddns_config = <FILE>
+	open(FILE, "${General::swroot}/ddns/config");
+	my @ddns_config = <FILE>;
 	close(FILE);
 
         if( $pppsettings{'RECONNECTION'} eq 'dialondemand' && grep(/on/, @ddns_config) ) {
@@ -529,7 +529,7 @@ END
 
 # Read-in atm devices from proc.
 open(PROC, "/proc/net/atm/devices");
-my @patm_devices = <PROC>;
+my @atm_devices = <PROC>;
 close(PROC);
 
 my $atmdev = grep(/0/, @atm_devices);
diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 79a2943d4..8f13cf51f 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -1260,7 +1260,7 @@ END
 	open(FILE, "${General::swroot}/certs/$confighash{$cgiparams{'KEY'}}[1].p12");
 	my @p12 = <FILE>;
 	close(FILE);
-	print "@file";
+	print "@p12";
 
 	exit (0);
 


hooks/post-receive
--
IPFire 2.x development tree