Call cl_initialize_crypto() in cl_init()

clambc/bcrun.c

@@ -242,8 +242,6 @@ int main(int argc, char *argv[])
     int fd = -1;
     unsigned tracelevel;
 
-    cl_initialize_crypto();
-
     if(check_flevel())
 	exit(1);
 

clamconf/clamconf.c

@@ -372,8 +372,6 @@ int main(int argc, char **argv)
 	unsigned int i, j;
 	struct cli_environment env;
 
-    cl_initialize_crypto();
-
     opts = optparse(NULL, argc, argv, 1, OPT_CLAMCONF, 0, NULL);
     if(!opts) {
 	printf("ERROR: Can't parse command line options\n");

clamd/clamd.c

@@ -137,8 +137,6 @@ int main(int argc, char **argv)
     sigaction(SIGUSR2, &sa, NULL);
 #endif
 
-    cl_initialize_crypto();
-
     if((opts = optparse(NULL, argc, argv, 1, OPT_CLAMD, 0, NULL)) == NULL) {
         mprintf("!Can't parse command line options\n");
         return 1;

clamdscan/clamdscan.c

@@ -68,8 +68,6 @@ int main(int argc, char **argv)
 	struct sigaction sigact;
 #endif
 
-    cl_initialize_crypto();
-
     if((opts = optparse(NULL, argc, argv, 1, OPT_CLAMDSCAN, OPT_CLAMSCAN, NULL)) == NULL) {
 	mprintf("!Can't parse command line options\n");
 	return 2;

freshclam/freshclam.c

@@ -298,8 +298,6 @@ main (int argc, char **argv)
     if (check_flevel ())
         exit (FCE_INIT);
 
-    cl_initialize_crypto();
-
     if ((retcl = cl_init (CL_INIT_DEFAULT)))
     {
         mprintf ("!Can't initialize libclamav: %s\n", cl_strerror (retcl));

libclamav/others.c

@@ -286,6 +286,8 @@ int cl_init(unsigned int initoptions)
 	struct timeval tv;
 	unsigned int pid = (unsigned int) getpid();
 
+    cl_initialize_crypto();
+
     {
 	unrar_main_header_t x;
 	if (((char*)&x.flags - (char*)&x) != 3) {

sigtool/sigtool.c

@@ -2991,8 +2991,6 @@ int main(int argc, char **argv)
     if(check_flevel())
 	exit(1);
 
-    cl_initialize_crypto();
-
     if((ret = cl_init(CL_INIT_DEFAULT)) != CL_SUCCESS) {
 	mprintf("!Can't initialize libclamav: %s\n", cl_strerror(ret));
 	return -1;