From 8c0fbd1da1a148c0f11d93a94392483de7dc738f Mon Sep 17 00:00:00 2001 From: Chris Conlon Date: Mon, 26 Nov 2018 16:13:46 -0800 Subject: [PATCH] conditionally compile CMS SignedData detached signature example based on wolfSSL version --- pkcs7/signedData-DetachedSignature.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkcs7/signedData-DetachedSignature.c b/pkcs7/signedData-DetachedSignature.c index f9bc37a8..39280a75 100644 --- a/pkcs7/signedData-DetachedSignature.c +++ b/pkcs7/signedData-DetachedSignature.c @@ -19,11 +19,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ #include +#include #include #include #include #include +/* Detached signature support was only in wolfSSL versions after 3.15.5 */ +#if defined(HAVE_PKCS7) && (LIBWOLFSSL_VERSION_HEX > 0x03015005) + #define certFile "../certs/client-cert.der" #define keyFile "../certs/client-key.der" #define encodedFileNoAttrs "signedData_detached_noattrs.der" @@ -278,8 +282,6 @@ static int signedData_verify(byte* in, word32 inSz, byte* cert, return ret; } -#ifdef HAVE_PKCS7 - int main(int argc, char** argv) { int ret; @@ -335,7 +337,7 @@ int main(int argc, char** argv) int main(int argc, char** argv) { - printf("Must build wolfSSL using ./configure --enable-pkcs7\n"); + printf("Must build wolfSSL (> 3.15.5) using ./configure --enable-pkcs7\n"); return 0; }