Revert "ssl-cert.eclass: add libressl support"
authorAnthony G. Basile <blueness@gentoo.org>
Sat, 16 Apr 2016 19:31:56 +0000 (15:31 -0400)
committerAnthony G. Basile <blueness@gentoo.org>
Sat, 16 Apr 2016 19:32:14 +0000 (15:32 -0400)
This reverts commit ad0c2ab2bdbd34f4550e49c56cfd5974d6a2c07a.

eclass/ssl-cert.eclass

index 2538f4dc792fadbc77166c2efe7afadce48c41b3..002de767fa0924395bdccd66a09cf29b4befceb8 100644 (file)
 
 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 $?