mirror of
https://github.com/Cisco-Talos/clamav.git
synced 2025-10-19 10:23:17 +00:00
aa7b7e9421
Change the clean-cache to use SHA2-256 instead of MD5. Note that all references are changed to specify "SHA2-256" now instead of "SHA256", for clarity. But there is no plan to add support for SHA3 algorithms at this time. Significant code cleanup. E.g.: - Implemented goto-done error handling. - Used `uint8_t *` instead of `unsigned char *`. - Use `bool` for boolean checks, rather than `int. - Used `#defines` instead of magic numbers. - Removed duplicate `#defines` for things like hash length. Add new option to calculate and record additional hash types when the "generate metadata JSON" feature is enabled: - libclamav option: `CL_SCAN_GENERAL_STORE_EXTRA_HASHES` - clamscan option: `--json-store-extra-hashes` (default off) - clamd.conf option: `JsonStoreExtraHashes` (default 'no') Renamed the sigtool option `--sha256` to `--sha2-256`. The original option is still functional, but is deprecated. For the "generate metadata JSON" feature, the file hash is now stored as "sha2-256" instead of "FileMD5". If you enable the "extra hashes" option, then it will also record "md5" and "sha1". Deprecate and disable the internal "SHA collect" feature. This option had been hidden behind C #ifdef checks for an option that wasn't exposed through CMake, so it was basically unavailable anyways. Changes to calculate file hashes when they're needed and no sooner. For the FP feature in the matcher module, I have mimiced the optimization in the FMAP scan routine which makes it so that it can calculate multiple hashes in a single pass of the file. The `HandlerType` feature stores a hash of the file in the scan ctx to prevent retyping the exact same data more than once. I removed that hash field and replaced it with an attribute flag that is applied to the new recursion stack layer when retyping a file. This also closes a minor bug that would prevent retyping a file with an all-zero hash. :) The work upgrading cache.c to support SHA2-256 sized hashes thanks to: https://github.com/m-sola CLAM-255 CLAM-1858 CLAM-1859 CLAM-1860
70 lines
2.5 KiB
C
70 lines
2.5 KiB
C
/*
|
|
* Match a string against a list of patterns/regexes.
|
|
*
|
|
* Copyright (C) 2013-2025 Cisco Systems, Inc. and/or its affiliates. All rights reserved.
|
|
* Copyright (C) 2007-2013 Sourcefire, Inc.
|
|
*
|
|
* Authors: Török Edvin
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
|
* MA 02110-1301, USA.
|
|
*/
|
|
|
|
#ifndef _REGEX_LIST_H
|
|
#define _REGEX_LIST_H
|
|
|
|
#include "phishcheck.h"
|
|
#include "readdb.h"
|
|
#include "matcher.h"
|
|
#include "filtering.h"
|
|
#include "hashtab.h"
|
|
#include <zlib.h> /* for gzFile */
|
|
|
|
#include "mpool.h"
|
|
|
|
struct regex_list_ht {
|
|
struct regex_list* head;
|
|
struct regex_list* tail;
|
|
};
|
|
|
|
struct regex_matcher {
|
|
struct cli_hashtable suffix_hash;
|
|
size_t suffix_cnt;
|
|
struct regex_list_ht* suffix_regexes;
|
|
size_t root_regex_idx;
|
|
size_t regex_cnt;
|
|
regex_t** all_pregs;
|
|
struct cli_matcher suffixes;
|
|
struct cli_matcher sha2_256_hashes;
|
|
struct cli_hashset sha2_256_pfx_set;
|
|
struct cli_matcher hostkey_prefix;
|
|
struct filter filter;
|
|
#ifdef USE_MPOOL
|
|
mpool_t* mempool;
|
|
#endif
|
|
int list_inited : 2;
|
|
int list_loaded : 2;
|
|
int list_built : 2;
|
|
};
|
|
|
|
cl_error_t cli_build_regex_list(struct regex_matcher* matcher);
|
|
cl_error_t regex_list_add_pattern(struct regex_matcher* matcher, char* pattern);
|
|
cl_error_t regex_list_match(struct regex_matcher* matcher, char* real_url, const char* display_url, const struct pre_fixup_info* pre_fixup, int hostOnly, const char** info, int is_allow_list_lookup);
|
|
cl_error_t init_regex_list(struct regex_matcher* matcher, uint8_t dconf_prefiltering);
|
|
cl_error_t load_regex_matcher(struct cl_engine* engine, struct regex_matcher* matcher, FILE* fd, unsigned int* signo, unsigned int options, int is_allow_list_lookup, struct cli_dbio* dbio, uint8_t dconf_prefiltering);
|
|
void regex_list_cleanup(struct regex_matcher* matcher);
|
|
void regex_list_done(struct regex_matcher* matcher);
|
|
int is_regex_ok(struct regex_matcher* matcher);
|
|
|
|
#endif
|