@@ -1,3 +1,8 @@

+Mon Mar  9 13:22:35 EET 2009 (edwin)

+------------------------------------

+ * libclamav/phishcheck.c, libclamav/regex_list.c,

+ unit_tests/input/daily.gdb: allow for hash prefixes.

+

 Fri Mar  6 19:22:27 EET 2009 (edwin)

 ------------------------------------

  * libclamav/phishcheck.c: update name

@@ -1186,13 +1186,22 @@ static int hash_match(const struct regex_matcher *rlist, const char *host, size_

 	cli_dbgmsg("hash lookup for: %s\n",s);

 #endif

 	if(rlist->sha256_hashes.bm_patterns) {

+	    const char hexchars[] = "0123456789ABCDEF";

+	    unsigned char h[65];

 	    unsigned char sha256_dig[32];

+	    unsigned i;

 	    SHA256_CTX sha256;

 	    sha256_init(&sha256);

 	    sha256_update(&sha256, host, hlen);

 	    sha256_update(&sha256, path, plen);

 	    sha256_final(&sha256, sha256_dig);

+	    for(i=0;i<32;i++) {

+		h[2*i] = hexchars[sha256_dig[i]>>4];

+		h[2*i+1] = hexchars[sha256_dig[i]&0xf];

+	    }

+	    h[64]='\0';

+	    cli_dbgmsg("Looking up hash %s for %s%s\n", h, host, path);

 	    if(SO_search(&rlist->sha256_filter, sha256_dig, 32) != -1 &&

 	       cli_bm_scanbuff(sha256_dig, 32, &virname, &rlist->sha256_hashes,0,0,-1) == CL_VIRUS) {

 		switch(*virname) {

@@ -542,9 +542,18 @@ int load_regex_matcher(struct regex_matcher* matcher,FILE* fd,unsigned int *sign

 				return rc==CL_EMEM ? CL_EMEM : CL_EMALFDB;

 		} else if (buffer[0] == 'S' && !is_whitelist) {

 			pattern[pattern_len] = '\0';

-			if (( rc = add_hash(matcher, pattern, flags[0]) )) {

+			if(*pattern=='F' && pattern[1]==':') {

+			    pattern += 2;

+			    if (( rc = add_hash(matcher, pattern, flags[0]) )) {

 				cli_errmsg("Error loading at line: %d\n", line);

 				return rc==CL_EMEM ? CL_EMEM : CL_EMALFDB;

+			    }

+			} else if (*pattern=='P' && pattern[1]==':') {

+			    pattern += 2;

+			    /* TODO: hostkey prefix */

+			} else {

+			    cli_errmsg("Error loading line: %d, %c\n", line, *pattern);

+			    return CL_EMALFDB;

 			}

 		} else {

 			return CL_EMALFDB;

@@ -1,2 +1,2 @@

-S:d1b8a0251d7555d016b6468ae623e4b1e830c7efccc54966d09447a3d0a85c60

-S2:7f6fd541e625e7bc5d5a64f166e47ecfe13735464a74d160b48265c162a71089

+S:F:d1b8a0251d7555d016b6468ae623e4b1e830c7efccc54966d09447a3d0a85c60

+S2:F:7f6fd541e625e7bc5d5a64f166e47ecfe13735464a74d160b48265c162a71089