@@ -166,7 +166,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/os_checks.m4 \

 	$(top_srcdir)/m4/reorganization/milter/check.m4 \

 	$(top_srcdir)/m4/reorganization/code_checks/pthread_02.m4 \

-	$(top_srcdir)/m4/reorganization/code_checks/readdir.m4 \

 	$(top_srcdir)/m4/reorganization/code_checks/ctime.m4 \

 	$(top_srcdir)/m4/reorganization/code_checks/socklen_t.m4 \

 	$(top_srcdir)/m4/reorganization/clamav_user.m4 \

@@ -428,6 +427,9 @@ MANIFEST_TOOL = @MANIFEST_TOOL@

 MKDIR_P = @MKDIR_P@

 NM = @NM@

 NMEDIT = @NMEDIT@

+OBJC = @OBJC@

+OBJCDEPMODE = @OBJCDEPMODE@

+OBJCFLAGS = @OBJCFLAGS@

 OBJDUMP = @OBJDUMP@

 OBJEXT = @OBJEXT@

 OTOOL = @OTOOL@

@@ -478,6 +480,7 @@ ac_ct_AR = @ac_ct_AR@

 ac_ct_CC = @ac_ct_CC@

 ac_ct_CXX = @ac_ct_CXX@

 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@

+ac_ct_OBJC = @ac_ct_OBJC@

 am__include = @am__include@

 am__leading_dot = @am__leading_dot@

 am__quote = @am__quote@

@@ -52,7 +52,7 @@ endif

 AM_CFLAGS=@WERR_CFLAGS@ @CLAMSUBMIT_CFLAGS@

 DEFS = @DEFS@ -DCL_NOTHREADS

 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@

-LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMSUBMIT_LIBS@ @THREAD_LIBS@ @JSON_LIBS@

+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMSUBMIT_LIBS@ @THREAD_LIBS@ @JSON_LIBS@ @SSL_LIBS@

 if MACOS

 AM_LDFLAGS = -framework CoreFoundation -framework Security

@@ -430,7 +430,7 @@ LIBPRELUDE_LDFLAGS = @LIBPRELUDE_LDFLAGS@

 LIBPRELUDE_LIBS = @LIBPRELUDE_LIBS@

 LIBPRELUDE_PREFIX = @LIBPRELUDE_PREFIX@

 LIBPRELUDE_PTHREAD_CFLAGS = @LIBPRELUDE_PTHREAD_CFLAGS@

-LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMSUBMIT_LIBS@ @THREAD_LIBS@ @JSON_LIBS@

+LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMSUBMIT_LIBS@ @THREAD_LIBS@ @JSON_LIBS@ @SSL_LIBS@

 LIBTOOL = @LIBTOOL@

 LIPO = @LIPO@

 LN_S = @LN_S@

@@ -672,8 +672,6 @@ OBJCDEPMODE

 ac_ct_OBJC

 OBJCFLAGS

 OBJC

-BUILD_CLAMONACC_FALSE

-BUILD_CLAMONACC_TRUE

 HAVE_STRNI

 CURL_LDFLAGS

 CURL_LIBS

@@ -29941,7 +29939,13 @@ else

 fi

-ac_config_files="$ac_config_files clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamd/clamav-daemon.service clamd/clamav-daemon.socket clamdscan/Makefile clamonacc/Makefile clamsubmit/Makefile clamav-milter/Makefile freshclam/clamav-freshclam.service freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile test/Makefile unit_tests/Makefile fuzz/Makefile clamdtop/Makefile clambc/Makefile libfreshclam/Makefile Makefile clamav-config libclamav.pc platform.h docs/man/clamav-milter.8 docs/man/clamav-milter.conf.5 docs/man/clambc.1 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1 docs/man/clamdtop.1 docs/man/clamsubmit.1 clamav-types.h"

+ac_config_files="$ac_config_files clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamd/clamav-daemon.service clamd/clamav-daemon.socket clamdscan/Makefile clamsubmit/Makefile clamav-milter/Makefile freshclam/clamav-freshclam.service freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile test/Makefile unit_tests/Makefile fuzz/Makefile clamdtop/Makefile clambc/Makefile libfreshclam/Makefile Makefile clamav-config libclamav.pc platform.h docs/man/clamav-milter.8 docs/man/clamav-milter.conf.5 docs/man/clambc.1 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1 docs/man/clamdtop.1 docs/man/clamsubmit.1 clamav-types.h"

+

+

+if test -z "$BUILD_CLAMONACC_TRUE"; then :

+  ac_config_files="$ac_config_files clamonacc/Makefile"

+

+fi

 # Define variables needed to generate clamav-types.h.

 # Define a warning for the user, so they don't edit clamav-types.h

@@ -30311,6 +30315,18 @@ if test -z "${SYSTEM_LFS_FTS_TRUE}" && test -z "${SYSTEM_LFS_FTS_FALSE}"; then

   as_fn_error $? "conditional \"SYSTEM_LFS_FTS\" was never defined.

 Usually this means the macro was only invoked conditionally." "$LINENO" 5

 fi

+if test -z "${BUILD_CLAMONACC_TRUE}" && test -z "${BUILD_CLAMONACC_FALSE}"; then

+  as_fn_error $? "conditional \"BUILD_CLAMONACC\" was never defined.

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

+fi

+if test -z "${BUILD_CLAMONACC_TRUE}" && test -z "${BUILD_CLAMONACC_FALSE}"; then

+  as_fn_error $? "conditional \"BUILD_CLAMONACC\" was never defined.

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

+fi

+if test -z "${BUILD_CLAMONACC_TRUE}" && test -z "${BUILD_CLAMONACC_FALSE}"; then

+  as_fn_error $? "conditional \"BUILD_CLAMONACC\" was never defined.

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

+fi

 if test -z "${am__fastdepOBJC_TRUE}" && test -z "${am__fastdepOBJC_FALSE}"; then

   as_fn_error $? "conditional \"am__fastdepOBJC\" was never defined.

 Usually this means the macro was only invoked conditionally." "$LINENO" 5

@@ -30324,26 +30340,7 @@ if test -z "${WINDOWS_TRUE}" && test -z "${WINDOWS_FALSE}"; then

 Usually this means the macro was only invoked conditionally." "$LINENO" 5

 fi

 if test -z "${MACOS_TRUE}" && test -z "${MACOS_FALSE}"; then

-  as_fn_error $? "conditional \"MACOS\" was never defined."

-fi

-if test -z "${ENABLE_CLAMSUBMIT_TRUE}" && test -z "${ENABLE_CLAMSUBMIT_FALSE}"; then

-  as_fn_error $? "conditional \"ENABLE_CLAMSUBMIT\" was never defined.

-Usually this means the macro was only invoked conditionally." "$LINENO" 5

-fi

-if test -z "${ENABLE_LIBFRESHCLAM_TRUE}" && test -z "${ENABLE_LIBFRESHCLAM_FALSE}"; then

-  as_fn_error $? "conditional \"ENABLE_LIBFRESHCLAM\" was never defined.

-Usually this means the macro was only invoked conditionally." "$LINENO" 5

-fi

-if test -z "${BUILD_CLAMONACC_TRUE}" && test -z "${BUILD_CLAMONACC_FALSE}"; then

-  as_fn_error $? "conditional \"BUILD_CLAMONACC\" was never defined.

-Usually this means the macro was only invoked conditionally." "$LINENO" 5

-fi

-if test -z "${BUILD_CLAMONACC_TRUE}" && test -z "${BUILD_CLAMONACC_FALSE}"; then

-  as_fn_error $? "conditional \"BUILD_CLAMONACC\" was never defined.

-Usually this means the macro was only invoked conditionally." "$LINENO" 5

-fi

-if test -z "${BUILD_CLAMONACC_TRUE}" && test -z "${BUILD_CLAMONACC_FALSE}"; then

-  as_fn_error $? "conditional \"BUILD_CLAMONACC\" was never defined.

+  as_fn_error $? "conditional \"MACOS\" was never defined.

 Usually this means the macro was only invoked conditionally." "$LINENO" 5

 fi

@@ -33211,6 +33208,18 @@ if test -z "${SYSTEM_LFS_FTS_TRUE}" && test -z "${SYSTEM_LFS_FTS_FALSE}"; then

   as_fn_error $? "conditional \"SYSTEM_LFS_FTS\" was never defined.

 Usually this means the macro was only invoked conditionally." "$LINENO" 5

 fi

+if test -z "${BUILD_CLAMONACC_TRUE}" && test -z "${BUILD_CLAMONACC_FALSE}"; then

+  as_fn_error $? "conditional \"BUILD_CLAMONACC\" was never defined.

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

+fi

+if test -z "${BUILD_CLAMONACC_TRUE}" && test -z "${BUILD_CLAMONACC_FALSE}"; then

+  as_fn_error $? "conditional \"BUILD_CLAMONACC\" was never defined.

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

+fi

+if test -z "${BUILD_CLAMONACC_TRUE}" && test -z "${BUILD_CLAMONACC_FALSE}"; then

+  as_fn_error $? "conditional \"BUILD_CLAMONACC\" was never defined.

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

+fi

 if test -z "${am__fastdepOBJC_TRUE}" && test -z "${am__fastdepOBJC_FALSE}"; then

   as_fn_error $? "conditional \"am__fastdepOBJC\" was never defined.

 Usually this means the macro was only invoked conditionally." "$LINENO" 5

@@ -33225,24 +33234,6 @@ Usually this means the macro was only invoked conditionally." "$LINENO" 5

 fi

 if test -z "${MACOS_TRUE}" && test -z "${MACOS_FALSE}"; then

   as_fn_error $? "conditional \"MACOS\" was never defined.

-if test -z "${ENABLE_CLAMSUBMIT_TRUE}" && test -z "${ENABLE_CLAMSUBMIT_FALSE}"; then

-  as_fn_error $? "conditional \"ENABLE_CLAMSUBMIT\" was never defined.

-Usually this means the macro was only invoked conditionally." "$LINENO" 5

-fi

-if test -z "${ENABLE_LIBFRESHCLAM_TRUE}" && test -z "${ENABLE_LIBFRESHCLAM_FALSE}"; then

-  as_fn_error $? "conditional \"ENABLE_LIBFRESHCLAM\" was never defined.

-Usually this means the macro was only invoked conditionally." "$LINENO" 5

-fi

-if test -z "${BUILD_CLAMONACC_TRUE}" && test -z "${BUILD_CLAMONACC_FALSE}"; then

-  as_fn_error $? "conditional \"BUILD_CLAMONACC\" was never defined.

-Usually this means the macro was only invoked conditionally." "$LINENO" 5

-fi

-if test -z "${BUILD_CLAMONACC_TRUE}" && test -z "${BUILD_CLAMONACC_FALSE}"; then

-  as_fn_error $? "conditional \"BUILD_CLAMONACC\" was never defined.

-Usually this means the macro was only invoked conditionally." "$LINENO" 5

-fi

-if test -z "${BUILD_CLAMONACC_TRUE}" && test -z "${BUILD_CLAMONACC_FALSE}"; then

-  as_fn_error $? "conditional \"BUILD_CLAMONACC\" was never defined.

 Usually this means the macro was only invoked conditionally." "$LINENO" 5

 fi

 if test -z "${am__EXEEXT_TRUE}" && test -z "${am__EXEEXT_FALSE}"; then

@@ -252,9 +252,9 @@ am__uninstall_files_from_dir = { \

   }

 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"

 LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)

-@ENABLE_UNRAR_TRUE@am__DEPENDENCIES_1 = libclamunrar_iface.la

-am__DEPENDENCIES_2 =

-@USE_INTERNAL_MSPACK_FALSE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2)

+am__DEPENDENCIES_1 =

+@ENABLE_UNRAR_TRUE@am__DEPENDENCIES_2 = libclamunrar_iface.la

+@USE_INTERNAL_MSPACK_FALSE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)

 @ENABLE_LLVM_FALSE@am__DEPENDENCIES_4 = libclamav_nocxx.la

 @ENABLE_LLVM_TRUE@am__DEPENDENCIES_4 = c++/libclamavcxx.la

 am__libclamav_la_SOURCES_DIST = matcher-ac.c matcher-ac.h matcher-bm.c \

@@ -262,7 +262,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 $@

@@ -273,11 +273,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

@@ -291,7 +291,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) \

@@ -299,7 +299,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) \

@@ -309,7 +309,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) \

@@ -317,7 +317,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 = \

@@ -691,7 +691,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:

@@ -20,6 +20,7 @@

  *  MA 02110-1301, USA.

  */

+#include <openssl/ssl.h>

 #include <openssl/x509.h>

 #include <openssl/pem.h>

 #include <openssl/err.h>