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 568a227bd318c743225d90c8d93559d04ac72a8f (commit) from 63b515dc260f2da9bd413fea254d2e5b634c793a (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 568a227bd318c743225d90c8d93559d04ac72a8f Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Mar 1 19:58:11 2018 +0000
vpnmain.cgi: Fix reading common names from certificates
OpenSSL has changed the output of the subject lines of certificates.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/120/filelists/files | 1 + html/cgi-bin/vpnmain.cgi | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-)
Difference in files: diff --git a/config/rootfiles/core/120/filelists/files b/config/rootfiles/core/120/filelists/files index 180cf0b4d..848d69a97 100644 --- a/config/rootfiles/core/120/filelists/files +++ b/config/rootfiles/core/120/filelists/files @@ -4,6 +4,7 @@ etc/sysctl.conf etc/fcron.daily/openvpn-crl-updater etc/rc.d/init.d/dhcp srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi usr/lib/python2.7/lib-dynload/_hashlib.so usr/lib/python2.7/lib-dynload/_ssl.so var/ipfire/langs diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 2a0351ea0..a52b4d64d 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -199,10 +199,10 @@ sub callssl ($) { sub getCNfromcert ($) { #&General::log("ipsec", "Extracting name from $_[0]..."); my $temp = `/usr/bin/openssl x509 -text -in $_[0]`; - $temp =~ /Subject:.*CN=(.*)[\n]/; + $temp =~ /Subject:.*CN = (.*)[\n]/; $temp = $1; $temp =~ s+/Email+, E+; - $temp =~ s/ ST=/ S=/; + $temp =~ s/ ST = / S = /; $temp =~ s/,//g; $temp =~ s/'//g; return $temp; @@ -216,7 +216,7 @@ sub getsubjectfromcert ($) { $temp =~ /Subject: (.*)[\n]/; $temp = $1; $temp =~ s+/Email+, E+; - $temp =~ s/ ST=/ S=/; + $temp =~ s/ ST = / S = /; return $temp; } ###
hooks/post-receive -- IPFire 2.x development tree