summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2016-04-16 15:31:56 -0400
committerAnthony G. Basile <blueness@gentoo.org>2016-04-16 15:32:14 -0400
commit7a4d6bd5fcb25d8381bc08e20ad6a5c1c80ad78f (patch)
tree42b6101751440fcef89b156e95dc26456db5e101 /eclass
parentssl-cert.eclass: add libressl support (diff)
downloadgentoo-7a4d6bd5fcb25d8381bc08e20ad6a5c1c80ad78f.tar.gz
gentoo-7a4d6bd5fcb25d8381bc08e20ad6a5c1c80ad78f.tar.bz2
gentoo-7a4d6bd5fcb25d8381bc08e20ad6a5c1c80ad78f.zip
Revert "ssl-cert.eclass: add libressl support"
This reverts commit ad0c2ab2bdbd34f4550e49c56cfd5974d6a2c07a.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ssl-cert.eclass12
1 files 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 $?