@@ -28,6 +28,8 @@ if VERSIONSCRIPT

 libfreshclam_la_LDFLAGS += -Wl,@VERSIONSCRIPTFLAG@,@top_srcdir@/libfreshclam/libfreshclam.map

 endif

+AM_LIBTOOLFLAGS = --tag CXX

+

 EXTRA_DIST = libfreshclam.map

 include_HEADERS = libfreshclam.h

@@ -251,7 +251,7 @@ libfreshclam_la_OBJECTS = $(am_libfreshclam_la_OBJECTS)

 AM_V_lt = $(am__v_lt_@AM_V@)

 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)

 am__v_lt_0 = --silent

-am__v_lt_1 = 

+am__v_lt_1 =

 libfreshclam_la_LINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \

 	$(LIBTOOLFLAGS) --mode=link $(OBJCLD) $(AM_OBJCFLAGS) \

 	$(OBJCFLAGS) $(libfreshclam_la_LDFLAGS) $(LDFLAGS) -o $@

@@ -262,11 +262,11 @@ am__v_P_1 = :

 AM_V_GEN = $(am__v_GEN_@AM_V@)

 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)

 am__v_GEN_0 = @echo "  GEN     " $@;

-am__v_GEN_1 = 

+am__v_GEN_1 =

 AM_V_at = $(am__v_at_@AM_V@)

 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)

 am__v_at_0 = @

-am__v_at_1 = 

+am__v_at_1 =

 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/libclammspack

 depcomp = $(SHELL) $(top_srcdir)/config/depcomp

 am__depfiles_maybe = depfiles

@@ -280,7 +280,7 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \

 AM_V_CC = $(am__v_CC_@AM_V@)

 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)

 am__v_CC_0 = @echo "  CC      " $@;

-am__v_CC_1 = 

+am__v_CC_1 =

 CCLD = $(CC)

 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \

 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \

@@ -288,7 +288,7 @@ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \

 AM_V_CCLD = $(am__v_CCLD_@AM_V@)

 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)

 am__v_CCLD_0 = @echo "  CCLD    " $@;

-am__v_CCLD_1 = 

+am__v_CCLD_1 =

 OBJCCOMPILE = $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \

 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS)

 LTOBJCCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \

@@ -298,7 +298,7 @@ LTOBJCCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \

 AM_V_OBJC = $(am__v_OBJC_@AM_V@)

 am__v_OBJC_ = $(am__v_OBJC_@AM_DEFAULT_V@)

 am__v_OBJC_0 = @echo "  OBJC    " $@;

-am__v_OBJC_1 = 

+am__v_OBJC_1 =

 OBJCLD = $(OBJC)

 OBJCLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \

 	--mode=link $(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS) \

@@ -306,7 +306,7 @@ OBJCLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \

 AM_V_OBJCLD = $(am__v_OBJCLD_@AM_V@)

 am__v_OBJCLD_ = $(am__v_OBJCLD_@AM_DEFAULT_V@)

 am__v_OBJCLD_0 = @echo "  OBJCLD  " $@;

-am__v_OBJCLD_1 = 

+am__v_OBJCLD_1 =

 SOURCES = $(libfreshclam_la_SOURCES)

 DIST_SOURCES = $(am__libfreshclam_la_SOURCES_DIST)

 am__can_run_installinfo = \

@@ -588,6 +588,7 @@ libfreshclam_la_LDFLAGS = @CURL_LDFLAGS@ @SSL_LDFLAGS@ @TH_SAFE@ \

 	@JSON_LDFLAGS@ @ICONV_LDFLAGS@ $(XML_LIBS) -version-info \

 	@LIBFRESHCLAM_VERSION@ -no-undefined $(am__append_1) \

 	$(am__append_2)

+AM_LIBTOOLFLAGS = --tag CXX

 EXTRA_DIST = libfreshclam.map

 include_HEADERS = libfreshclam.h

 libfreshclam_la_SOURCES = $(top_srcdir)/shared/output.c \

@@ -675,7 +676,7 @@ clean-libLTLIBRARIES:

 	  rm -f $${locs}; \

 	}

-libfreshclam.la: $(libfreshclam_la_OBJECTS) $(libfreshclam_la_DEPENDENCIES) $(EXTRA_libfreshclam_la_DEPENDENCIES) 

+libfreshclam.la: $(libfreshclam_la_OBJECTS) $(libfreshclam_la_DEPENDENCIES) $(EXTRA_libfreshclam_la_DEPENDENCIES)

 	$(AM_V_OBJCLD)$(libfreshclam_la_LINK) -rpath $(libdir) $(libfreshclam_la_OBJECTS) $(libfreshclam_la_LIBADD) $(LIBS)

 mostlyclean-compile:

@@ -249,7 +249,7 @@ done:

     return !rc;

 }

-static cl_error_t x509_get_cert_name(X509 *cert, char **name)

+cl_error_t x509_get_cert_name(X509 *cert, char **name)

 {

     int rc = CL_EMEM;

@@ -77,4 +77,17 @@ void cert_store_free_cert_list_int(cert_list_t *cert_list);

  */

 cl_error_t cert_store_set_trusted_int(X509 **trusted_certs, size_t trusted_cert_count);

+/**

+ * @brief Get the name from an X509 certificate.

+ * Required if OPENSSL_VERSION_NUMBER >= 0x10100000L ( 1.1.0+ )

+ * because the X509 structure is now opaque.

+ *

+ * The name must be free()'d by the caller.

+ *

+ * @param[in] cert - The cert in question.

+ * @param[out] name - The NULL terminated name.

+ * @return cl_error_t CL_SUCCESS on success.

+ */

+cl_error_t x509_get_cert_name(X509 *cert, char **name);

+

 #endif

@@ -332,17 +332,27 @@ cl_error_t cert_store_load(X509 **trusted_certs, size_t trusted_cert_count)

                     const unsigned char *der = CFDataGetBytePtr(cert_data);

                     CFIndex length           = CFDataGetLength(cert_data);

+                    char *name = NULL;

                     X509 *x509 = d2i_X509(NULL, &der, length);

+#if OPENSSL_VERSION_NUMBER >= 0x10100000L

+                    x509_get_cert_name(x509, &name);

+#else

+                    name = x509->name;

+#endif

+

                     if (x509) {

                         mprintf("*Found %s trusted certificate %s\n",

                                 kc_info.name,

-                                (x509->name ? x509->name : "<no name>"));

+                                (name ? name : "<no name>"));

                         store->system_certs.certificates[store->system_certs.count++] = x509;

                     } else {

                         mprintf("!Failed conversion of DER format to X.509\n");

                     }

+#if OPENSSL_VERSION_NUMBER >= 0x10100000L

+                    free(name);

+#endif

                     CFRelease(cert_data);

                     cert_data = NULL;