From mboxrd@z Thu Jan 1 00:00:00 1970 From: Erik Kapfer To: development@lists.ipfire.org Subject: [PATCH] OpenVPN: Fix upload check for root and host certificate Date: Mon, 18 Jun 2018 17:10:37 +0200 Message-ID: <1529334637-31019-1-git-send-email-erik.kapfer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============9084704684711870179==" List-Id: --===============9084704684711870179== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Fix for #11766 . Since the new OpenSSL output differs in the 'Subject' section, the regex need= ed to be adapted. Old and new output should now be possible. Signed-off-by: Erik Kapfer --- 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') { } =20 my $temp =3D `/usr/bin/openssl x509 -text -in ${General::swroot}/ovpn/c= erts/$cgiparams{'NAME'}cert.pem`; - $temp =3D~ /Subject:.*CN=3D(.*)[\n]/; + $temp =3D~ /Subject:.*CN\s?=3D\s?(.*)[\n]/; $temp =3D $1; $temp =3D~ s+/Email+, E+; $temp =3D~ s/ ST=3D/ S=3D/; @@ -4099,7 +4099,7 @@ if ($cgiparams{'TYPE'} eq 'net') { } =20 my $temp =3D `/usr/bin/openssl x509 -text -in ${General::swroot}/ovpn/c= erts/$cgiparams{'NAME'}cert.pem`; - $temp =3D~ /Subject:.*CN=3D(.*)[\n]/; + $temp =3D~ /Subject:.*CN\s?=3D\s?(.*)[\n]/; $temp =3D $1; $temp =3D~ s+/Email+, E+; $temp =3D~ s/ ST=3D/ S=3D/; --=20 2.7.4 --===============9084704684711870179==--