From 7a4d6bd5fcb25d8381bc08e20ad6a5c1c80ad78f Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Sat, 16 Apr 2016 15:31:56 -0400 Subject: [PATCH] Revert "ssl-cert.eclass: add libressl support" This reverts commit ad0c2ab2bdbd34f4550e49c56cfd5974d6a2c07a. --- eclass/ssl-cert.eclass | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass index 2538f4dc792f..002de767fa09 100644 --- a/eclass/ssl-cert.eclass +++ b/eclass/ssl-cert.eclass @@ -30,10 +30,10 @@ if [[ "${SSL_DEPS_SKIP}" == "0" ]]; then if [[ "${SSL_CERT_MANDATORY}" == "0" ]]; then - DEPEND="${SSL_CERT_USE}? ( || ( dev-libs/openssl:0= dev-libs/libressl:0= ) )" + DEPEND="${SSL_CERT_USE}? ( dev-libs/openssl:0= )" IUSE="${SSL_CERT_USE}" else - DEPEND="|| ( dev-libs/openssl:0= dev-libs/libressl:0= )" + DEPEND="dev-libs/openssl:0=" fi fi @@ -113,12 +113,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 + openssl genrsa -rand "${SSL_RANDOM}" \ + -out "${base}.key" "${SSL_BITS}" &> /dev/null eend $? return $? -- 2.26.2