Re: [PATCH] OpenVPN: Fix upload check for root and host certificate

Merged.

We are on fire today!

On Mon, 2018-06-18 at 17:10 +0200, Erik Kapfer wrote:

Fix for #11766 . Since the new OpenSSL output differs in the 'Subject' section, the regex needed to be adapted. Old and new output should now be possible.

Signed-off-by: Erik Kapfer erik.kapfer@ipfire.org

html/cgi-bin/ovpnmain.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index b3122a4..947cbe9 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -4045,7 +4045,7 @@ if ($cgiparams{'TYPE'} eq 'net') { }

   my $temp = `/usr/bin/openssl x509 -text -in

${General::swroot}/ovpn/certs/$cgiparams{'NAME'}cert.pem`;

•    $temp =~ /Subject:.*CN=(.*)[\n]/;
  

•    $temp =~ /Subject:.*CN\s?=\s?(.*)[\n]/;
   $temp = $1;
   $temp =~ s+/Email+, E+;
   $temp =~ s/ ST=/ S=/;
  

@@ -4099,7 +4099,7 @@ if ($cgiparams{'TYPE'} eq 'net') { }

   my $temp = `/usr/bin/openssl x509 -text -in

${General::swroot}/ovpn/certs/$cgiparams{'NAME'}cert.pem`;

•    $temp =~ /Subject:.*CN=(.*)[\n]/;
  

•    $temp =~ /Subject:.*CN\s?=\s?(.*)[\n]/;
   $temp = $1;
   $temp =~ s+/Email+, E+;
   $temp =~ s/ ST=/ S=/;