[git.ipfire.org] IPFire 2.x development tree branch, next, updated. fb245d5ec12977d91670dc04590758a4e173dfed

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. fb245d5ec12977d91670dc04590758a4e173dfed

[git]

[-- Attachment #1: Type: text/plain, Size: 2975 bytes --]

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  fb245d5ec12977d91670dc04590758a4e173dfed (commit)
       via  ab2d15486b4f874ebd832dfce84081031f42b7c5 (commit)
      from  f14de8277aad5e57267d843e63b111e575801ab9 (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 fb245d5ec12977d91670dc04590758a4e173dfed
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Apr 18 23:36:20 2015 +0200

    core90: Add changed vpnmain.cgi

commit ab2d15486b4f874ebd832dfce84081031f42b7c5
Author: Wolfgang Apolinarski <wolfgang.apolinarski(a)uni-due.de>
Date:   Sat Apr 18 15:15:45 2015 +0200

    Added clientAuth to EKU of client certificate. Fixed the comment.

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/90/filelists/files | 1 +
 html/cgi-bin/vpnmain.cgi                 | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/90/filelists/files b/config/rootfiles/core/90/filelists/files
index 5f05eb5..63e7220 100644
--- a/config/rootfiles/core/90/filelists/files
+++ b/config/rootfiles/core/90/filelists/files
@@ -7,6 +7,7 @@ etc/rc.d/rcsysinit.d/S90network-trigger
 srv/web/ipfire/cgi-bin/firewall.cgi
 srv/web/ipfire/cgi-bin/fwhosts.cgi
 srv/web/ipfire/cgi-bin/geoip-block.cgi
+srv/web/ipfire/cgi-bin/vpnmain.cgi
 usr/lib/firewall/firewall-lib.pl
 usr/lib/firewall/rules.pl
 usr/local/bin/xt_geoip_build
diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index b0041ef..4138f4d 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -1673,7 +1673,7 @@ END
 	    (my $city = $cgiparams{'CERT_CITY'}) =~ s/^\s*$/\./;
 	    (my $state = $cgiparams{'CERT_STATE'}) =~ s/^\s*$/\./;
 
-	    # Create the Host certificate request
+	    # Create the Client certificate request
 	    &General::log("ipsec", "Creating a cert...");
 
 	    if (open(STDIN, "-|")) {
@@ -1700,7 +1700,7 @@ END
 		exit (0);
 	    }
 	    
-	    # Sign the host certificate request
+	    # Sign the client certificate request
 	    &General::log("ipsec", "Signing the cert $cgiparams{'NAME'}...");
 
 	    #No easy way for specifying the contain of subjectAltName without writing a config file...
@@ -1709,6 +1709,7 @@ END
 	    basicConstraints=CA:FALSE
 	    nsComment="OpenSSL Generated Certificate"
 	    subjectKeyIdentifier=hash
+	    extendedKeyUsage=clientAuth
 	    authorityKeyIdentifier=keyid,issuer:always
 END
 ;


hooks/post-receive
--
IPFire 2.x development tree