Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1346104 > unrolled thread
| Started by | Marc-Antoine Perennou <Marc-Antoine@Perennou.com> |
|---|---|
| First post | 2016-02-29 20:20 +0100 |
| Last post | 2016-03-01 10:00 +0100 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] sign-file: fix build with CMS support disabled Marc-Antoine Perennou <Marc-Antoine@Perennou.com> - 2016-02-29 20:20 +0100
Re: [PATCH] sign-file: fix build with CMS support disabled David Howells <dhowells@redhat.com> - 2016-03-01 01:20 +0100
[PATCH v2] sign-file: fix build with CMS support disabled Marc-Antoine Perennou <Marc-Antoine@Perennou.com> - 2016-03-01 10:00 +0100
| From | Marc-Antoine Perennou <Marc-Antoine@Perennou.com> |
|---|---|
| Date | 2016-02-29 20:20 +0100 |
| Subject | [PATCH] sign-file: fix build with CMS support disabled |
| Message-ID | <r7Bwm-79s-9@gated-at.bofh.it> |
Some versions of openssl might have the CMS feature disabled LibreSSL disables this feature too If the feature is disabled, fallback to PKCS7 In file included from scripts/sign-file.c:46:0: /usr/x86_64-pc-linux-gnu/include/openssl/cms.h:62:2: error: #error CMS is disabled. #error CMS is disabled. Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> --- scripts/sign-file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/sign-file.c b/scripts/sign-file.c index 250a7a6..ca3e34b 100755 --- a/scripts/sign-file.c +++ b/scripts/sign-file.c @@ -39,7 +39,7 @@ * signing with anything other than SHA1 - so we're stuck with that if such is * the case. */ -#if OPENSSL_VERSION_NUMBER < 0x10000000L +#if OPENSSL_VERSION_NUMBER < 0x10000000L || defined(OPENSSL_NO_CMS) #define USE_PKCS7 #endif #ifndef USE_PKCS7 -- 2.7.2
[toc] | [next] | [standalone]
| From | David Howells <dhowells@redhat.com> |
|---|---|
| Date | 2016-03-01 01:20 +0100 |
| Message-ID | <r7GcG-1Fc-3@gated-at.bofh.it> |
| In reply to | #1346104 |
Can you rebase on: http://git.kernel.org/cgit/linux/kernel/git/dhowells/linux-fs.git/log/?h=keys-next Thanks, David
[toc] | [prev] | [next] | [standalone]
| From | Marc-Antoine Perennou <Marc-Antoine@Perennou.com> |
|---|---|
| Date | 2016-03-01 10:00 +0100 |
| Subject | [PATCH v2] sign-file: fix build with CMS support disabled |
| Message-ID | <r7OjU-6MP-3@gated-at.bofh.it> |
| In reply to | #1346267 |
Some versions of openssl might have the CMS feature disabled LibreSSL disables this feature too If the feature is disabled, fallback to PKCS7 In file included from scripts/sign-file.c:46:0: /usr/x86_64-pc-linux-gnu/include/openssl/cms.h:62:2: error: #error CMS is disabled. #error CMS is disabled. Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> --- scripts/sign-file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/sign-file.c b/scripts/sign-file.c index 80b7f7f..d912d5a 100755 --- a/scripts/sign-file.c +++ b/scripts/sign-file.c @@ -41,7 +41,7 @@ * signing with anything other than SHA1 - so we're stuck with that if such is * the case. */ -#if (OPENSSL_VERSION_NUMBER < 0x10000000L || LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER < 0x10000000L || defined(OPENSSL_NO_CMS) #define USE_PKCS7 #endif #ifndef USE_PKCS7 -- 2.7.2
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web