From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] OpenVPN: Fix upload check for root and host certificate
Date: Mon, 18 Jun 2018 16:46:37 +0100
Message-ID: <baf68c3b14207a611cbe0f018900d8efc0097c24.camel@ipfire.org>
In-Reply-To: <1529334637-31019-1-git-send-email-erik.kapfer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3481800865225463292=="
List-Id: <development.lists.ipfire.org>

--===============3481800865225463292==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit

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(a)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=/;

--===============3481800865225463292==--