From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B08D213835A for ; Wed, 31 Mar 2021 02:04:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E754AE0844; Wed, 31 Mar 2021 02:04:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CE267E083E for ; Wed, 31 Mar 2021 02:04:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3CABB340C04 for ; Wed, 31 Mar 2021 02:04:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6AC89648 for ; Wed, 31 Mar 2021 02:04:23 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1617156171.6ac96d02b89753a55881da303e64e08ea9774f50.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/ssl-cert.eclass X-VCS-Directories: eclass/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 6ac96d02b89753a55881da303e64e08ea9774f50 X-VCS-Branch: master Date: Wed, 31 Mar 2021 02:04:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f8b5f149-ab6d-461e-ae0d-ba9869b51bca X-Archives-Hash: fdd93422e35b20c070fce8e2194be83f commit: 6ac96d02b89753a55881da303e64e08ea9774f50 Author: Sam James gentoo org> AuthorDate: Wed Mar 31 00:51:25 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Mar 31 02:02:51 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ac96d02 ssl-cert.eclass: mark various functions as @INTERNAL Signed-off-by: Sam James gentoo.org> eclass/ssl-cert.eclass | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass index f2be814470d..a774f9b8b9e 100644 --- a/eclass/ssl-cert.eclass +++ b/eclass/ssl-cert.eclass @@ -65,12 +65,12 @@ if [[ "${SSL_DEPS_SKIP}" == "0" ]]; then fi # @FUNCTION: gen_cnf +# @INTERNAL # @USAGE: # @DESCRIPTION: # Initializes variables and generates the needed # OpenSSL configuration file and a CA serial file # -# Access: private gen_cnf() { # Location of the config file SSL_CONF="${T}/${$}ssl.cnf" @@ -117,13 +117,13 @@ gen_cnf() { } # @FUNCTION: get_base +# @INTERNAL # @USAGE: [if_ca] # @RETURN: # @DESCRIPTION: # Simple function to determine whether we're creating # a CA (which should only be done once) or final part # -# Access: private get_base() { if [ "${1}" ] ; then echo "${T}/${$}ca" @@ -133,11 +133,11 @@ get_base() { } # @FUNCTION: gen_key +# @INTERNAL # @USAGE: # @DESCRIPTION: # Generates an RSA key # -# Access: private gen_key() { local base=$(get_base "$1") ebegin "Generating ${SSL_BITS} bit RSA key${1:+ for CA}" @@ -153,12 +153,12 @@ gen_key() { } # @FUNCTION: gen_csr +# @INTERNAL # @USAGE: # @DESCRIPTION: # Generates a certificate signing request using # the key made by gen_key() # -# Access: private gen_csr() { local base=$(get_base "$1") ebegin "Generating Certificate Signing Request${1:+ for CA}" @@ -170,6 +170,7 @@ gen_csr() { } # @FUNCTION: gen_crt +# @INTERNAL # @USAGE: # @DESCRIPTION: # Generates either a self-signed CA certificate using @@ -177,7 +178,6 @@ gen_csr() { # a signed server certificate using the CA cert previously # created by gen_crt() # -# Access: private gen_crt() { local base=$(get_base "$1") if [ "${1}" ] ; then @@ -200,12 +200,12 @@ gen_crt() { } # @FUNCTION: gen_pem +# @INTERNAL # @USAGE: # @DESCRIPTION: # Generates a PEM file by concatinating the key # and cert file created by gen_key() and gen_cert() # -# Access: private gen_pem() { local base=$(get_base "$1") ebegin "Generating PEM Certificate" @@ -224,7 +224,6 @@ gen_pem() { # # Example: "install_cert /foo/bar" installs ${ROOT}/foo/bar.{key,csr,crt,pem} # -# Access: public install_cert() { if [ $# -lt 1 ] ; then eerror "At least one argument needed"