review comments on PR: always define Init_ossl_cms()

Author: mcr

ext/openssl/ossl.c

@@ -1035,6 +1035,7 @@ Init_openssl(void)
     Init_ossl_asn1();
     Init_ossl_bn();
     Init_ossl_cipher();
+    Init_ossl_cms();
     Init_ossl_config();
     Init_ossl_digest();
     Init_ossl_engine();
@@ -1044,9 +1045,6 @@ Init_openssl(void)
     Init_ossl_ocsp();
     Init_ossl_pkcs12();
     Init_ossl_pkcs7();
-#if defined(HAVE_CMS_SIGN)
-    Init_ossl_cms();
-#endif
     Init_ossl_pkey();
     Init_ossl_provider();
     Init_ossl_rand();

ext/openssl/ossl_cms.c

@@ -11,7 +11,7 @@
  */
 #include "ossl.h"
 
-#if defined(HAVE_CMS_SIGN)
+#if !defined(OPENSSL_NO_CMS)
 /*
  * The CMS_ContentInfo is the primary data structure which this module creates and maintains
  * Is is called OpenSSL::CMS::ContentInfo in ruby.
@@ -435,7 +435,7 @@ ossl_cms_s_sign(int argc, VALUE *argv, VALUE klass)
 }
 
 /*
- * INIT
+ * INIT CMS interface
  */
 void
 Init_ossl_cms(void)
@@ -511,4 +511,11 @@ Init_ossl_cms(void)
     DefCMSConst(PARTIAL);
 }
 
-#endif /* HAVE_CMS_SIGN */
+#else
+/* empty init function for when OPENSSL_NO_CMS */
+void Init_ossl_cms(void)
+{
+  /* nothing */
+}
+
+#endif /* OPENSSL_NO_CMS */