[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 17ad30b9e2aaca5b90df98ceee9ac68a9c68e238 - IPFire-SCM

20 Dec 2024

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, next has been updated
       via  17ad30b9e2aaca5b90df98ceee9ac68a9c68e238 (commit)
       via  754451021b7d6fa6aa812b1ac2f017fb118bd383 (commit)
      from  32fba6d49bcb06b270e08344164e5bb1b55331c7 (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 17ad30b9e2aaca5b90df98ceee9ac68a9c68e238
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Fri Dec 20 07:51:30 2024 +0100
Revert "en.pl: Update the wording for the check on the CA Name for upload"
This reverts commit f32ca6cd79124c4fcfc722a2238c1accbfb1a9ff.
commit 754451021b7d6fa6aa812b1ac2f017fb118bd383
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Fri Dec 20 07:51:05 2024 +0100
Revert "vpnmain.cgi: Fix for 2nd part of bug10595"
This reverts commit 7b29acfbb597b89837dcbe1b91ef6ef4352f28a6.
-----------------------------------------------------------------------
Summary of changes:
 doc/language_issues.de   | 1 -
 doc/language_issues.en   | 1 -
 doc/language_issues.es   | 1 -
 doc/language_issues.fr   | 1 -
 doc/language_issues.it   | 1 -
 doc/language_issues.nl   | 1 -
 doc/language_issues.pl   | 1 -
 doc/language_issues.ru   | 1 -
 doc/language_issues.tr   | 1 -
 doc/language_missings    | 8 --------
 html/cgi-bin/vpnmain.cgi | 8 ++++----
 langs/en/cgi-bin/en.pl   | 1 -
 12 files changed, 4 insertions(+), 22 deletions(-)
 mode change 100644 => 100755 html/cgi-bin/vpnmain.cgi
Difference in files:

diff --git a/doc/language_issues.de b/doc/language_issues.de
index f83e1e775..7883bef76 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -930,7 +930,6 @@ WARNING: untranslated string: access point name = Access Point Name
 WARNING: untranslated string: access point name is invalid = Access Point Name is invalid
 WARNING: untranslated string: access point name is required = Access Point Name is required
 WARNING: untranslated string: aliases default interface = - Default Interface -
-WARNING: untranslated string: ca name must only contain characters or spaces = CA Name must only contain characters or spaces.
 WARNING: untranslated string: cake profile bridged-llcsnap 32 = Bridged LLC SNAP (32 bytes)
 WARNING: untranslated string: cake profile bridged-ptm 19 = Bridged PTM (19 bytes)
 WARNING: untranslated string: cake profile bridged-vcmux 24 = Bridged VC-MUX (24 bytes)
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 2a14bd370..3f1626b68 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -360,7 +360,6 @@ WARNING: untranslated string: bytes received = Bytes Received
 WARNING: untranslated string: bytes sent = Bytes Sent
 WARNING: untranslated string: ca certificate = CA Certificate
 WARNING: untranslated string: ca name = CA name
-WARNING: untranslated string: ca name must only contain characters or spaces = CA Name must only contain characters or spaces.
 WARNING: untranslated string: cached = cached
 WARNING: untranslated string: cached memory = Cached Memory  
 WARNING: untranslated string: cached swap = Cached Swap
diff --git a/doc/language_issues.es b/doc/language_issues.es
index bfbd4a012..0a89279d5 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -1003,7 +1003,6 @@ WARNING: untranslated string: access point name = Access Point Name
 WARNING: untranslated string: access point name is invalid = Access Point Name is invalid
 WARNING: untranslated string: access point name is required = Access Point Name is required
 WARNING: untranslated string: bypassed = Bypassed
-WARNING: untranslated string: ca name must only contain characters or spaces = CA Name must only contain characters or spaces.
 WARNING: untranslated string: cpu frequency = CPU frequency
 WARNING: untranslated string: data transfer = Data Transfer
 WARNING: untranslated string: dhcp fixed ip address in dynamic range = Fixed IP Address in dynamic range
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index e1721e70e..7f9349bc0 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -968,7 +968,6 @@ WARNING: translation string unused: zoneconf val vlan tag assignment error
 WARNING: translation string unused: zoneconf val vlan tag range error
 WARNING: translation string unused: zoneconf val zoneslave amount error
 WARNING: untranslated string: bypassed = Bypassed
-WARNING: untranslated string: ca name must only contain characters or spaces = CA Name must only contain characters or spaces.
 WARNING: untranslated string: core notice 3 = available.
 WARNING: untranslated string: data transfer = Data Transfer
 WARNING: untranslated string: enable disable client = unknown string
diff --git a/doc/language_issues.it b/doc/language_issues.it
index d21751c68..5870e2bc7 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -970,7 +970,6 @@ WARNING: untranslated string: available = available
 WARNING: untranslated string: block = Block
 WARNING: untranslated string: broken = Broken
 WARNING: untranslated string: bypassed = Bypassed
-WARNING: untranslated string: ca name must only contain characters or spaces = CA Name must only contain characters or spaces.
 WARNING: untranslated string: cake profile bridged-llcsnap 32 = Bridged LLC SNAP (32 bytes)
 WARNING: untranslated string: cake profile bridged-ptm 19 = Bridged PTM (19 bytes)
 WARNING: untranslated string: cake profile bridged-vcmux 24 = Bridged VC-MUX (24 bytes)
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index b9718913f..88493d1d9 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -972,7 +972,6 @@ WARNING: untranslated string: available = available
 WARNING: untranslated string: block = Block
 WARNING: untranslated string: broken = Broken
 WARNING: untranslated string: bypassed = Bypassed
-WARNING: untranslated string: ca name must only contain characters or spaces = CA Name must only contain characters or spaces.
 WARNING: untranslated string: cake profile bridged-llcsnap 32 = Bridged LLC SNAP (32 bytes)
 WARNING: untranslated string: cake profile bridged-ptm 19 = Bridged PTM (19 bytes)
 WARNING: untranslated string: cake profile bridged-vcmux 24 = Bridged VC-MUX (24 bytes)
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index b15e1bf63..5f3806102 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -897,7 +897,6 @@ WARNING: untranslated string: bit = bit
 WARNING: untranslated string: block = Block
 WARNING: untranslated string: broken = Broken
 WARNING: untranslated string: bypassed = Bypassed
-WARNING: untranslated string: ca name must only contain characters or spaces = CA Name must only contain characters or spaces.
 WARNING: untranslated string: cake profile bridged-llcsnap 32 = Bridged LLC SNAP (32 bytes)
 WARNING: untranslated string: cake profile bridged-ptm 19 = Bridged PTM (19 bytes)
 WARNING: untranslated string: cake profile bridged-vcmux 24 = Bridged VC-MUX (24 bytes)
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index c4c33bf32..8891ce20e 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -892,7 +892,6 @@ WARNING: untranslated string: bit = bit
 WARNING: untranslated string: block = Block
 WARNING: untranslated string: broken = Broken
 WARNING: untranslated string: bypassed = Bypassed
-WARNING: untranslated string: ca name must only contain characters or spaces = CA Name must only contain characters or spaces.
 WARNING: untranslated string: cake profile bridged-llcsnap 32 = Bridged LLC SNAP (32 bytes)
 WARNING: untranslated string: cake profile bridged-ptm 19 = Bridged PTM (19 bytes)
 WARNING: untranslated string: cake profile bridged-vcmux 24 = Bridged VC-MUX (24 bytes)
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 56897ca62..c0cb2703a 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -957,7 +957,6 @@ WARNING: untranslated string: autonomous system = Autonomous System
 WARNING: untranslated string: available = available
 WARNING: untranslated string: broken = Broken
 WARNING: untranslated string: bypassed = Bypassed
-WARNING: untranslated string: ca name must only contain characters or spaces = CA Name must only contain characters or spaces.
 WARNING: untranslated string: cake profile bridged-llcsnap 32 = Bridged LLC SNAP (32 bytes)
 WARNING: untranslated string: cake profile bridged-ptm 19 = Bridged PTM (19 bytes)
 WARNING: untranslated string: cake profile bridged-vcmux 24 = Bridged VC-MUX (24 bytes)
diff --git a/doc/language_missings b/doc/language_missings
index f94e7f174..2a2333d94 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -39,7 +39,6 @@
 < cake profile pppoe-ptm 27
 < cake profile pppoe-vcmux 32
 < cake profile raw 0
-< ca name must only contain characters or spaces
 < Captive heading terms
 < Captive heading voucher
 < Captive invalid coupon
@@ -123,7 +122,6 @@
 < access point name is required
 < addon
 < bypassed
-< ca name must only contain characters or spaces
 < cpu frequency
 < data transfer
 < dhcp fixed ip address in dynamic range
@@ -181,7 +179,6 @@
 < bewan adsl pci st
 < bewan adsl usb
 < bypassed
-< ca name must only contain characters or spaces
 < data transfer
 < extrahd because it it outside the allowed mount path
 < fwdfw syn flood protection
@@ -264,7 +261,6 @@
 < cake profile pppoe-ptm 27
 < cake profile pppoe-vcmux 32
 < cake profile raw 0
-< ca name must only contain characters or spaces
 < Captive
 < Captive 1day
 < Captive 1month
@@ -808,7 +804,6 @@
 < cake profile pppoe-ptm 27
 < cake profile pppoe-vcmux 32
 < cake profile raw 0
-< ca name must only contain characters or spaces
 < capabilities
 < Captive
 < Captive 1day
@@ -1392,7 +1387,6 @@
 < cake profile pppoe-ptm 27
 < cake profile pppoe-vcmux 32
 < cake profile raw 0
-< ca name must only contain characters or spaces
 < capabilities
 < Captive
 < Captive 1day
@@ -2409,7 +2403,6 @@
 < cake profile pppoe-ptm 27
 < cake profile pppoe-vcmux 32
 < cake profile raw 0
-< ca name must only contain characters or spaces
 < capabilities
 < Captive
 < Captive 1day
@@ -3407,7 +3400,6 @@
 < cake profile pppoe-ptm 27
 < cake profile pppoe-vcmux 32
 < cake profile raw 0
-< ca name must only contain characters or spaces
 < Captive delete logo
 < core update
 < cpu frequency
diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
old mode 100644
new mode 100755
index 694eeed76..3541aaa29
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -245,7 +245,7 @@ sub callssl ($) {
 ###
 sub getCNfromcert ($) {
    #&General::log("ipsec", "Extracting name from $_[0]...");
-	my $temp = `/usr/bin/openssl x509 -text -in '$_[0]'`;
+	my $temp = `/usr/bin/openssl x509 -text -in $_[0]`;
    $temp =~ /Subject:.*CN\s*=\s*(.*)[\n]/;
    $temp = $1;
    $temp =~ s+/Email+, E+;
@@ -259,7 +259,7 @@ sub getCNfromcert ($) {
 ###
 sub getsubjectfromcert ($) {
    #&General::log("ipsec", "Extracting subject from $_[0]...");
-	my $temp = `/usr/bin/openssl x509 -text -in '$_[0]'`;
+	my $temp = `/usr/bin/openssl x509 -text -in $_[0]`;
    $temp =~ /Subject: (.*)[\n]/;
    $temp = $1;
    $temp =~ s+/Email+, E+;
@@ -644,8 +644,8 @@ END
 } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'upload ca certificate'}) {
    &General::readhasharray("${General::swroot}/vpn/caconfig", %cahash);
-	if ($cgiparams{'CA_NAME'} !~ /^[a-zA-Z0-9 ]*$/) {
-		$errormessage = $Lang::tr{'ca name must only contain characters or spaces'};
+	if ($cgiparams{'CA_NAME'} !~ /^[a-zA-Z0-9]+$/) {
+		$errormessage = $Lang::tr{'name must only contain characters'};
    	goto UPLOADCA_ERROR;
    }
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 7576fbd0b..5c8da52be 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -530,7 +530,6 @@
 'bytes sent' => 'Bytes Sent',
 'ca certificate' => 'CA Certificate',
 'ca name' => 'CA name',
-'ca name must only contain characters or spaces' => 'CA Name must only contain characters or spaces.',
 'cache management' => 'Cache management',
 'cache size' => 'Cache size (MB):',
 'cached' => 'cached',
hooks/post-receive
--
IPFire 2.x development tree

    