Skip to content

Commit

Permalink
Revert "ssl-cert.eclass: add libressl support"
Browse files Browse the repository at this point in the history
This reverts commit ad0c2ab.
  • Loading branch information
blueness committed Apr 16, 2016
1 parent ad0c2ab commit 7a4d6bd
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions eclass/ssl-cert.eclass
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 $?
Expand Down

0 comments on commit 7a4d6bd

Please sign in to comment.