sign-file: fix build with CMS support disabled
authorMarc-Antoine Perennou <Marc-Antoine@Perennou.com>
Tue, 1 Mar 2016 08:53:00 +0000 (09:53 +0100)
committerDavid Howells <dhowells@redhat.com>
Thu, 3 Mar 2016 10:50:46 +0000 (10:50 +0000)
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>
Signed-off-by: David Howells <dhowells@redhat.com>
scripts/sign-file.c

index 80b7f7f933d600ef318607f36272d595b294ab6b..d912d5a56a5ebf05f3e1f2fb0f93cfd028907167 100755 (executable)
@@ -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