diff --git a/CMakeLists.txt b/CMakeLists.txt index ff0f67f0d7..573f7b7730 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ cmake_policy(SET CMP0087 NEW) # support generator expressions in install(CODE) a # For release candidate: set(VERSION_SUFFIX "-rc") # For release: set(VERSION_SUFFIX "") string(TIMESTAMP TODAY "%Y%m%d") -set(VERSION_SUFFIX "-devel-${TODAY}") +set(VERSION_SUFFIX "-rc") project( ClamAV VERSION "1.4.0" @@ -36,16 +36,16 @@ set(PACKAGE_URL "https://www.clamav.net/") HexVersion(PACKAGE_VERSION_NUM ${PROJECT_VERSION_MAJOR} ${PROJECT_VERSION_MINOR} ${PROJECT_VERSION_PATCH}) # libtool library versioning rules: http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -set(LIBCLAMAV_CURRENT 12) -set(LIBCLAMAV_REVISION 2) -set(LIBCLAMAV_AGE 0) +set(LIBCLAMAV_CURRENT 13) +set(LIBCLAMAV_REVISION 0) +set(LIBCLAMAV_AGE 1) math(EXPR LIBCLAMAV_SOVERSION "${LIBCLAMAV_CURRENT} - ${LIBCLAMAV_AGE}") set(LIBCLAMAV_VERSION "${LIBCLAMAV_SOVERSION}.${LIBCLAMAV_AGE}.${LIBCLAMAV_REVISION}") HexVersion(LIBCLAMAV_VERSION_NUM ${LIBCLAMAV_CURRENT} ${LIBCLAMAV_REVISION} ${LIBCLAMAV_AGE}) set(LIBFRESHCLAM_CURRENT 3) -set(LIBFRESHCLAM_REVISION 1) +set(LIBFRESHCLAM_REVISION 2) set(LIBFRESHCLAM_AGE 0) math(EXPR LIBFRESHCLAM_SOVERSION "${LIBFRESHCLAM_CURRENT} - ${LIBFRESHCLAM_AGE}") diff --git a/Cargo.lock b/Cargo.lock index d7d9707a6d..abb104e5d3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -40,9 +40,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "base64" @@ -69,7 +69,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.58", + "syn 2.0.60", "which", ] @@ -154,9 +154,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.94" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" +checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" [[package]] name = "cexpr" @@ -175,15 +175,13 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", - "js-sys", "num-traits", - "wasm-bindgen", "windows-targets", ] @@ -299,9 +297,9 @@ dependencies = [ [[package]] name = "delharc" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f420b1ede12094758715adaee221d93cb2af86dc499cef368ef81a23fea96029" +checksum = "1c93ba2617f5094875af777b3e1e5d66e79d7c832e4ae2e25722c965a482e5a1" dependencies = [ "bitflags 2.5.0", "chrono", @@ -372,9 +370,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fdeflate" @@ -387,9 +385,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -586,9 +584,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "libloading" @@ -608,9 +606,9 @@ checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -674,9 +672,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -730,12 +728,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" +checksum = "5ac2cf0f2e4f42b49f5ffd07dae8d746508ef7526c13940e5f524012ae6c6550" dependencies = [ "proc-macro2", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -749,9 +747,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -855,9 +853,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.5.0", "errno", @@ -880,29 +878,29 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "itoa", "ryu", @@ -977,9 +975,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.58" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -1000,22 +998,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", ] [[package]] @@ -1105,7 +1103,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", "wasm-bindgen-shared", ] @@ -1127,7 +1125,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.60", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/NEWS.md b/NEWS.md index 70fa4ecaed..6eb8e080e0 100644 --- a/NEWS.md +++ b/NEWS.md @@ -9,13 +9,147 @@ ClamAV 1.4.0 includes the following improvements and changes: ### Major changes +- Added support for extracting ALZ archives. + The new ClamAV file type for ALZ archives is `CL_TYPE_ALZ`. + Added a [DCONF](https://docs.clamav.net/manual/Signatures/DynamicConfig.html) + option to enable or disable ALZ archive support. + > _Tip_: DCONF (Dynamic CONFiguration) is a feature that allows for some + > configuration changes to be made via ClamAV `.cfg` "signatures". + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1183) + +- Added support for extracting LHA/LZH archives. + The new ClamAV file type for ALZ archives is `CL_TYPE_LHA_LZH`. + Added a [DCONF](https://docs.clamav.net/manual/Signatures/DynamicConfig.html) + option to enable or disable LHA/LZH archive support. + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1192) + +- Added the ability to disable image fuzzy hashing, if needed. For context, + image fuzzy hashing is a detection mechanism useful for identifying malware + by matching images included with the malware or phishing email/document. + + New ClamScan options: + ``` + --scan-image[=yes(*)/no] + --scan-image-fuzzy-hash[=yes(*)/no] + ``` + + New ClamD config options: + ``` + ScanImage yes(*)/no + ScanImageFuzzyHash yes(*)/no + ``` + + New libclamav scan options: + ```c + options.parse &= ~CL_SCAN_PARSE_IMAGE; + options.parse &= ~CL_SCAN_PARSE_IMAGE_FUZZY_HASH; + ``` + + Added a [DCONF](https://docs.clamav.net/manual/Signatures/DynamicConfig.html) + option to enable or disable image fuzzy hashing support. + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1186) + ### Other improvements +- Added cross-compiling instructions for targeting ARM64/aarch64 processors for + [Windows](https://github.com/Cisco-Talos/clamav/blob/main/INSTALL-cross-windows-arm64.md) + and + [Linux](https://github.com/Cisco-Talos/clamav/blob/main/INSTALL-cross-linux-arm64.md). + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1116) + +- Improved the Freshclam warning messages when being blocked or rate limited + so as to include the Cloudflare Ray ID, which helps with issue triage. + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1195) + +- Removed unnecessary memory allocation checks when the size to be allocated + is fixed or comes from a trusted source. + We also renamed internal memory allocation functions and macros, so it is + more obvious what each function does. + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1137) + +- Improved the Freshclam documentation to make it clear that the `--datadir` + option must be an absolute path to a directory that already exists, is + writable by Freshclam, and is readable by ClamScan and ClamD. + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1199) + +- Added an optimization to avoid calculating the file hash if the clean file + cache has been disabled. The file hash may still be calculated as needed to + perform hash-based signature matching if any hash-based signatures exist that + target a file of the same size, or if any hash-based signatures exist that + target "any" file size. + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1167) + +- Added an improvement to the SystemD service file for ClamOnAcc so that the + service will shut down faster on some systems. + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1164) + ### Bug fixes +- Silenced confusing warning message when scanning some HTML files. + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1252) + +- Fixed minor compiler warnings. + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1197) + +- Since the build system changed from Autotools to CMake, ClamAV no longer + supports building with configurations where bzip2, libxml2, libz, libjson-c, + or libpcre2 are not available. Libpcre is no longer supported in favor of + libpcre2. In this release, we removed all the dead code associated with those + unsupported build configurations. + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1217) + +- Fixed assorted typos. Patch courtesy of RainRat. + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1228) + +- Added missing documentation for the ClamScan `--force-to-disk` option. + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1186) + +- Fixed an issue where ClamAV unit tests would prefer an older + libclamunrar_iface library from the install path, if present, rather than + the recently compiled library in the build path. + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1258) + ### Acknowledgments Special thanks to the following people for code contributions and bug reports: +- RainRat + +## 1.3.1 + +ClamAV 1.3.1 is a critical patch release with the following fixes: + +- [CVE-2024-20380](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-20380): + Fixed a possible crash in the HTML file parser that could cause a + denial-of-service (DoS) condition. + + This issue affects version 1.3.0 only and does not affect prior versions. + + Thank you to Błażej Pawłowski for identifying this issue. + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1242) + +- Updated select Rust dependencies to the latest versions. + This resolved Cargo audit complaints and included PNG parser bug fixes. + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1227) + +- Fixed a bug causing some text to be truncated when converting from UTF-16. + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1230) + +- Fixed assorted complaints identified by Coverity static analysis. + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1235) + +- Fixed a bug causing CVDs downloaded by the `DatabaseCustomURL` Freshclam + config option to be pruned and then re-downloaded with every update. + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1238) + +- Added the new 'valhalla' database name to the list of optional databases in + preparation for future work. + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1238) + +- Added symbols to the `libclamav.map` file to enable additional build + configurations. + + Patch courtesy of Neil Wilson. + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1244) ## 1.3.0 @@ -111,6 +245,32 @@ Special thanks to the following people for code contributions and bug reports: - RainRat - teoberi +## 1.2.3 + +ClamAV 1.2.3 is a critical patch release with the following fixes: + +- Updated select Rust dependencies to the latest versions. + This resolved Cargo audit complaints and included PNG parser bug fixes. + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1226) + +- Fixed a bug causing some text to be truncated when converting from UTF-16. + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1231) + +- Fixed assorted complaints identified by Coverity static analysis. + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1236) + +- Fixed a bug causing CVDs downloaded by the `DatabaseCustomURL` Freshclam + config option to be pruned and then re-downloaded with every update. + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1239) + +- Added the new 'valhalla' database name to the list of optional databases in + preparation for future work. + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1239) + +- Silenced a warning "Unexpected early end-of-file" that occured when + scanning some PNG files. + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1215) + ## 1.2.2 ClamAV 1.2.2 is a critical patch release with the following fix: @@ -549,6 +709,32 @@ Special thanks to the following people for code contributions and bug reports: - Sebastian Andrzej Siewior - The OSS-Fuzz project +## 1.0.6 + +ClamAV 1.0.6 is a critical patch release with the following fixes: + +- Updated select Rust dependencies to the latest versions. + This resolved Cargo audit complaints and included PNG parser bug fixes. + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1225) + +- Fixed a bug causing some text to be truncated when converting from UTF-16. + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1232) + +- Fixed assorted complaints identified by Coverity static analysis. + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1237) + +- Fixed a bug causing CVDs downloaded by the `DatabaseCustomURL` Freshclam + config option to be pruned and then re-downloaded with every update. + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1240) + +- Added the new 'valhalla' database name to the list of optional databases in + preparation for future work. + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1240) + +- Silenced a warning "Unexpected early end-of-file" that occured when + scanning some PNG files. + - [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1216) + ## 1.0.5 ClamAV 1.0.5 is a critical patch release with the following fixes: diff --git a/libclamav/bytecode_api.h b/libclamav/bytecode_api.h index 6d9ba85db1..63b730f493 100644 --- a/libclamav/bytecode_api.h +++ b/libclamav/bytecode_api.h @@ -154,6 +154,9 @@ enum FunctionalityLevels { FUNC_LEVEL_0103_6 = 127, /**< LibClamAV release 0.103.6 */ FUNC_LEVEL_0103_7 = 128, /**< LibClamAV release 0.103.7 */ FUNC_LEVEL_0103_8 = 129, /**< LibClamAV release 0.103.8 */ + FUNC_LEVEL_0103_9 = 130, /**< LibClamAV release 0.103.9 */ + FUNC_LEVEL_0103_10 = 131, /**< LibClamAV release 0.103.10 */ + FUNC_LEVEL_0103_11 = 132, /**< LibClamAV release 0.103.11 */ FUNC_LEVEL_0104 = 140, /**< LibClamAV release 0.104.0 */ FUNC_LEVEL_0104_1 = 141, /**< LibClamAV release 0.104.1 */ @@ -171,6 +174,7 @@ enum FunctionalityLevels { FUNC_LEVEL_1_0_3 = 163, /**< LibClamAV release 1.0.3 */ FUNC_LEVEL_1_0_4 = 164, /**< LibClamAV release 1.0.4 */ FUNC_LEVEL_1_0_5 = 165, /**< LibClamAV release 1.0.5 */ + FUNC_LEVEL_1_0_6 = 166, /**< LibClamAV release 1.0.6 */ FUNC_LEVEL_1_1 = 180, /**< LibClamAV release 1.1.0 */ FUNC_LEVEL_1_1_1 = 181, /**< LibClamAV release 1.1.1 */ @@ -180,8 +184,10 @@ enum FunctionalityLevels { FUNC_LEVEL_1_2 = 190, /**< LibClamAV release 1.2.0 */ FUNC_LEVEL_1_2_1 = 191, /**< LibClamAV release 1.2.1 */ FUNC_LEVEL_1_2_2 = 192, /**< LibClamAV release 1.2.2 */ + FUNC_LEVEL_1_2_3 = 193, /**< LibClamAV release 1.2.3 */ - FUNC_LEVEL_1_3 = 200, /**< LibClamAV release 1.3.0 */ + FUNC_LEVEL_1_3 = 200, /**< LibClamAV release 1.3.0 */ + FUNC_LEVEL_1_3_1 = 201, /**< LibClamAV release 1.3.1 */ FUNC_LEVEL_1_4 = 210, /**< LibClamAV release 1.4.0 */ }; diff --git a/libclamav_rust/Cargo.toml b/libclamav_rust/Cargo.toml index a579248b30..526951c519 100644 --- a/libclamav_rust/Cargo.toml +++ b/libclamav_rust/Cargo.toml @@ -25,7 +25,7 @@ hex-literal = "0.4" inflate = "0.4" bzip2-rs = "0.1" byteorder = "1.5" -delharc = "0.5" +delharc = "0.6" [lib] crate-type = ["staticlib"] diff --git a/libfreshclam/libfreshclam.h b/libfreshclam/libfreshclam.h index bda51d2755..25d7293fef 100644 --- a/libfreshclam/libfreshclam.h +++ b/libfreshclam/libfreshclam.h @@ -238,9 +238,6 @@ fc_error_t fc_update_databases( void *context, uint32_t *nUpdated); -/*Length of a cf-ray id.*/ -#define CFRAY_LEN 20 - /* ---------------------------------------------------------------------------- * Callback function type definitions. */ diff --git a/libfreshclam/libfreshclam_internal.h b/libfreshclam/libfreshclam_internal.h index b5a588a9be..3683135633 100644 --- a/libfreshclam/libfreshclam_internal.h +++ b/libfreshclam/libfreshclam_internal.h @@ -40,6 +40,9 @@ typedef struct _freshclam_dat_v1 { time_t retry_after; /** retry date. If > 0, don't update until after this date */ } freshclam_dat_v1_t; +/*Length of a cf-ray id.*/ +#define CFRAY_LEN 20 + /* ---------------------------------------------------------------------------- * Internal libfreshclam globals */