Changeset 319 for clamav/trunk/libclamav/others.c

Timestamp:

Apr 19, 2011, 11:12:07 PM (14 years ago)

Author:

Yuri Dario

Message:

clamav: update trunk to 0.97.

Location:

clamav/trunk

Files:

• . (modified) (1 prop)
• libclamav/others.c (modified) (9 diffs)

clamav/trunk/libclamav/others.c ¶

@@ -61 +61 @@
 #include "others.h"
 #include "md5.h"
+#include "sha1.h"
+#include "sha256.h"
 #include "cltypes.h"
 #include "regex/regex.h"
@@ -255 +257 @@
             return "CL_EFORMAT: Bad format or broken data";
         case CL_EBYTECODE:
-            return "CL_EBYTECODE: error during bytecode execution";
+            return "Error during bytecode execution";
         case CL_EBYTECODE_TESTFAIL:
-            return "CL_EBYTECODE_TESTFAIL: failure in bytecode testmode";
+            return "Failure in bytecode testmode";
+        case CL_ELOCK:
+            return "Mutex lock failed";
+        case CL_EBUSY:
+            return "Scanner still active";
+        case CL_ESTATE:
+            return "Bad state (engine not initialized, or already initialized)";
         default:
             return "Unknown error code";
@@ -434 +442 @@
             if (num == CL_BYTECODE_MODE_OFF) {
                 cli_errmsg("cl_engine_set_num: CL_BYTECODE_MODE_OFF is not settable, use dboptions to turn off!\n");
+                return CL_EARG;
             }
             engine->bytecode_mode = num;
+            if (num == CL_BYTECODE_MODE_TEST)
+                cli_infomsg(NULL, "bytecode engine in test mode\n");
             break;
         default:
@@ -566 +577 @@
     settings->min_cc_count = engine->min_cc_count;
     settings->min_ssn_count = engine->min_ssn_count;
+    settings->bytecode_security = engine->bytecode_security;
+    settings->bytecode_timeout = engine->bytecode_timeout;
+    settings->bytecode_mode = engine->bytecode_mode;
     settings->pua_cats = engine->pua_cats ? strdup(engine->pua_cats) : NULL;
+
+    settings->cb_pre_scan = engine->cb_pre_scan;
+    settings->cb_post_scan = engine->cb_post_scan;
+    settings->cb_sigload = engine->cb_sigload;
+    settings->cb_sigload_ctx = engine->cb_sigload_ctx;
+    settings->cb_hash = engine->cb_hash;
 
     return settings;
@@ -583 +603 @@
     engine->min_cc_count = settings->min_cc_count;
     engine->min_ssn_count = settings->min_ssn_count;
+    engine->bytecode_security = settings->bytecode_security;
+    engine->bytecode_timeout = settings->bytecode_timeout;
+    engine->bytecode_mode = settings->bytecode_mode;
 
     if(engine->tmpdir)
@@ -604 +627 @@
     }
 
+    engine->cb_pre_scan = settings->cb_pre_scan;
+    engine->cb_post_scan = settings->cb_post_scan;
+    engine->cb_sigload = settings->cb_sigload;
+    engine->cb_sigload_ctx = settings->cb_sigload_ctx;
+    engine->cb_hash = settings->cb_hash;
+
     return CL_SUCCESS;
 }
@@ -663 +692 @@
 }
 
-unsigned char *cli_md5digest(int desc)
-{
-        unsigned char *digest;
+/*
+ * Type: 1 = MD5, 2 = SHA1, 3 = SHA256
+ */
+char *cli_hashstream(FILE *fs, unsigned char *digcpy, int type)
+{
+        unsigned char digest[32];
         char buff[FILEBUFF];
-        cli_md5_ctx ctx;
-        int bytes;
-
-
-    if(!(digest = cli_malloc(16)))
+        cli_md5_ctx md5;
+        SHA1Context sha1;
+        SHA256_CTX sha256;
+        char *hashstr, *pt;
+        int i, bytes, size;
+
+
+    if(type == 1)
+        cli_md5_init(&md5);
+    else if(type == 2)
+        SHA1Init(&sha1);
+    else
+        sha256_init(&sha256);
+
+    while((bytes = fread(buff, 1, FILEBUFF, fs))) {
+        if(type == 1)
+            cli_md5_update(&md5, buff, bytes);
+        else if(type == 2)
+            SHA1Update(&sha1, buff, bytes);
+        else
+            sha256_update(&sha256, buff, bytes);
+    }
+
+    if(type == 1) {
+        cli_md5_final(digest, &md5);
+        size = 16;
+    } else if(type == 2) {
+        SHA1Final(&sha1, digest);
+        size = 20;
+    } else {
+        sha256_final(&sha256, digest);
+        size = 32;
+    }
+
+    if(!(hashstr = (char *) cli_calloc(size*2 + 1, sizeof(char))))
         return NULL;
 
-    cli_md5_init(&ctx);
-
-    while((bytes = cli_readn(desc, buff, FILEBUFF)))
-        cli_md5_update(&ctx, buff, bytes);
-
-    cli_md5_final(digest, &ctx);
-
-    return digest;
-}
-
-char *cli_md5stream(FILE *fs, unsigned char *digcpy)
-{
-        unsigned char digest[16];
-        char buff[FILEBUFF];
-        cli_md5_ctx ctx;
-        char *md5str, *pt;
-        int i, bytes;
-
-
-    cli_md5_init(&ctx);
-
-    while((bytes = fread(buff, 1, FILEBUFF, fs)))
-        cli_md5_update(&ctx, buff, bytes);
-
-    cli_md5_final(digest, &ctx);
-
-    if(!(md5str = (char *) cli_calloc(32 + 1, sizeof(char))))
-        return NULL;
-
-    pt = md5str;
-    for(i = 0; i < 16; i++) {
+    pt = hashstr;
+    for(i = 0; i < size; i++) {
         sprintf(pt, "%02x", digest[i]);
         pt += 2;
@@ -710 +743 @@
 
     if(digcpy)
-        memcpy(digcpy, digest, 16);
-
-    return md5str;
-}
-
-char *cli_md5file(const char *filename)
+        memcpy(digcpy, digest, size);
+
+    return hashstr;
+}
+
+char *cli_hashfile(const char *filename, int type)
 {
         FILE *fs;
-        char *md5str;
+        char *hashstr;
 
 
     if((fs = fopen(filename, "rb")) == NULL) {
-        cli_errmsg("cli_md5file(): Can't read file %s\n", filename);
+        cli_errmsg("cli_hashfile(): Can't open file %s\n", filename);
         return NULL;
     }
 
-    md5str = cli_md5stream(fs, NULL);
+    hashstr = cli_hashstream(fs, NULL, type);
+
     fclose(fs);
-
-    return md5str;
+    return hashstr;
 }
 
@@ -1065 +1098 @@
     engine->cb_sigload_ctx = callback ? context : NULL;
 }
+
+void cl_engine_set_clcb_hash(struct cl_engine *engine, clcb_hash callback)
+{
+    engine->cb_hash = callback;
+}