diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-05-04 22:28:33 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-05-04 22:28:33 +0100 |
commit | a978c074e4272bb901fbe4a10de0a7b2af574f17 (patch) | |
tree | 8c764c1cc0576389ce22abd317bceba71ea5732d /eclass/ssl-cert.eclass | |
parent | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (diff) |
gentoo resync : 04.05.2021
Diffstat (limited to 'eclass/ssl-cert.eclass')
-rw-r--r-- | eclass/ssl-cert.eclass | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass index a774f9b8b9ec..36945be3cd65 100644 --- a/eclass/ssl-cert.eclass +++ b/eclass/ssl-cert.eclass @@ -46,10 +46,10 @@ esac if [[ "${SSL_DEPS_SKIP}" == "0" ]]; then if [[ "${SSL_CERT_MANDATORY}" == "0" ]]; then - SSL_DEPEND="${SSL_CERT_USE}? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) )" + SSL_DEPEND="${SSL_CERT_USE}? ( dev-libs/openssl:0 )" IUSE="${SSL_CERT_USE}" else - SSL_DEPEND="|| ( dev-libs/openssl:0 dev-libs/libressl:0 )" + SSL_DEPEND="dev-libs/openssl:0" fi case "${EAPI}" in @@ -141,12 +141,8 @@ get_base() { gen_key() { local base=$(get_base "$1") ebegin "Generating ${SSL_BITS} bit RSA key${1:+ for CA}" - if openssl version | grep -i libressl > /dev/null; then - openssl genrsa -out "${base}.key" "${SSL_BITS}" &> /dev/null - else openssl genrsa -rand "${SSL_RANDOM}" \ -out "${base}.key" "${SSL_BITS}" &> /dev/null - fi eend $? return $? |