Replace "docert" function by dummy, bug 174759.

1 files changed, 5 insertions, 68 deletions

diff --git a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass
index 5283e2f10dd0..feebe18a125e 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.14 2007/12/28 17:51:03 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.15 2008/04/14 06:27:45 ulm Exp $
 #
 # Author: Max Kalika <max@gentoo.org>
 #
@@ -138,74 +138,11 @@ gen_pem() {
 	return $?
 }
 
-# Uses all the private functions above to generate
-# and install the requested certificates
-# Note: This function is deprecated, use install_cert instead
-#
-# Access: public
+# Removed due to bug 174759
 docert() {
-	ewarn "Function \"docert\" is deprecated for security reasons."
-	ewarn "\"install_cert\" should be used instead. See bug #174759."
-
-	if [ $# -lt 1 ] ; then
-		eerror "At least one argument needed"
-		return 1;
-	fi
-
-	# 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
-		# Sanitize and check the requested certificate
-		cert="`/usr/bin/basename "${cert}"`"
-		if [ -z "${cert}" ] ; then
-			ewarn "Invalid certification requested, skipping"
-			continue
-		fi
-
-		# Check for previous existence of generated files
-		for type in key crt pem ; do
-			if [ -e "${D}${INSDESTTREE}/${cert}.${type}" ] ; then
-				ewarn "${D}${INSDESTTREE}/${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`
-		newins "${base}.key" "${cert}.key"
-		fperms 0400 "${INSDESTTREE}/${cert}.key"
-		newins "${base}.csr" "${cert}.csr"
-		fperms 0444 "${INSDESTTREE}/${cert}.csr"
-		newins "${base}.crt" "${cert}.crt"
-		fperms 0444 "${INSDESTTREE}/${cert}.crt"
-		newins "${base}.pem" "${cert}.pem"
-		fperms 0400 "${INSDESTTREE}/${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
+	eerror "Function \"docert\" has been removed for security reasons."
+	eerror "\"install_cert\" should be used instead. See bug 174759."
+	die
 }
 
 # Uses all the private functions above to generate