* [PATCH] sign-file: fix build error in sign-file.c with libressl
@ 2016-12-22 13:38 John Crispin
2017-01-12 12:54 ` David Howells
0 siblings, 1 reply; 2+ messages in thread
From: John Crispin @ 2016-12-22 13:38 UTC (permalink / raw)
To: David Howells, David Woodhouse
Cc: keyrings, linux-kernel, Felix Fietkau, John Crispin
From: Felix Fietkau <nbd@nbd.name>
The sign-file tool failed to build against libressl. Fix this by extending
the PKCS7 check and thus making sign-file link against libressl without an
error.
Signed-off-by: John Crispin <john@phrozen.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
scripts/sign-file.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/sign-file.c b/scripts/sign-file.c
index 53af6dc..7307fd4 100755
--- a/scripts/sign-file.c
+++ b/scripts/sign-file.c
@@ -41,7 +41,9 @@
* signing with anything other than SHA1 - so we're stuck with that if such is
* the case.
*/
-#if OPENSSL_VERSION_NUMBER < 0x10000000L || defined(OPENSSL_NO_CMS)
+#if defined(LIBRESSL_VERSION_NUMBER) || \
+ OPENSSL_VERSION_NUMBER < 0x10000000L || \
+ defined(OPENSSL_NO_CMS)
#define USE_PKCS7
#endif
#ifndef USE_PKCS7
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] sign-file: fix build error in sign-file.c with libressl
2016-12-22 13:38 [PATCH] sign-file: fix build error in sign-file.c with libressl John Crispin
@ 2017-01-12 12:54 ` David Howells
0 siblings, 0 replies; 2+ messages in thread
From: David Howells @ 2017-01-12 12:54 UTC (permalink / raw)
To: John Crispin
Cc: dhowells, David Woodhouse, keyrings, linux-kernel, Felix Fietkau
John Crispin <john@phrozen.org> wrote:
> From: Felix Fietkau <nbd@nbd.name>
>
> The sign-file tool failed to build against libressl. Fix this by extending
> the PKCS7 check and thus making sign-file link against libressl without an
> error.
>
> Signed-off-by: John Crispin <john@phrozen.org>
> Signed-off-by: Felix Fietkau <nbd@nbd.name>
Applied.
David
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-01-12 12:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-22 13:38 [PATCH] sign-file: fix build error in sign-file.c with libressl John Crispin
2017-01-12 12:54 ` David Howells
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).