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
69 lines
1.9 KiB
C
69 lines
1.9 KiB
C
/*
|
|
* Copyright (C) 2013-2025 Cisco Systems, Inc. and/or its affiliates. All rights reserved.
|
|
* Copyright (C) 2010-2013 Sourcefire, Inc.
|
|
*
|
|
* Authors: aCaB <acab@clamav.net>
|
|
*
|
|
* 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 __CACHE_H
|
|
#define __CACHE_H
|
|
|
|
#include "clamav.h"
|
|
#include "others.h"
|
|
|
|
/**
|
|
* @brief Add a hash of the current layer to the cache of clean files.
|
|
*
|
|
* @param ctx The scanning context.
|
|
*/
|
|
void clean_cache_add(cli_ctx *ctx);
|
|
|
|
/**
|
|
* @brief Removes a hash from the clean cache
|
|
*
|
|
* @param sha2_256 The file to remove.
|
|
* @param size The size of the file.
|
|
* @param ctx The scanning context.
|
|
*/
|
|
void clean_cache_remove(uint8_t *sha2_256, size_t size, const struct cl_engine *engine);
|
|
|
|
/**
|
|
* @brief Hashes a file onto the provided buffer and looks it up the clean cache.
|
|
*
|
|
* @param hash Hash to check
|
|
* @param ctx
|
|
* @return CL_VIRUS if found, CL_CLEAN if not FIXME or a recoverable error.
|
|
@return CL_EREAD if unrecoverable.
|
|
*/
|
|
cl_error_t clean_cache_check(cli_ctx *ctx);
|
|
|
|
/**
|
|
* @brief Allocates the trees for the clean cache.
|
|
*
|
|
* @param engine
|
|
* @return int
|
|
*/
|
|
cl_error_t clean_cache_init(struct cl_engine *engine);
|
|
|
|
/**
|
|
* @brief Frees the clean cache
|
|
*
|
|
* @param engine
|
|
*/
|
|
void clean_cache_destroy(struct cl_engine *engine);
|
|
|
|
#endif
|