allow CMS CompressedData to be disabled with NO_PKCS7_COMPRESSED_DATA

This commit is contained in:
Chris Conlon
2018-09-19 10:37:11 -06:00
committed by David Garske
parent 75349bbba5
commit a4da14f4b0
3 changed files with 10 additions and 10 deletions
+3 -3
View File
@@ -326,7 +326,7 @@ int scrypt_test(void);
#ifndef NO_PKCS7_ENCRYPTED_DATA
int pkcs7encrypted_test(void);
#endif
#ifdef HAVE_LIBZ
#if defined(HAVE_LIBZ) && !defined(NO_PKCS7_COMPRESSED_DATA)
int pkcs7compressed_test(void);
#endif
#endif
@@ -967,7 +967,7 @@ initDefaultName();
else
printf( "PKCS7encrypted test passed!\n");
#endif
#ifdef HAVE_LIBZ
#if defined(HAVE_LIBZ) && !defined(NO_PKCS7_COMPRESSED_DATA)
if ( (ret = pkcs7compressed_test()) != 0)
return err_sys("PKCS7compressed test failed!\n", ret);
else
@@ -19750,7 +19750,7 @@ int pkcs7encrypted_test(void)
#endif /* NO_PKCS7_ENCRYPTED_DATA */
#ifdef HAVE_LIBZ
#if defined(HAVE_LIBZ) && !defined(NO_PKCS7_COMPRESSED_DATA)
typedef struct {
const byte* content;