mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-07-10 15:45:15 -04:00
app-crypt/clevis: fix for openssl:3
Closes: https://bugs.gentoo.org/887205 Signed-off-by: Julien Roy <julien@jroy.ca>
This commit is contained in:
@@ -26,4 +26,5 @@ BDEPEND=""
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-dracut.patch"
|
||||
"${FILESDIR}/${PN}-meson.patch"
|
||||
"${FILESDIR}/${PN}-openssl.patch"
|
||||
)
|
||||
|
||||
44
app-crypt/clevis/files/clevis-openssl.patch
Normal file
44
app-crypt/clevis/files/clevis-openssl.patch
Normal file
@@ -0,0 +1,44 @@
|
||||
From ee1dfedb9baca107e66a0fec76693c9d479dcfd9 Mon Sep 17 00:00:00 2001
|
||||
From: Sergio Correia <scorreia@redhat.com>
|
||||
Date: Mon, 3 May 2021 22:36:36 -0300
|
||||
Subject: [PATCH] sss: use BN_set_word(x, 0) instead of BN_zero()
|
||||
|
||||
Different OpenSSL versions define BN_zero() differently -- sometimes
|
||||
returning an integer, sometimes as void --, so let's use instead
|
||||
BN_set_word() instead, not to have issues when building with these
|
||||
different versions.
|
||||
---
|
||||
src/pins/sss/sss.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/pins/sss/sss.c b/src/pins/sss/sss.c
|
||||
index a37215d7..7486d6c5 100644
|
||||
--- a/src/pins/sss/sss.c
|
||||
+++ b/src/pins/sss/sss.c
|
||||
@@ -214,7 +214,7 @@ sss_point(const json_t *sss, size_t *len)
|
||||
if (BN_rand_range(xx, pp) <= 0)
|
||||
return NULL;
|
||||
|
||||
- if (BN_zero(yy) <= 0)
|
||||
+ if (BN_set_word(yy, 0) <= 0)
|
||||
return NULL;
|
||||
|
||||
for (size_t i = 0; i < json_array_size(e); i++) {
|
||||
@@ -272,7 +272,7 @@ sss_recover(const json_t *p, size_t npnts, const uint8_t *pnts[])
|
||||
if (!ctx || !pp || !acc || !tmp || !k)
|
||||
return NULL;
|
||||
|
||||
- if (BN_zero(k) <= 0)
|
||||
+ if (BN_set_word(k, 0) <= 0)
|
||||
return NULL;
|
||||
|
||||
len = jose_b64_dec(p, NULL, 0);
|
||||
@@ -303,7 +303,7 @@ sss_recover(const json_t *p, size_t npnts, const uint8_t *pnts[])
|
||||
|
||||
/* acc *= (0 - xi) / (xo - xi) */
|
||||
|
||||
- if (BN_zero(tmp) <= 0)
|
||||
+ if (BN_set_word(tmp, 0) <= 0)
|
||||
return NULL;
|
||||
|
||||
if (BN_mod_sub(tmp, tmp, xi, pp, ctx) <= 0)
|
||||
Reference in New Issue
Block a user