do not include CMS code with LIBRESSL, as it has no CMS code

ruby · Dec 27, 2018 · 156f8df · 156f8df
1 parent b7f68eb
commit 156f8df
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
@@ -165,6 +165,7 @@ def find_openssl_library
 have_func("X509_get0_notBefore")
 have_func("SSL_SESSION_get_protocol_version")
 have_func("EVP_PBE_scrypt")
+have_func("CMS_sign")
 
 Logging::message "=== Checking done. ===\n"
 

diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c
@@ -1202,7 +1202,9 @@ Init_openssl(void)
     Init_ossl_ns_spki();
     Init_ossl_pkcs12();
     Init_ossl_pkcs7();
+#if defined(HAVE_CMS_SIGN)
     Init_ossl_cms();
+#endif
     Init_ossl_pkey();
     Init_ossl_rand();
     Init_ossl_ssl();

diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
@@ -24,7 +24,9 @@
 #include <openssl/ssl.h>
 #include <openssl/pkcs12.h>
 #include <openssl/pkcs7.h>
+#if defined(HAVE_CMS_SIGN)
 #include <openssl/cms.h>
+#endif
 #include <openssl/hmac.h>
 #include <openssl/rand.h>
 #include <openssl/conf.h>

diff --git a/ext/openssl/ossl_cms.c b/ext/openssl/ossl_cms.c
@@ -11,6 +11,7 @@
  */
 #include "ossl.h"
 
+#if defined(HAVE_CMS_SIGN)
 /*
  * The CMS_ContentInfo is the primary data structure which this module creates and maintains
  * Is is called OpenSSL::CMS::ContentInfo in ruby.
@@ -496,3 +497,5 @@ Init_ossl_cms(void)
     DefCMSConst(STREAM);
     DefCMSConst(PARTIAL);
 }
+
+#endif /* HAVE_CMS_SIGN */