[gentoo-commits] repo/gentoo:master commit in: eclass/

[Mike Gilbert]

commit:     511c5d9c5f92f4b2994f11435e3936b7286318be
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun May 25 16:49:21 2025 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue May 27 18:14:48 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=511c5d9c

ssl-cert.eclass: use edob for openssl calls

Bug: https://bugs.gentoo.org/956442
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 eclass/ssl-cert.eclass | 40 ++++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass
index 240f9f12cc91..b4f5f921c119 100644
--- a/eclass/ssl-cert.eclass
+++ b/eclass/ssl-cert.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: ssl-cert.eclass
@@ -22,6 +22,8 @@ esac
 if [[ -z ${_SSL_CERT_ECLASS} ]]; then
 _SSL_CERT_ECLASS=1
 
+inherit edo
+
 # @ECLASS_VARIABLE: SSL_CERT_MANDATORY
 # @PRE_INHERIT
 # @DESCRIPTION:
@@ -125,11 +127,9 @@ get_base() {
 #
 gen_key() {
        local base=$(get_base "$1")
-       ebegin "Generating ${SSL_BITS} bit RSA key${1:+ for CA}"
+       nonfatal edob -m "Generating ${SSL_BITS} bit RSA key${1:+ for CA}" \
                openssl genrsa -rand "${SSL_RANDOM}" \
-                       -out "${base}.key" "${SSL_BITS}" &> /dev/null
-       eend $?
-
+                       -out "${base}.key" "${SSL_BITS}"
        return $?
 }
 
@@ -142,11 +142,9 @@ gen_key() {
 #
 gen_csr() {
        local base=$(get_base "$1")
-       ebegin "Generating Certificate Signing Request${1:+ for CA}"
-       openssl req -config "${SSL_CONF}" -new \
-               -key "${base}.key" -out "${base}.csr" &>/dev/null
-       eend $?
-
+       nonfatal edob -m "Generating Certificate Signing Request${1:+ for CA}" \
+               openssl req -config "${SSL_CONF}" -new \
+                       -key "${base}.key" -out "${base}.csr"
        return $?
 }
 
@@ -162,21 +160,19 @@ gen_csr() {
 gen_crt() {
        local base=$(get_base "$1")
        if [ "${1}" ] ; then
-               ebegin "Generating self-signed X.509 Certificate for CA"
-               openssl x509 -extfile "${SSL_CONF}" \
-                       -${SSL_MD} \
-                       -days ${SSL_DAYS} -req -signkey "${base}.key" \
-                       -in "${base}.csr" -out "${base}.crt" &>/dev/null
+               nonfatal edob -m "Generating self-signed X.509 Certificate for 
CA" \
+                       openssl x509 -extfile "${SSL_CONF}" \
+                               -${SSL_MD} \
+                               -days ${SSL_DAYS} -req -signkey "${base}.key" \
+                               -in "${base}.csr" -out "${base}.crt"
        else
                local ca=$(get_base 1)
-               ebegin "Generating authority-signed X.509 Certificate"
-               openssl x509 -extfile "${SSL_CONF}" \
-                       -days ${SSL_DAYS} -req -CAserial "${SSL_SERIAL}" \
-                       -CAkey "${ca}.key" -CA "${ca}.crt" -${SSL_MD} \
-                       -in "${base}.csr" -out "${base}.crt" &>/dev/null
+               nonfatal edob -m "Generating authority-signed X.509 
Certificate" \
+                       openssl x509 -extfile "${SSL_CONF}" \
+                               -days ${SSL_DAYS} -req -CAserial 
"${SSL_SERIAL}" \
+                               -CAkey "${ca}.key" -CA "${ca}.crt" -${SSL_MD} \
+                               -in "${base}.csr" -out "${base}.crt"
        fi
-       eend $?
-
        return $?
 }