[gentoo-commits] repo/gentoo:master commit in: eclass/

[Anthony G. Basile]

commit:     e21b7de461c1ea87cca4423a57dbc6d355611c9b
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 19 00:26:06 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Apr 19 00:26:06 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e21b7de4

ssl-cert.eclass: add libressl support

 eclass/ssl-cert.eclass | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass
index 0db2986..4f573ba 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 )"
+               DEPEND="${SSL_CERT_USE}? ( || ( dev-libs/openssl:0 
dev-libs/libressl:0 ) )"
                IUSE="${SSL_CERT_USE}"
        else
-               DEPEND="dev-libs/openssl:0"
+               DEPEND="|| ( dev-libs/openssl:0 dev-libs/libressl:0 )"
        fi
 fi
 
@@ -113,8 +113,12 @@ get_base() {
 gen_key() {
        local base=$(get_base "$1")
        ebegin "Generating ${SSL_BITS} bit RSA key${1:+ for CA}"
-       openssl genrsa -rand "${SSL_RANDOM}" \
-               -out "${base}.key" "${SSL_BITS}" &> /dev/null
+       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 $?