[gentoo-commits] gentoo-x86 commit in eclass: ssl-cert.eclass

[Ulrich Mueller (ulm)]

ulm         07/12/07 22:41:04

  Modified:             ssl-cert.eclass
  Log:
  New function install_cert, replaces docert. Bug #174759.

Revision  Changes    Path
1.10                 eclass/ssl-cert.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ssl-cert.eclass?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ssl-cert.eclass?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/ssl-cert.eclass?r1=1.9&r2=1.10

Index: ssl-cert.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ssl-cert.eclass	11 Jul 2005 15:08:06 -0000	1.9
+++ ssl-cert.eclass	7 Dec 2007 22:41:04 -0000	1.10
@@ -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.9 2005/07/11 15:08:06 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.10 2007/12/07 22:41:04 ulm Exp $
 #
 # Author: Max Kalika <max@g.o>
 #
@@ -140,6 +140,7 @@
 
 # Uses all the private functions above to generate
 # and install the requested certificates
+# Note: This function is deprecated, use install_cert instead
 #
 # Access: public
 docert() {
@@ -203,3 +204,71 @@
 		ewarn "Some requested certificates were not generated"
 	fi
 }
+
+# Uses all the private functions above to generate
+# and install the requested certificates
+#
+# Access: public
+install_cert() {
+	if [ $# -lt 1 ] ; then
+		eerror "At least one argument needed"
+		return 1;
+	fi
+
+	case ${EBUILD_PHASE} in
+		unpack|compile|test|install)
+			eerror "install_cert cannot be called in ${EBUILD_PHASE}"
+			return 1 ;;
+	esac
+
+	# Initialize configuration
+	gen_cnf || return 1
+	echo
+
+	# Generate a CA environment
+	gen_key 1 || return 1
+	gen_csr 1 || return 1
+	gen_crt 1 || return 1
+	echo
+
+	local count=0
+	for cert in "$@" ; do
+		# Check the requested certificate
+		if [ -z "${cert##*/}" ] ; then
+			ewarn "Invalid certification requested, skipping"
+			continue
+		fi
+
+		# Check for previous existence of generated files
+		for type in key csr crt pem ; do
+			if [ -e "${ROOT}${cert}.${type}" ] ; then
+				ewarn "${ROOT}${cert}.${type}: exists, skipping"
+				continue 2
+			fi
+		done
+
+		# Generate the requested files
+		gen_key || continue
+		gen_csr || continue
+		gen_crt || continue
+		gen_pem || continue
+		echo
+
+		# Install the generated files and set sane permissions
+		local base=$(get_base)
+		install -d "${ROOT}${cert%/*}"
+		install -m0400 "${base}.key" "${ROOT}${cert}.key"
+		install -m0444 "${base}.csr" "${ROOT}${cert}.csr"
+		install -m0444 "${base}.crt" "${ROOT}${cert}.crt"
+		install -m0400 "${base}.pem" "${ROOT}${cert}.pem"
+		count=$((${count}+1))
+	done
+
+	# Resulting status
+	if [ ! ${count} ] ; then
+		eerror "No certificates were generated"
+		return 1
+	elif [ ${count} != ${#} ] ; then
+		ewarn "Some requested certificates were not generated"
+	fi
+}



-- 
gentoo-commits@g.o mailing list