Browse code

clamconf: updated option feature tracking and openssl version report

Kevin Lin authored on 2014/10/01 00:07:38
Showing 1 changed files
... ...
@@ -34,6 +34,8 @@
34 34
 #include <sys/types.h>
35 35
 #include <sys/stat.h>
36 36
 #include <dirent.h>
37
+#include <openssl/crypto.h>
38
+#include <openssl/opensslv.h>
37 39
 
38 40
 #include "shared/optparser.h"
39 41
 #include "shared/misc.h"
... ...
@@ -252,6 +254,11 @@ static void print_platform(struct cli_environment *env)
252 252
     printf("zlib version: %s (%s)\n",
253 253
 	   ZLIB_VERSION, zlibVersion());
254 254
 #endif
255
+    /* openssl version querying */
256
+    if (OPENSSL_VERSION_NUMBER != SSLeay())
257
+	printf("WARNING: openssl version mismatch: %ld (%ld)\n", OPENSSL_VERSION_NUMBER, SSLeay());
258
+    printf("openssl version: %s\n", SSLeay_version(SSLEAY_VERSION));
259
+
255 260
     if (env->triple[0])
256 261
     printf("Triple: %s\n", env->triple);
257 262
     if (env->cpu[0])
... ...
@@ -456,6 +463,12 @@ int main(int argc, char **argv)
456 456
 #ifdef HAVE_BZLIB_H
457 457
 	printf("BZIP2 ");
458 458
 #endif
459
+#ifdef HAVE_LIBXML2
460
+	printf("LIBXML2 ");
461
+#endif
462
+#ifdef HAVE_JSON
463
+	printf("JSON ");
464
+#endif
459 465
     if(have_rar)
460 466
 	printf("RAR ");
461 467
     if (have_clamjit)