* [PATCH 1/2] ovpnmain.cgi: Fix detection of used DH key lenght.
@ 2021-06-21 15:45 Stefan Schantl
2021-06-21 15:45 ` [PATCH 2/2] ovpnmain.cgi: Call correct system_output() function Stefan Schantl
0 siblings, 1 reply; 3+ messages in thread
From: Stefan Schantl @ 2021-06-21 15:45 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1222 bytes --]
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
html/cgi-bin/ovpnmain.cgi | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 023000dd5..5af1b807e 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
--
2.20.1
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH 2/2] ovpnmain.cgi: Call correct system_output() function.
2021-06-21 15:45 [PATCH 1/2] ovpnmain.cgi: Fix detection of used DH key lenght Stefan Schantl
@ 2021-06-21 15:45 ` Stefan Schantl
2021-06-21 19:45 ` Michael Tremer
0 siblings, 1 reply; 3+ messages in thread
From: Stefan Schantl @ 2021-06-21 15:45 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 773 bytes --]
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
html/cgi-bin/ovpnmain.cgi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 5af1b807e..7a2833ce6 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -5764,7 +5764,7 @@ END
# Adding DH parameter to chart
if (-f "${General::swroot}/ovpn/ca/dh1024.pem") {
- my @dhsubject = &System_output("/usr/bin/openssl", "dhparam", "-text", "-in", "${General::swroot}/ovpn/ca/dh1024.pem");
+ my @dhsubject = &General::system_output("/usr/bin/openssl", "dhparam", "-text", "-in", "${General::swroot}/ovpn/ca/dh1024.pem");
my $dhsubject;
foreach my $line (@dhsubject) {
--
2.20.1
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 2/2] ovpnmain.cgi: Call correct system_output() function.
2021-06-21 15:45 ` [PATCH 2/2] ovpnmain.cgi: Call correct system_output() function Stefan Schantl
@ 2021-06-21 19:45 ` Michael Tremer
0 siblings, 0 replies; 3+ messages in thread
From: Michael Tremer @ 2021-06-21 19:45 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 964 bytes --]
Hello,
This won’t apply and I don’t know why :(
-Michael
> On 21 Jun 2021, at 16:45, Stefan Schantl <stefan.schantl(a)ipfire.org> wrote:
>
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
> html/cgi-bin/ovpnmain.cgi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
> index 5af1b807e..7a2833ce6 100644
> --- a/html/cgi-bin/ovpnmain.cgi
> +++ b/html/cgi-bin/ovpnmain.cgi
> @@ -5764,7 +5764,7 @@ END
>
> # Adding DH parameter to chart
> if (-f "${General::swroot}/ovpn/ca/dh1024.pem") {
> - my @dhsubject = &System_output("/usr/bin/openssl", "dhparam", "-text", "-in", "${General::swroot}/ovpn/ca/dh1024.pem");
> + my @dhsubject = &General::system_output("/usr/bin/openssl", "dhparam", "-text", "-in", "${General::swroot}/ovpn/ca/dh1024.pem");
> my $dhsubject;
>
> foreach my $line (@dhsubject) {
> --
> 2.20.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-06-21 19:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-21 15:45 [PATCH 1/2] ovpnmain.cgi: Fix detection of used DH key lenght Stefan Schantl
2021-06-21 15:45 ` [PATCH 2/2] ovpnmain.cgi: Call correct system_output() function Stefan Schantl
2021-06-21 19:45 ` Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox