| 1 |
commit: 738b94a40903a77b4970807fc6754231719679c5 |
| 2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 3 10:29:21 2021 +0000 |
| 4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 3 10:29:21 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=738b94a4 |
| 7 |
|
| 8 |
ssl-cert.eclass: remove libressl references |
| 9 |
|
| 10 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/ssl-cert.eclass | 8 ++------ |
| 13 |
1 file changed, 2 insertions(+), 6 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass |
| 16 |
index a774f9b8b9e..36945be3cd6 100644 |
| 17 |
--- a/eclass/ssl-cert.eclass |
| 18 |
+++ b/eclass/ssl-cert.eclass |
| 19 |
@@ -46,10 +46,10 @@ esac |
| 20 |
|
| 21 |
if [[ "${SSL_DEPS_SKIP}" == "0" ]]; then |
| 22 |
if [[ "${SSL_CERT_MANDATORY}" == "0" ]]; then |
| 23 |
- SSL_DEPEND="${SSL_CERT_USE}? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) )" |
| 24 |
+ SSL_DEPEND="${SSL_CERT_USE}? ( dev-libs/openssl:0 )" |
| 25 |
IUSE="${SSL_CERT_USE}" |
| 26 |
else |
| 27 |
- SSL_DEPEND="|| ( dev-libs/openssl:0 dev-libs/libressl:0 )" |
| 28 |
+ SSL_DEPEND="dev-libs/openssl:0" |
| 29 |
fi |
| 30 |
|
| 31 |
case "${EAPI}" in |
| 32 |
@@ -141,12 +141,8 @@ get_base() { |
| 33 |
gen_key() { |
| 34 |
local base=$(get_base "$1") |
| 35 |
ebegin "Generating ${SSL_BITS} bit RSA key${1:+ for CA}" |
| 36 |
- if openssl version | grep -i libressl > /dev/null; then |
| 37 |
- openssl genrsa -out "${base}.key" "${SSL_BITS}" &> /dev/null |
| 38 |
- else |
| 39 |
openssl genrsa -rand "${SSL_RANDOM}" \ |
| 40 |
-out "${base}.key" "${SSL_BITS}" &> /dev/null |
| 41 |
- fi |
| 42 |
eend $? |
| 43 |
|
| 44 |
return $? |
Archives