diff options
| author |   Peter Volkov <pva@gentoo.org> | 2010-02-16 14:23:39 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2010-02-16 14:23:39 +0000 |
| commit | 40ed7d8f78904c417ffbade747667f88874c434b (patch) | |
| tree | 3f8c76ba55ff44f8e7a2d40741738828e15e6712 /eclass/ssl-cert.eclass | |
| parent | Remove poppler mask (diff) | |
| download | gentoo-2-40ed7d8f78904c417ffbade747667f88874c434b.tar.gz gentoo-2-40ed7d8f78904c417ffbade747667f88874c434b.tar.bz2 gentoo-2-40ed7d8f78904c417ffbade747667f88874c434b.zip | |
Use different CN for CA and certificate itself, fixes #164601, thank David Sperling for description and James Le Cuirot for fix.
Diffstat (limited to 'eclass/ssl-cert.eclass')
| -rw-r--r-- | eclass/ssl-cert.eclass | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass index 47ff67be12cc..ebd3df7f6186 100644 --- a/eclass/ssl-cert.eclass +++ b/eclass/ssl-cert.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.17 2009/09/16 20:11:17 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.18 2010/02/16 14:23:39 pva Exp $ # # @ECLASS: ssl-cert.eclass # @MAINTAINER: @@ -48,7 +48,7 @@ gen_cnf() { echo "01" > "${SSL_SERIAL}" # Create the config file - ebegin "Generating OpenSSL configuration" + ebegin "Generating OpenSSL configuration${1:+ for CA}" cat <<-EOF > "${SSL_CONF}" [ req ] prompt = no @@ -60,7 +60,7 @@ gen_cnf() { L = ${SSL_LOCALITY} O = ${SSL_ORGANIZATION} OU = ${SSL_UNIT} - CN = ${SSL_COMMONNAME} + CN = ${SSL_COMMONNAME}${1:+ CA} emailAddress = ${SSL_EMAIL} EOF eend $? @@ -191,16 +191,16 @@ install_cert() { return 1 ;; esac - # Initialize configuration - gen_cnf || return 1 - echo - - # Generate a CA environment + # Generate a CA environment #164601 + gen_cnf 1 || return 1 gen_key 1 || return 1 gen_csr 1 || return 1 gen_crt 1 || return 1 echo + gen_cnf || return 1 + echo + local count=0 for cert in "$@" ; do # Check the requested certificate |