Merge pull request #1331 from micahsnyder/CLAM-2638-1.0.7-and-backports

Clam 2638 1.0.7 and backports
9 months ago · ea46d8f240
parent b977f2e3b2 acf717dae2
commit ea46d8f240
55 changed files with 321 additions and 165 deletions
--- a/.clang-format
+++ b/.clang-format
@ -2,40 +2,65 @@
 Language:        Cpp
 AccessModifierOffset: -2
 AlignAfterOpenBracket: Align
-AlignConsecutiveMacros: false
-AlignConsecutiveAssignments: true
-AlignConsecutiveBitFields: false
-AlignConsecutiveDeclarations: false
+AlignArrayOfStructures: None
+AlignConsecutiveAssignments:
+  Enabled:         true
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  PadOperators:    true
+AlignConsecutiveBitFields:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  PadOperators:    false
+AlignConsecutiveDeclarations:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  PadOperators:    false
+AlignConsecutiveMacros:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  PadOperators:    false
 AlignEscapedNewlines: Left
 AlignOperands:   Align
-AlignTrailingComments: true
+AlignTrailingComments:
+  Kind:            Always
+  OverEmptyLines:  0
 AllowAllArgumentsOnNextLine: true
-AllowAllConstructorInitializersOnNextLine: true
 AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortEnumsOnASingleLine: true
 AllowShortBlocksOnASingleLine: Never
 AllowShortCaseLabelsOnASingleLine: false
+AllowShortEnumsOnASingleLine: true
 AllowShortFunctionsOnASingleLine: Empty
-AllowShortLambdasOnASingleLine: All
 AllowShortIfStatementsOnASingleLine: WithoutElse
+AllowShortLambdasOnASingleLine: All
 AllowShortLoopsOnASingleLine: true
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: MultiLine
+AttributeMacros:
+  - __capability
 BinPackArguments: true
 BinPackParameters: true
+BitFieldColonSpacing: Both
 BraceWrapping:
  AfterCaseLabel:  false
  AfterClass:      true
  AfterControlStatement: Never
  AfterEnum:       false
+  AfterExternBlock: false
  AfterFunction:   true
  AfterNamespace:  true
  AfterObjCDeclaration: false
  AfterStruct:     false
  AfterUnion:      false
-  AfterExternBlock: false
  BeforeCatch:     false
  BeforeElse:      false
  BeforeLambdaBody: false
@ -44,55 +69,75 @@ BraceWrapping:
  SplitEmptyFunction: true
  SplitEmptyRecord: true
  SplitEmptyNamespace: true
+BreakAfterAttributes: Never
+BreakAfterJavaFieldAnnotations: false
+BreakArrays:     true
 BreakBeforeBinaryOperators: None
+BreakBeforeConceptDeclarations: Always
 BreakBeforeBraces: Linux
-BreakBeforeInheritanceComma: false
-BreakInheritanceList: BeforeColon
+BreakBeforeInlineASMColon: OnlyMultiline
 BreakBeforeTernaryOperators: true
-BreakConstructorInitializersBeforeComma: false
 BreakConstructorInitializers: BeforeColon
-BreakAfterJavaFieldAnnotations: false
+BreakInheritanceList: BeforeColon
 BreakStringLiterals: true
 ColumnLimit:     0
 CommentPragmas:  '^ IWYU pragma:'
 CompactNamespaces: false
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
-DeriveLineEnding: true
 DerivePointerAlignment: true
 DisableFormat:   false
+EmptyLineAfterAccessModifier: Never
+EmptyLineBeforeAccessModifier: LogicalBlock
 ExperimentalAutoDetectBinPacking: false
 FixNamespaceComments: true
 ForEachMacros:
  - foreach
  - Q_FOREACH
  - BOOST_FOREACH
+IfMacros:
+  - KJ_IF_MAYBE
 IncludeBlocks:   Preserve
 IncludeCategories:
  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
    Priority:        2
    SortPriority:    0
+    CaseSensitive:   false
  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
    Priority:        3
    SortPriority:    0
+    CaseSensitive:   false
  - Regex:           '.*'
    Priority:        1
    SortPriority:    0
+    CaseSensitive:   false
 IncludeIsMainRegex: '(Test)?$'
 IncludeIsMainSourceRegex: ''
-IndentCaseLabels: true
+IndentAccessModifiers: false
 IndentCaseBlocks: false
+IndentCaseLabels: true
+IndentExternBlock: AfterExternBlock
 IndentGotoLabels: true
 IndentPPDirectives: None
-IndentExternBlock: AfterExternBlock
+IndentRequiresClause: true
 IndentWidth:     4
 IndentWrappedFunctionNames: false
+InsertBraces:    false
+InsertNewlineAtEOF: false
 InsertTrailingCommas: None
+IntegerLiteralSeparator:
+  Binary:          0
+  BinaryMinDigits: 0
+  Decimal:         0
+  DecimalMinDigits: 0
+  Hex:             0
+  HexMinDigits:    0
 JavaScriptQuotes: Leave
 JavaScriptWrapImports: true
 KeepEmptyLinesAtTheStartOfBlocks: true
+LambdaBodyIndentation: Signature
+LineEnding:      DeriveLF
 MacroBlockBegin: ''
 MacroBlockEnd:   ''
 MaxEmptyLinesToKeep: 1
@ -102,47 +147,78 @@ ObjCBlockIndentWidth: 2
 ObjCBreakBeforeNestedBlockParam: true
 ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: true
+PackConstructorInitializers: BinPack
 PenaltyBreakAssignment: 2
 PenaltyBreakBeforeFirstCallParameter: 19
 PenaltyBreakComment: 300
 PenaltyBreakFirstLessLess: 120
+PenaltyBreakOpenParenthesis: 0
 PenaltyBreakString: 1000
 PenaltyBreakTemplateDeclaration: 10
 PenaltyExcessCharacter: 1000000
+PenaltyIndentedWhitespace: 0
 PenaltyReturnTypeOnItsOwnLine: 60
 PointerAlignment: Right
+PPIndentWidth:   -1
+QualifierAlignment: Leave
+ReferenceAlignment: Pointer
 ReflowComments:  true
-SortIncludes:    false
-SortUsingDeclarations: true
+RemoveBracesLLVM: false
+RemoveSemicolon: false
+RequiresClausePosition: OwnLine
+RequiresExpressionIndentation: OuterScope
+SeparateDefinitionBlocks: Leave
+ShortNamespaceLines: 1
+SortIncludes:    Never
+SortJavaStaticImport: Before
+SortUsingDeclarations: LexicographicNumeric
 SpaceAfterCStyleCast: false
 SpaceAfterLogicalNot: false
 SpaceAfterTemplateKeyword: true
+SpaceAroundPointerQualifiers: Default
 SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
 SpaceBeforeCpp11BracedList: false
 SpaceBeforeCtorInitializerColon: true
 SpaceBeforeInheritanceColon: true
 SpaceBeforeParens: ControlStatements
+SpaceBeforeParensOptions:
+  AfterControlStatements: true
+  AfterForeachMacros: true
+  AfterFunctionDefinitionName: false
+  AfterFunctionDeclarationName: false
+  AfterIfMacros:   true
+  AfterOverloadedOperator: false
+  AfterRequiresInClause: false
+  AfterRequiresInExpression: false
+  BeforeNonEmptyParentheses: false
 SpaceBeforeRangeBasedForLoopColon: true
+SpaceBeforeSquareBrackets: false
 SpaceInEmptyBlock: false
 SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 1
-SpacesInAngles:  false
+SpacesInAngles:  Never
 SpacesInConditionalStatement: false
 SpacesInContainerLiterals: true
 SpacesInCStyleCastParentheses: false
+SpacesInLineCommentPrefix:
+  Minimum:         1
+  Maximum:         -1
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
-SpaceBeforeSquareBrackets: false
 Standard:        Latest
+StatementAttributeLikeMacros:
+  - Q_EMIT
 StatementMacros:
  - Q_UNUSED
  - QT_REQUIRE_VERSION
 TabWidth:        8
-UseCRLF:         false
 UseTab:          Never
 WhitespaceSensitiveMacros:
-  - STRINGIZE
-  - PP_STRINGIZE
  - BOOST_PP_STRINGIZE
+  - CF_SWIFT_NAME
+  - NS_SWIFT_NAME
+  - PP_STRINGIZE
+  - STRINGIZE
 ...

--- a/.github/workflows/clang-format.yml
+++ b/.github/workflows/clang-format.yml
@ -56,10 +56,10 @@ jobs:
          - check: "win32/compat"
            exclude: ""
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
      - name: Run clang-format style check for C/C++ programs.
-        uses: jidicula/clang-format-action@v4.4.1
+        uses: jidicula/clang-format-action@v4.13.0
        with:
-          clang-format-version: "11"
+          clang-format-version: "16"
          check-path: ${{ matrix.path['check'] }}
          exclude-regex: ${{ matrix.path['exclude'] }}
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@ -28,17 +28,17 @@ jobs:
        run: rm /usr/bin/link.exe
        shell: bash

-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4

      - name: Install Build Tools
-        uses: crazy-max/ghaction-chocolatey@v1
+        uses: crazy-max/ghaction-chocolatey@v3
        with:
          args: install wixtoolset

      - name: Install pytest for easier to read test results
        run: python3 -m pip install pytest

-      - uses: lukka/get-cmake@v3.21.2
+      - uses: lukka/get-cmake@v3.30.0

      # Restore from cache the previously built ports. If cache-miss, download, build vcpkg ports.
      - name: Restore vcpkg ports from cache or install vcpkg
@ -90,7 +90,7 @@ jobs:
    runs-on: macos-latest

    steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4

      - name: Install Build Tools
        run: brew install bison flex
@ -101,7 +101,7 @@ jobs:
      - name: Install pytest for easier to read test results
        run: python3 -m pip install pytest

-      - uses: lukka/get-cmake@v3.21.2
+      - uses: lukka/get-cmake@v3.30.0

      - name: Create Build Directory
        shell: bash
@ -141,7 +141,7 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4

      - name: Update package listings
        run: sudo apt-get update
@ -155,7 +155,7 @@ jobs:
      - name: Install pytest for easier to read test results
        run: python3 -m pip install pytest

-      - uses: lukka/get-cmake@v3.21.2
+      - uses: lukka/get-cmake@v3.30.0

      - name: Create Build Directory
        shell: bash
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -22,7 +22,7 @@ string(TIMESTAMP TODAY "%Y%m%d")
 set(VERSION_SUFFIX "")

 project( ClamAV
-         VERSION "1.0.6"
+         VERSION "1.0.7"
         DESCRIPTION "ClamAV open source email, web, and end-point anti-virus toolkit." )

 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
--- a/88
+++ b/88
@ -10,23 +10,32 @@ properties(
        parameters(
            [
                string(name: 'VERSION',
-                       defaultValue: '1.0.6',
+                       defaultValue: '1.0.7',
                       description: 'ClamAV version string'),
                string(name: 'FRAMEWORK_BRANCH',
                       defaultValue: '1.0',
                       description: 'test-framework branch'),
                string(name: 'TESTS_BRANCH',
                       defaultValue: '1.0',
-                       description: 'tests branch'),
+                       description: 'tests branch for the package and regular tests'),
                string(name: 'TESTS_CUSTOM_BRANCH',
                       defaultValue: '1.0',
                       description: 'tests-custom branch'),
                string(name: 'TESTS_FUZZ_BRANCH',
                       defaultValue: '1.0',
                       description: 'tests-fuzz-regression branch'),
+                string(name: 'BUILD_PIPELINES_PATH',
+                       defaultValue: 'ClamAV/build-pipelines',
+                       description: 'build-pipelines path for clamav in Jenkins'),
+                string(name: 'TEST_PIPELINES_PATH',
+                       defaultValue: 'ClamAV/test-pipelines',
+                       description: 'test-pipelines path for clamav in Jenkins'),
                string(name: 'BUILD_PIPELINE',
                       defaultValue: 'build-1.0',
                       description: 'test-pipelines branch for build acceptance'),
+                string(name: 'PACKAGE_PIPELINE',
+                       defaultValue: 'package-1.0',
+                       description: 'test-pipelines branch for package tests.'),
                string(name: 'REGULAR_PIPELINE',
                       defaultValue: 'regular-1.0',
                       description: 'test-pipelines branch for regular tests.'),
@ -50,7 +59,7 @@ properties(
    ]
 )

-node('master') {
+node('default') {
    stage('Generate Tarball') {
        cleanWs()

@ -71,7 +80,27 @@ node('master') {

        dir(path: 'build') {
            sh """# CPack
-                cmake .. -D VENDOR_DEPENDENCIES=ON
+                cmake .. -D VENDOR_DEPENDENCIES=ON \
+                    -D JSONC_INCLUDE_DIR="$HOME/.mussels/install/host-static/include/json-c" \
+                    -D JSONC_LIBRARY="$HOME/.mussels/install/host-static/lib/libjson-c.a" \
+                    -D ENABLE_JSON_SHARED=OFF \
+                    -D BZIP2_INCLUDE_DIR="$HOME/.mussels/install/host-static/include" \
+                    -D BZIP2_LIBRARY_RELEASE="$HOME/bzip2-1.0.8-install/lib/libbz2.a" \
+                    -D OPENSSL_ROOT_DIR="$HOME/.mussels/install/host-static" \
+                    -D OPENSSL_INCLUDE_DIR="$HOME/.mussels/install/host-static/include" \
+                    -D OPENSSL_CRYPTO_LIBRARY="$HOME/.mussels/install/host-static/lib/libcrypto.a" \
+                    -D OPENSSL_SSL_LIBRARY="$HOME/.mussels/install/host-static/lib/libssl.a" \
+                    -D LIBXML2_INCLUDE_DIR="$HOME/.mussels/install/host-static/include/libxml2" \
+                    -D LIBXML2_LIBRARY="$HOME/.mussels/install/host-static/lib/libxml2.a" \
+                    -D PCRE2_INCLUDE_DIR="$HOME/.mussels/install/host-static/include" \
+                    -D PCRE2_LIBRARY="$HOME/.mussels/install/host-static/lib/libpcre2-8.a" \
+                    -D CURSES_INCLUDE_DIR="$HOME/.mussels/install/host-static/include" \
+                    -D CURSES_LIBRARY="$HOME/.mussels/install/host-static/lib/libncurses.a;$HOME/.mussels/install/host-static/lib/libtinfo.a" \
+                    -D ZLIB_INCLUDE_DIR="$HOME/.mussels/install/host-static/include" \
+                    -D ZLIB_LIBRARY="$HOME/.mussels/install/host-static/lib/libz.a" \
+                    -D LIBCHECK_INCLUDE_DIR="$HOME/.mussels/install/host-static/include" \
+                    -D LIBCHECK_LIBRARY="$HOME/.mussels/install/host-static/lib/libcheck.a"
+
                cpack --config CPackSourceConfig.cmake """
            archiveArtifacts(artifacts: "clamav-${params.VERSION}*.tar.gz", onlyIfSuccessful: true)
        }
@ -82,7 +111,7 @@ node('master') {
    def buildResult

    stage('Build') {
-        buildResult = build(job: "test-pipelines/${params.BUILD_PIPELINE}",
+        buildResult = build(job: "${params.BUILD_PIPELINES_PATH}/${params.BUILD_PIPELINE}",
            propagate: true,
            wait: true,
            parameters: [
@ -93,24 +122,23 @@ node('master') {
                [$class: 'StringParameterValue', name: 'SHARED_LIB_BRANCH', value: "${params.SHARED_LIB_BRANCH}"]
            ]
        )
-        echo "test-pipelines/${params.BUILD_PIPELINE} #${buildResult.number} succeeded."
+        echo "${params.BUILD_PIPELINES_PATH}/${params.BUILD_PIPELINE} #${buildResult.number} succeeded."
    }

    stage('Test') {
        def tasks = [:]

-        tasks["regular_and_custom"] = {
-            def regularResult
+        tasks["package_regular_custom"] = {
            def exception = null
            try {
-                stage("Regular Pipeline") {
-                    regularResult = build(job: "test-pipelines/${params.REGULAR_PIPELINE}",
+                stage("Package") {
+                    final regularResult = build(job: "${params.TEST_PIPELINES_PATH}/${params.PACKAGE_PIPELINE}",
                        propagate: true,
                        wait: true,
                        parameters: [
                            [$class: 'StringParameterValue', name: 'CLAMAV_JOB_NAME', value: "${JOB_NAME}"],
                            [$class: 'StringParameterValue', name: 'CLAMAV_JOB_NUMBER', value: "${BUILD_NUMBER}"],
-                            [$class: 'StringParameterValue', name: 'BUILD_JOB_NAME', value: "test-pipelines/${params.BUILD_PIPELINE}"],
+                            [$class: 'StringParameterValue', name: 'BUILD_JOB_NAME', value: "${params.BUILD_PIPELINES_PATH}/${params.BUILD_PIPELINE}"],
                            [$class: 'StringParameterValue', name: 'BUILD_JOB_NUMBER', value: "${buildResult.number}"],
                            [$class: 'StringParameterValue', name: 'TESTS_BRANCH', value: "${params.TESTS_BRANCH}"],
                            [$class: 'StringParameterValue', name: 'FRAMEWORK_BRANCH', value: "${params.FRAMEWORK_BRANCH}"],
@ -118,14 +146,36 @@ node('master') {
                            [$class: 'StringParameterValue', name: 'SHARED_LIB_BRANCH', value: "${params.SHARED_LIB_BRANCH}"]
                        ]
                    )
-                    echo "test-pipelines/${params.REGULAR_PIPELINE} #${regularResult.number} succeeded."
+                    echo "${params.TEST_PIPELINES_PATH}/${params.PACKAGE_PIPELINE} #${regularResult.number} succeeded."
                }
            } catch (exc) {
-                echo "test-pipelines/${params.REGULAR_PIPELINE} failed."
+                echo "${params.TEST_PIPELINES_PATH}/${params.PACKAGE_PIPELINE} failed."
                exception = exc
            }
-            stage("Custom Pipeline") {
-                final customResult = build(job: "test-pipelines/${params.CUSTOM_PIPELINE}",
+
+            try {
+                stage("Regular From-Source") {
+                    final regularResult = build(job: "${params.TEST_PIPELINES_PATH}/${params.REGULAR_PIPELINE}",
+                        propagate: true,
+                        wait: true,
+                        parameters: [
+                            [$class: 'StringParameterValue', name: 'CLAMAV_JOB_NAME', value: "${JOB_NAME}"],
+                            [$class: 'StringParameterValue', name: 'CLAMAV_JOB_NUMBER', value: "${BUILD_NUMBER}"],
+                            [$class: 'StringParameterValue', name: 'TESTS_BRANCH', value: "${params.TESTS_BRANCH}"],
+                            [$class: 'StringParameterValue', name: 'FRAMEWORK_BRANCH', value: "${params.FRAMEWORK_BRANCH}"],
+                            [$class: 'StringParameterValue', name: 'VERSION', value: "${params.VERSION}"],
+                            [$class: 'StringParameterValue', name: 'SHARED_LIB_BRANCH', value: "${params.SHARED_LIB_BRANCH}"]
+                        ]
+                    )
+                    echo "${params.TEST_PIPELINES_PATH}/${params.REGULAR_PIPELINE} #${regularResult.number} succeeded."
+                }
+            } catch (exc) {
+                echo "${params.TEST_PIPELINES_PATH}/${params.REGULAR_PIPELINE} failed."
+                exception = exc
+            }
+
+            stage("Custom From-Source") {
+                final customResult = build(job: "${params.TEST_PIPELINES_PATH}/${params.CUSTOM_PIPELINE}",
                    propagate: true,
                    wait: true,
                    parameters: [
@ -137,17 +187,17 @@ node('master') {
                        [$class: 'StringParameterValue', name: 'SHARED_LIB_BRANCH', value: "${params.SHARED_LIB_BRANCH}"]
                    ]
                )
-                echo "test-pipelines/${params.CUSTOM_PIPELINE} #${customResult.number} succeeded."
+                echo "${params.TEST_PIPELINES_PATH}/${params.CUSTOM_PIPELINE} #${customResult.number} succeeded."
            }
            if(exception != null) {
-                echo "Custom Pipeline passed, but Regular pipeline failed!"
+                echo "Custom Pipeline passed, but prior pipelines failed!"
                throw exception
            }
        }

        tasks["fuzz_regression"] = {
            stage("Fuzz Regression") {
-                final fuzzResult = build(job: "test-pipelines/${params.FUZZ_PIPELINE}",
+                final fuzzResult = build(job: "${params.TEST_PIPELINES_PATH}/${params.FUZZ_PIPELINE}",
                    propagate: true,
                    wait: true,
                    parameters: [
@ -158,7 +208,7 @@ node('master') {
                        [$class: 'StringParameterValue', name: 'VERSION', value: "${params.VERSION}"]
                    ]
                )
-                echo "test-pipelines/${params.FUZZ_PIPELINE} #${fuzzResult.number} succeeded."
+                echo "${params.TEST_PIPELINES_PATH}/${params.FUZZ_PIPELINE} #${fuzzResult.number} succeeded."
            }
        }

--- a/NEWS.md
+++ b/NEWS.md
@ -3,6 +3,26 @@
 Note: This file refers to the official packages. Things described here may
 differ slightly from third-party binary packages.

+## 1.0.7
+
+ClamAV 1.0.7 is a patch release with the following fixes:
+
+- Fix unit test caused by expiring signing certificate.
+  - Backport of [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1305)
+
+- Fixed a build issue on Windows with newer versions of Rust.
+  Also upgraded GitHub Actions imports to fix CI failures.
+  Fixes courtesy of liushuyu.
+  - Backport of [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1307)
+
+- Fixed an unaligned pointer dereference issue on select architectures.
+  Fix courtesy of Sebastian Andrzej Siewior.
+  - Backport of [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1293)
+
+- Fixes to Jenkins CI pipeline.
+
+For details, see [GitHub pull request](https://github.com/Cisco-Talos/clamav/pull/1331)
+
 ## 1.0.6

 ClamAV 1.0.6 is a critical patch release with the following fixes:
--- a/96
+++ b/96
@ -1,54 +1,54 @@
 #!/bin/bash

-clang-format -style='{ Language: Cpp, UseTab: Never, IndentWidth: 4, AlignTrailingComments: true, AlignConsecutiveAssignments: true, AlignAfterOpenBracket: true, AlignEscapedNewlines: Left, AlignOperands: true, AllowShortFunctionsOnASingleLine: Empty, AllowShortIfStatementsOnASingleLine: true, AllowShortLoopsOnASingleLine: true, BreakBeforeBraces: Linux, BreakBeforeTernaryOperators: true, ColumnLimit: 0, FixNamespaceComments: true, SortIncludes: false, MaxEmptyLinesToKeep: 1, SpaceBeforeParens: ControlStatements, IndentCaseLabels: true, DerivePointerAlignment: true }' -dump-config > .clang-format
+clang-format-16 -style='{ Language: Cpp, UseTab: Never, IndentWidth: 4, AlignTrailingComments: true, AlignConsecutiveAssignments: true, AlignAfterOpenBracket: true, AlignEscapedNewlines: Left, AlignOperands: true, AllowShortFunctionsOnASingleLine: Empty, AllowShortIfStatementsOnASingleLine: true, AllowShortLoopsOnASingleLine: true, BreakBeforeBraces: Linux, BreakBeforeTernaryOperators: true, ColumnLimit: 0, FixNamespaceComments: true, SortIncludes: false, MaxEmptyLinesToKeep: 1, SpaceBeforeParens: ControlStatements, IndentCaseLabels: true, DerivePointerAlignment: true }' -dump-config > .clang-format

-clang-format -i -verbose clamav-milter/*.c
-clang-format -i -verbose clamav-milter/*.h
-clang-format -i -verbose clambc/*.c
-clang-format -i -verbose clambc/*.h
-clang-format -i -verbose clamconf/*.c
-clang-format -i -verbose clamconf/*.h
-clang-format -i -verbose clamd/*.c
-clang-format -i -verbose clamd/*.h
-clang-format -i -verbose clamdscan/*.c
-clang-format -i -verbose clamdscan/*.h
-clang-format -i -verbose clamdtop/*.c
-clang-format -i -verbose clamdtop/*.h
-clang-format -i -verbose clamscan/*.c
-clang-format -i -verbose clamscan/*.h
-clang-format -i -verbose clamsubmit/*.c
-clang-format -i -verbose clamsubmit/*.h
-clang-format -i -verbose examples/*.c
-clang-format -i -verbose examples/*.h
-clang-format -i -verbose examples/fileprop_analysis/*.c
-clang-format -i -verbose examples/fileprop_analysis/old/*.c
-clang-format -i -verbose freshclam/*.c
-clang-format -i -verbose freshclam/*.h
-clang-format -i -verbose libclamav/*.c
-clang-format -i -verbose libclamav/*.h
-clang-format -i -verbose libclamav/jsparse/*.c
-clang-format -i -verbose libclamav/jsparse/*.h
-clang-format -i -verbose libclamav/lzw/*.c
-clang-format -i -verbose libclamav/lzw/*.h
-clang-format -i -verbose libclamav/nsis/nulsft.*
-clang-format -i -verbose libclamav/c++/*.cpp
-clang-format -i -verbose libclamav/c++/*.h
-clang-format -i -verbose libclamunrar_iface/*.cpp
-clang-format -i -verbose libclamunrar_iface/*.h
-clang-format -i -verbose libfreshclam/*.c
-clang-format -i -verbose libfreshclam/*.h
-clang-format -i -verbose common/*.c
-clang-format -i -verbose common/*.h
-clang-format -i -verbose sigtool/*.c
-clang-format -i -verbose sigtool/*.h
-clang-format -i -verbose clamonacc/*.c
-clang-format -i -verbose clamonacc/*.h
-clang-format -i -verbose clamonacc/*/*.c
-clang-format -i -verbose clamonacc/*/*.h
-clang-format -i -verbose unit_tests/*.c
-clang-format -i -verbose unit_tests/*.h
-clang-format -i -verbose win32/compat/*.c
-clang-format -i -verbose win32/compat/*.h
+clang-format-16 -i -verbose clamav-milter/*.c
+clang-format-16 -i -verbose clamav-milter/*.h
+clang-format-16 -i -verbose clambc/*.c
+clang-format-16 -i -verbose clambc/*.h
+clang-format-16 -i -verbose clamconf/*.c
+clang-format-16 -i -verbose clamconf/*.h
+clang-format-16 -i -verbose clamd/*.c
+clang-format-16 -i -verbose clamd/*.h
+clang-format-16 -i -verbose clamdscan/*.c
+clang-format-16 -i -verbose clamdscan/*.h
+clang-format-16 -i -verbose clamdtop/*.c
+clang-format-16 -i -verbose clamdtop/*.h
+clang-format-16 -i -verbose clamscan/*.c
+clang-format-16 -i -verbose clamscan/*.h
+clang-format-16 -i -verbose clamsubmit/*.c
+clang-format-16 -i -verbose clamsubmit/*.h
+clang-format-16 -i -verbose examples/*.c
+clang-format-16 -i -verbose examples/*.h
+clang-format-16 -i -verbose examples/fileprop_analysis/*.c
+clang-format-16 -i -verbose examples/fileprop_analysis/old/*.c
+clang-format-16 -i -verbose freshclam/*.c
+clang-format-16 -i -verbose freshclam/*.h
+clang-format-16 -i -verbose libclamav/*.c
+clang-format-16 -i -verbose libclamav/*.h
+clang-format-16 -i -verbose libclamav/jsparse/*.c
+clang-format-16 -i -verbose libclamav/jsparse/*.h
+clang-format-16 -i -verbose libclamav/lzw/*.c
+clang-format-16 -i -verbose libclamav/lzw/*.h
+clang-format-16 -i -verbose libclamav/nsis/nulsft.*
+clang-format-16 -i -verbose libclamav/c++/*.cpp
+clang-format-16 -i -verbose libclamav/c++/*.h
+clang-format-16 -i -verbose libclamunrar_iface/*.cpp
+clang-format-16 -i -verbose libclamunrar_iface/*.h
+clang-format-16 -i -verbose libfreshclam/*.c
+clang-format-16 -i -verbose libfreshclam/*.h
+clang-format-16 -i -verbose common/*.c
+clang-format-16 -i -verbose common/*.h
+clang-format-16 -i -verbose sigtool/*.c
+clang-format-16 -i -verbose sigtool/*.h
+clang-format-16 -i -verbose clamonacc/*.c
+clang-format-16 -i -verbose clamonacc/*.h
+clang-format-16 -i -verbose clamonacc/*/*.c
+clang-format-16 -i -verbose clamonacc/*/*.h
+clang-format-16 -i -verbose unit_tests/*.c
+clang-format-16 -i -verbose unit_tests/*.h
+clang-format-16 -i -verbose win32/compat/*.c
+clang-format-16 -i -verbose win32/compat/*.h

 # Undo changes to specific files that we don't really want to reformat
 git checkout libclamav/iana_cctld.h
--- a/clamdscan/proto.c
+++ b/clamdscan/proto.c
@ -212,7 +212,7 @@ struct client_parallel_data {
        unsigned int id;
        const char *file;
        struct SCANID *next;
-    } * ids;
+    } *ids;
 };

 /* Sends a proper scan request to clamd and parses its replies
--- a/cmake/FindRust.cmake
+++ b/cmake/FindRust.cmake
@ -425,6 +425,8 @@ foreach(LINE ${LINE_LIST})
    string(REPLACE "native-static-libs: " "" LINE "${LINE}")
    string(REGEX REPLACE "  " "" LINE "${LINE}")
    string(REGEX REPLACE " " ";" LINE "${LINE}")
+    # remove linker flags
+    list(FILTER LINE EXCLUDE REGEX "/.*")

    if(LINE)
        message(STATUS "Rust's native static libs: ${LINE}")
--- a/libclamav/apm.c
+++ b/libclamav/apm.c
@ -37,7 +37,7 @@
 #include "scanners.h"
 #include "dconf.h"

-//#define DEBUG_APM_PARSE
+// #define DEBUG_APM_PARSE

 #ifdef DEBUG_APM_PARSE
 #define apm_parsemsg(...) cli_dbgmsg(__VA_ARGS__)
--- a/libclamav/bytecode_api.h
+++ b/libclamav/bytecode_api.h
@ -170,6 +170,7 @@ enum FunctionalityLevels {
    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_0_7 = 167, /**< LibClamAV release 1.0.7 */
 };

 /**
--- a/libclamav/c++/bytecode2llvm.cpp
+++ b/libclamav/c++/bytecode2llvm.cpp
@ -106,7 +106,7 @@ void LLVMInitializePowerPCAsmPrinter();

 #include "llvm/IR/Dominators.h"

-//#define TIMING
+// #define TIMING
 #undef TIMING

 #include "llvm/Config/llvm-config.h"
--- a/libclamav/crtmgr.h
+++ b/libclamav/crtmgr.h
@ -66,8 +66,8 @@ typedef struct cli_crt_t {
    fp_int n;
    fp_int e;
    fp_int sig;
-    time_t not_before;
-    time_t not_after;
+    int64_t not_before;
+    int64_t not_after;
    cli_crt_hashtype hashtype;
    int certSign;
    int codeSign;
--- a/libclamav/egg.c
+++ b/libclamav/egg.c
@ -99,7 +99,7 @@ typedef uint16_t WCHAR;
 * general defines
 */
 #define EOFARC 0x08E28222 /* Signals end of each header, or end of archive. */
-//#define EOFAR_ 0x2282E208
+// #define EOFAR_ 0x2282E208
 /*
 * egg_header
 */
--- a/libclamav/entconv.c
+++ b/libclamav/entconv.c
@ -57,7 +57,7 @@
 typedef struct {
    enum encodings encoding;
    size_t size;
-} * iconv_t;
+}* iconv_t;
 #endif

 static unsigned char tohex[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
--- a/libclamav/gpt.c
+++ b/libclamav/gpt.c
@ -41,8 +41,8 @@
 #include "scanners.h"
 #include "dconf.h"

-//#define DEBUG_GPT_PARSE
-//#define DEBUG_GPT_PRINT
+// #define DEBUG_GPT_PARSE
+// #define DEBUG_GPT_PRINT

 #ifdef DEBUG_GPT_PARSE
 #define gpt_parsemsg(...) cli_dbgmsg(__VA_ARGS__)
--- a/libclamav/ishield.c
+++ b/libclamav/ishield.c
@ -358,7 +358,7 @@ struct IS_CABSTUFF {
        unsigned int cabno;
        off_t off;
        size_t sz;
-    } * cabs;
+    } *cabs;
    off_t hdr;
    size_t hdrsz;
    unsigned int cabcnt;
--- a/libclamav/jsparse/js-norm.c
+++ b/libclamav/jsparse/js-norm.c
@ -67,7 +67,7 @@ typedef struct scanner {
    size_t lastpos;
    enum tokenizer_state state;
    enum tokenizer_state last_state;
-} * yyscan_t;
+} *yyscan_t;

 static int yylex(YYSTYPE *lvalp, yyscan_t);
 static void yy_scan_bytes(const char *, size_t, yyscan_t scanner);
--- a/libclamav/matcher-byte-comp.c
+++ b/libclamav/matcher-byte-comp.c
@ -36,7 +36,7 @@
 #include "str.h"

 /* DEBUGGING */
-//#define MATCHER_BCOMP_DEBUG
+// #define MATCHER_BCOMP_DEBUG
 #ifdef MATCHER_BCOMP_DEBUG
 #define bcm_dbgmsg(...) cli_dbgmsg(__VA_ARGS__)
 #else
--- a/libclamav/matcher-pcre.c
+++ b/libclamav/matcher-pcre.c
@ -46,7 +46,7 @@
 #endif

 /* DEBUGGING */
-//#define MATCHER_PCRE_DEBUG
+// #define MATCHER_PCRE_DEBUG
 #ifdef MATCHER_PCRE_DEBUG
 #define pm_dbgmsg(...) cli_dbgmsg(__VA_ARGS__)
 #else
--- a/libclamav/mbox.c
+++ b/libclamav/mbox.c
@ -162,7 +162,7 @@ typedef enum {
 * Slows things down a lot and only catches unencoded copies
 * of EICAR within bounces, which don't matter
 */
-//#define    SCAN_UNENCODED_BOUNCES
+// #define    SCAN_UNENCODED_BOUNCES

 typedef struct mbox_ctx {
    const char *dir;
--- a/libclamav/mbr.c
+++ b/libclamav/mbr.c
@ -38,8 +38,8 @@
 #include "scanners.h"
 #include "dconf.h"

-//#define DEBUG_MBR_PARSE
-//#define DEBUG_EBR_PARSE
+// #define DEBUG_MBR_PARSE
+// #define DEBUG_EBR_PARSE

 #ifdef DEBUG_MBR_PARSE
 #define mbr_parsemsg(...) cli_dbgmsg(__VA_ARGS__)
--- a/libclamav/others.c
+++ b/libclamav/others.c
@ -269,7 +269,7 @@ static void *get_module_function(HMODULE handle, const char *name)
 static void *get_module_function(void *handle, const char *name)
 {
    void *procAddress = NULL;
-    procAddress = dlsym(handle, name);
+    procAddress       = dlsym(handle, name);
    if (NULL == procAddress) {
        const char *err = dlerror();
        if (NULL == err) {
--- a/libclamav/others.h
+++ b/libclamav/others.h
@ -73,7 +73,7 @@
 * in re-enabling affected modules.
 */

-#define CL_FLEVEL 166
+#define CL_FLEVEL 167
 #define CL_FLEVEL_DCONF CL_FLEVEL
 #define CL_FLEVEL_SIGTOOL CL_FLEVEL

--- a/libclamav/pe_icons.c
+++ b/libclamav/pe_icons.c
@ -188,7 +188,7 @@ int cli_groupiconscan(struct ICON_ENV *icon_env, uint32_t rva)
                uint16_t depth;
                uint32_t sz;
                uint16_t id;
-            } * dir;
+            } *dir;

            raddr = cli_rawaddr(cli_readint32(grp), peinfo->sections, peinfo->nsections, (unsigned int *)(&err), map->len, peinfo->hdr_size);
            cli_dbgmsg("cli_scanicon: icon group @%x\n", raddr);
--- a/libclamav/readdb.c
+++ b/libclamav/readdb.c
@ -3458,8 +3458,8 @@ static int cli_loadcrt(FILE *fs, struct cl_engine *engine, struct cli_dbio *dbio
            ca.name = NULL;

        if (strlen(tokens[9]))
-            ca.not_before = atoi(tokens[8]);
-        ca.not_after = (-1U) >> 1;
+            ca.not_before = atoi(tokens[9]);
+        ca.not_after = (-1ULL) >> 1;

        ca.hashtype = CLI_HASHTYPE_ANY;
        crtmgr_add(&(engine->cmgr), &ca);
--- a/libclamav/scanners.c
+++ b/libclamav/scanners.c
@ -1271,9 +1271,9 @@ static cl_error_t cli_scanbzip(cli_ctx *ctx)
    char buf[FILEBUFF];

    memset(&strm, 0, sizeof(strm));
-    strm.next_out = buf;
+    strm.next_out  = buf;
    strm.avail_out = sizeof(buf);
-    rc = BZ2_bzDecompressInit(&strm, 0, 0);
+    rc             = BZ2_bzDecompressInit(&strm, 0, 0);
    if (BZ_OK != rc) {
        cli_dbgmsg("Bzip: DecompressInit failed: %d\n", rc);
        return CL_EOPEN;
@ -1287,7 +1287,7 @@ static cl_error_t cli_scanbzip(cli_ctx *ctx)

    do {
        if (!strm.avail_in) {
-            strm.next_in = (void *)fmap_need_off_once_len(ctx->fmap, off, FILEBUFF, &avail);
+            strm.next_in  = (void *)fmap_need_off_once_len(ctx->fmap, off, FILEBUFF, &avail);
            strm.avail_in = avail;
            off += avail;
            if (!strm.avail_in) {
@ -1323,7 +1323,7 @@ static cl_error_t cli_scanbzip(cli_ctx *ctx)
            if (cli_checklimits("Bzip", ctx, size, 0, 0) != CL_CLEAN)
                break;

-            strm.next_out = buf;
+            strm.next_out  = buf;
            strm.avail_out = sizeof(buf);
        }
    } while (BZ_STREAM_END != rc);
--- a/libclamav/sf_base64decode.h
+++ b/libclamav/sf_base64decode.h
@ -27,6 +27,6 @@
 #include <stdio.h>
 #include "clamav-types.h"

-int sf_base64decode(uint8_t*, size_t, uint8_t*, size_t, size_t*);
+int sf_base64decode(uint8_t *, size_t, uint8_t *, size_t, size_t *);

 #endif
--- a/libclamav/special.c
+++ b/libclamav/special.c
@ -48,7 +48,8 @@

 int cli_check_mydoom_log(cli_ctx *ctx)
 {
-    const uint32_t *record;
+    uint32_t record[16];
+    const uint32_t *ptr;
    uint32_t check, key;
    fmap_t *map         = ctx->fmap;
    unsigned int blocks = map->len / (8 * 4);
@ -59,14 +60,24 @@ int cli_check_mydoom_log(cli_ctx *ctx)
    if (blocks > 5)
        blocks = 5;

-    record = fmap_need_off_once(map, 0, 8 * 4 * blocks);
-    if (!record)
+    /*
+     * The following pointer might not be properly aligned. There there is
+     * memcmp() + memcpy() workaround to avoid performing an unaligned access
+     * while reading the uint32_t.
+     */
+    ptr = fmap_need_off_once(map, 0, 8 * 4 * blocks);
+    if (!ptr)
        return CL_CLEAN;
+
    while (blocks) { /* This wasn't probably intended but that's what the current code does anyway */
-        if (record[--blocks] == 0xffffffff)
+        const uint32_t marker_ff = 0xffffffff;
+
+	if (!memcmp(&ptr[--blocks], &marker_ff, sizeof(uint32_t)))
            return CL_CLEAN;
    }

+    memcpy(record, ptr, sizeof(record));
+
    key   = ~be32_to_host(record[0]);
    check = (be32_to_host(record[1]) ^ key) +
            (be32_to_host(record[2]) ^ key) +
--- a/unit_tests/freshclam_test.py
+++ b/unit_tests/freshclam_test.py
@ -10,14 +10,10 @@ import os
 from pathlib import Path
 import platform
 import shutil
-import subprocess
-import sys
-import time
 import unittest
 from functools import partial

 from http.server import HTTPServer, BaseHTTPRequestHandler
-import cgi

 import testcase

--- a/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.HDB_1of2_MD5_FIXED_testexe.UNOFFICIAL.hdb
+++ b/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.HDB_1of2_MD5_FIXED_testexe.UNOFFICIAL.hdb
@ -1 +1 @@
-05fcb14bd4dbad8617251d4e22708367:1447976:Test.GenSig.HDB_1of2_MD5_FIXED_testexe
+8a655379478861572791e2404f45f9ed:1447992:Test.GenSig.HDB_1of2_MD5_FIXED_testexe
--- a/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.HDB_2of2_MD5_STAR_testexe.UNOFFICIAL.hdb
+++ b/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.HDB_2of2_MD5_STAR_testexe.UNOFFICIAL.hdb
@ -1 +1 @@
-05fcb14bd4dbad8617251d4e22708367:*:Test.GenSig.HDB_2of2_MD5_STAR_testexe:73
+8a655379478861572791e2404f45f9ed:*:Test.GenSig.HDB_2of2_MD5_STAR_testexe:73
--- a/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.HSB_1of4_SHA1_FIXED_testexe.UNOFFICIAL.hsb
+++ b/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.HSB_1of4_SHA1_FIXED_testexe.UNOFFICIAL.hsb
@ -1 +1 @@
-2ba31b0352bae4f57c1c9144f64ac7a57c010876:1447976:Test.GenSig.HSB_1of4_SHA1_FIXED_testexe
+4a2a55f483339bf55fae340f82d3b42001b30e16:1447992:Test.GenSig.HSB_1of4_SHA1_FIXED_testexe
--- a/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.HSB_2of4_SHA1_STAR_testexe.UNOFFICIAL.hsb
+++ b/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.HSB_2of4_SHA1_STAR_testexe.UNOFFICIAL.hsb
@ -1 +1 @@
-2ba31b0352bae4f57c1c9144f64ac7a57c010876:*:Test.GenSig.HSB_2of4_SHA1_STAR_testexe:73
+4a2a55f483339bf55fae340f82d3b42001b30e16:*:Test.GenSig.HSB_2of4_SHA1_STAR_testexe:73
--- a/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.HSB_3of4_SHA256_FIXED_testexe.UNOFFICIAL.hsb
+++ b/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.HSB_3of4_SHA256_FIXED_testexe.UNOFFICIAL.hsb
@ -1 +1 @@
-4f713f2f0d3269d5ea24bf58c8acff9ad67d53044c07f028ae825cacffb6e82e:1447976:Test.GenSig.HSB_3of4_SHA256_FIXED_testexe
+ecb52dac06daf876b6ed53063c5fdd5a3e05a0e70f7d326670f202f36ae66c95:1447992:Test.GenSig.HSB_3of4_SHA256_FIXED_testexe
--- a/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.HSB_4of4_SHA256_STAR_testexe.UNOFFICIAL.hsb
+++ b/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.HSB_4of4_SHA256_STAR_testexe.UNOFFICIAL.hsb
@ -1 +1 @@
-4f713f2f0d3269d5ea24bf58c8acff9ad67d53044c07f028ae825cacffb6e82e:*:Test.GenSig.HSB_4of4_SHA256_STAR_testexe:73
+ecb52dac06daf876b6ed53063c5fdd5a3e05a0e70f7d326670f202f36ae66c95:*:Test.GenSig.HSB_4of4_SHA256_STAR_testexe:73
--- a/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.MDB_01of16_MD5_FIXED_text.UNOFFICIAL.mdb
+++ b/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.MDB_01of16_MD5_FIXED_text.UNOFFICIAL.mdb
@ -1 +1 @@
-34304:c2cf3afc85a94f96246ebc2d10427b99:Test.GenSig.MDB_01of16_MD5_FIXED_text
+34304:1931e3808e2374839e1cb81790d14c14:Test.GenSig.MDB_01of16_MD5_FIXED_text
--- a/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.MDB_02of16_MD5_STAR_text.UNOFFICIAL.mdb
+++ b/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.MDB_02of16_MD5_STAR_text.UNOFFICIAL.mdb
@ -1 +1 @@
-*:c2cf3afc85a94f96246ebc2d10427b99:Test.GenSig.MDB_02of16_MD5_STAR_text:73
+*:1931e3808e2374839e1cb81790d14c14:Test.GenSig.MDB_02of16_MD5_STAR_text:73
--- a/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.MDB_03of16_MD5_FIXED_data.UNOFFICIAL.mdb
+++ b/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.MDB_03of16_MD5_FIXED_data.UNOFFICIAL.mdb
@ -1 +1 @@
-1168896:6623c7640384c88d74cc4d7701a02627:Test.GenSig.MDB_03of16_MD5_FIXED_data
+1168896:b724ae3f375a29dd4d5fbe37f430c0ea:Test.GenSig.MDB_03of16_MD5_FIXED_data
--- a/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.MDB_04of16_MD5_STAR_data.UNOFFICIAL.mdb
+++ b/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.MDB_04of16_MD5_STAR_data.UNOFFICIAL.mdb
@ -1 +1 @@
-*:6623c7640384c88d74cc4d7701a02627:Test.GenSig.MDB_04of16_MD5_STAR_data:73
+*:b724ae3f375a29dd4d5fbe37f430c0ea:Test.GenSig.MDB_04of16_MD5_STAR_data:73
--- a/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.MSB_01of32_SHA1_FIXED_text.UNOFFICIAL.msb
+++ b/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.MSB_01of32_SHA1_FIXED_text.UNOFFICIAL.msb
@ -1 +1 @@
-34304:7bcc8fbbab4b38c28cb9a571fa7004d8ff47b09d:Test.GenSig.MSB_01of32_SHA1_FIXED_text
+34304:45f9f37f318a50c62d3f26699f2415338ddc1f81:Test.GenSig.MSB_01of32_SHA1_FIXED_text
--- a/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.MSB_02of32_SHA1_STAR_text.UNOFFICIAL.msb
+++ b/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.MSB_02of32_SHA1_STAR_text.UNOFFICIAL.msb
@ -1 +1 @@
-*:7bcc8fbbab4b38c28cb9a571fa7004d8ff47b09d:Test.GenSig.MSB_02of32_SHA1_STAR_text:73
+*:45f9f37f318a50c62d3f26699f2415338ddc1f81:Test.GenSig.MSB_02of32_SHA1_STAR_text:73
--- a/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.MSB_03of32_SHA1_FIXED_data.UNOFFICIAL.msb
+++ b/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.MSB_03of32_SHA1_FIXED_data.UNOFFICIAL.msb
@ -1 +1 @@
-1168896:dae420693dde3530da0ad06f593148c9647a66b3:Test.GenSig.MSB_03of32_SHA1_FIXED_data
+1168896:9cdbd12ab842a2d021be6cb8f379ee219e817fd7:Test.GenSig.MSB_03of32_SHA1_FIXED_data
--- a/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.MSB_04of32_SHA1_STAR_data.UNOFFICIAL.msb
+++ b/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.MSB_04of32_SHA1_STAR_data.UNOFFICIAL.msb
@ -1 +1 @@
-*:dae420693dde3530da0ad06f593148c9647a66b3:Test.GenSig.MSB_04of32_SHA1_STAR_data:73
+*:9cdbd12ab842a2d021be6cb8f379ee219e817fd7:Test.GenSig.MSB_04of32_SHA1_STAR_data:73
--- a/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.MSB_17of32_SHA256_FIXED_text.UNOFFICIAL.msb
+++ b/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.MSB_17of32_SHA256_FIXED_text.UNOFFICIAL.msb
@ -1 +1 @@
-34304:a0174c8dfab8cd480495fede811c9fcd16ec40db6d9dbe69e9e5f32907be3a1a:Test.GenSig.MSB_17of32_SHA256_FIXED_text
+34304:73757fdfd15f2e63995a547e86cc4568a9137bfb2f64a588ad9e6f45ddd5e367:Test.GenSig.MSB_17of32_SHA256_FIXED_text
--- a/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.MSB_18of32_SHA256_STAR_text.UNOFFICIAL.msb
+++ b/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.MSB_18of32_SHA256_STAR_text.UNOFFICIAL.msb
@ -1 +1 @@
-*:a0174c8dfab8cd480495fede811c9fcd16ec40db6d9dbe69e9e5f32907be3a1a:Test.GenSig.MSB_18of32_SHA256_STAR_text:73
+*:73757fdfd15f2e63995a547e86cc4568a9137bfb2f64a588ad9e6f45ddd5e367:Test.GenSig.MSB_18of32_SHA256_STAR_text:73
--- a/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.MSB_19of32_SHA256_FIXED_data.UNOFFICIAL.msb
+++ b/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.MSB_19of32_SHA256_FIXED_data.UNOFFICIAL.msb
@ -1 +1 @@
-1168896:96559752f87084cc488e3163b615d13eac1816580375facd2f872a3e4d808789:Test.GenSig.MSB_19of32_SHA256_FIXED_data
+1168896:09dbd8590151147c35c0b096c7b437d69cfa08bb7116b2f1dfc20a7c8e6d7a58:Test.GenSig.MSB_19of32_SHA256_FIXED_data
--- a/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.MSB_20of32_SHA256_STAR_data.UNOFFICIAL.msb
+++ b/unit_tests/input/pe_allmatch/alert-sigs/Test.GenSig.MSB_20of32_SHA256_STAR_data.UNOFFICIAL.msb
@ -1 +1 @@
-*:96559752f87084cc488e3163b615d13eac1816580375facd2f872a3e4d808789:Test.GenSig.MSB_20of32_SHA256_STAR_data:73
+*:09dbd8590151147c35c0b096c7b437d69cfa08bb7116b2f1dfc20a7c8e6d7a58:Test.GenSig.MSB_20of32_SHA256_STAR_data:73
--- a/unit_tests/input/pe_allmatch/block-cert-sigs/Test.Sig.CRB.BlockCert.crb
+++ b/unit_tests/input/pe_allmatch/block-cert-sigs/Test.Sig.CRB.BlockCert.crb
@ -1 +1 @@
-Test.Sig.CRB.BlockCert;0;8b166a274bfaa700a912edd57e8e41365beea576;d2a8ea878c4bba243788488f59354835a005baae;E709F7C042C0DFE60CDEF79BFEC8723468DE92B027E4BC31C2D2B8224DE04B6A23C49C8FEBFAD35274651AA5DAA91FD392E0336B31140F90C125E43E4DEBD3276659BBC639425595F4713C4CAC1892D5D136F76263EDE02DF4EBB849A508B492C7BD3FE295617FC5FF1C482543C938F389D521D8E758D59183C7986A5729E16B5BC3081CF3A749447E23106D170E5835BA137821202B100124EDAD00F7508C19F8103B774E9FA19989058EC52776934690E2CAD67B99E93A9AD50C470E0DF4C48F9F78DBFCEF812730A3A458A310A913CCA7E0B10699A4A441C8900A59193FFDC7376162DA6DB805E4BD9AD9463717B6EEDACAD53AEA9E7FDBB2826588FBF8E45F390B4A44A6A01787DC8110581DD1DC00407C3868F3534241BB340AED7CC9CAB56D27F7E6B645F7CC7BA7B0D1BFB27036F09B9FB25B396575C16B0BF3177FE052F7B5C8BB97F72E69DA7971EAFA643C68E36B5F156BAD46F3E3A580A7CE56BA92ACB972143DDA4B20867A45081262DF2E7A1F80A9D3588C60D48010F10461A8AE675CF8EE47E66425A5A6A0D95F1076AFEC6246C3AA635C13AC1E9CEA760316FD89AE2C19FDF696A106BC20B5A2F8E14613A4633726ADC92FD67B6E219CE1A419FE7F397F153C2591547EE08B19C54C8F04B0F6824EABD2572AF9115486479567A77853DDA31CB84609154BA3A043AD0548204875FF365047BC4B7382FD03AF;010001;0;1;0;;Generated with details from sigtool --print-certs
+Test.Sig.CRB.BlockCert;0;a5f872f51516a7b95493a152eb79b61d8999188c;e8fe30ff40549bb36227b3b6fa978bc3b7c93a1b;CA5767E912FAC33005614BF5A30360CBB1C194B3B5EA7AE78DF228B76A745AE803F248CFFAE9BD8690935CE5173BB31565D04A931DD2F1D99E17B1BDD35C066F2DD097A87B1786F437156995193D5F1FD49CD855AF0FD9A3BBEA2F8A267770F0F402B28107087142A166C3FDAF673F75518F74DBA6014669FC4377D572F32F58E32F1E575508E547AA2FE25B085B58414562D77F7FE85E92F285F0B52C276A6B68A7E17E9ACBD62DD40ACD1319EE844772EADBACB789A42583953827F2EF6D796292C3ABD2F9533EB07EF196EC7274C17E7FC43B182B543FE1AC4612A995820CAEA2BF3F4FDC4BCC559E95D6180D1B34F51F7D46E40B6CAA88C0BDCDF07E9A8B415E87F57F6BAA207CBC5843D70E5C0A98E643A5E1D8614C3D9C8765B617A1568133DF55FE7E4DC7AB717EAA670E1590569FE0423619DCB062F9E2579717E9231EE44C95DE7218F2D602828C33D08305049BDE439F783B7C478B0F41DB0ADB607429D7CE33E8CB7DC98FE5ECACF21D135D0B4D5F1361BF3898450A9923D00804657CB1A5940B6D25E10A615FC77F68A60A589A2A5BA052FB6B97C22538ED1801D34950FBF4401CB3CAD2839DD3E733F3F0A8F279C886FDE63F5384B3507F03A1A6FF314A32A724D9D5C4794B7A5B01183F7977AACD402B778B900BA03C2E2D52E3A6F1C8524B833701DC6EB4538EDBD516B64BD2CAE8B7AF23312407C0F09421;010001;0;1;0;;Generated with details from sigtool --print-certs
--- a/unit_tests/input/pe_allmatch/test-exe-src/build.py
+++ b/unit_tests/input/pe_allmatch/test-exe-src/build.py
@ -119,7 +119,7 @@ def gen_ca_cert():
    # TODO Explore making this cert have attributes that look more like
    # a real CA cert (ex: restrict its uses)
    subj = "/C=US/ST=Maryland/L=Fulton/O=Cisco Talos/OU=ClamAV Test CA %016x/emailAddress=rfc2606@example.net" % (random.randint(1,0xFFFFFFFFFFFFFFFF))
-    cmd = 'openssl req -new -x509 -days 3650 -key build/ca.key -out build/ca.crt -subj "%s"' % (subj)
+    cmd = 'openssl req -new -x509 -days 73000 -key build/ca.key -out build/ca.crt -subj "%s"' % (subj)
    run_cmd(cmd)

 # https://blog.didierstevens.com/2008/12/30/howto-make-your-own-cert-with-openssl/
@ -136,7 +136,7 @@ def gen_cs_cert(name, ext):
    cmd = 'openssl req -new -key %s -out %s -subj "%s"' % (key_name, csr_name, subj)
    run_cmd(cmd)

-    cmd = 'openssl x509 -req -days 730 -in %s -CA build/ca.crt -CAkey build/ca.key -out %s -set_serial %012d -extfile ./cs.extfile.cfg' % (csr_name, crt_name, random.randint(100000000000,999999999999))
+    cmd = 'openssl x509 -req -days 73000 -in %s -CA build/ca.crt -CAkey build/ca.key -out %s -set_serial %012d -extfile ./cs.extfile.cfg' % (csr_name, crt_name, random.randint(100000000000,999999999999))
    run_cmd(cmd)

    return (key_name, crt_name)
--- a/unit_tests/input/pe_allmatch/test.exe
+++ b/unit_tests/input/pe_allmatch/test.exe
--- a/unit_tests/input/pe_allmatch/trust-sigs/Test.Sig.CRB.TrustCert.crb
+++ b/unit_tests/input/pe_allmatch/trust-sigs/Test.Sig.CRB.TrustCert.crb
@ -1 +1 @@
-Test.Sig.CRB.TrustCert;1;8b166a274bfaa700a912edd57e8e41365beea576;d2a8ea878c4bba243788488f59354835a005baae;E709F7C042C0DFE60CDEF79BFEC8723468DE92B027E4BC31C2D2B8224DE04B6A23C49C8FEBFAD35274651AA5DAA91FD392E0336B31140F90C125E43E4DEBD3276659BBC639425595F4713C4CAC1892D5D136F76263EDE02DF4EBB849A508B492C7BD3FE295617FC5FF1C482543C938F389D521D8E758D59183C7986A5729E16B5BC3081CF3A749447E23106D170E5835BA137821202B100124EDAD00F7508C19F8103B774E9FA19989058EC52776934690E2CAD67B99E93A9AD50C470E0DF4C48F9F78DBFCEF812730A3A458A310A913CCA7E0B10699A4A441C8900A59193FFDC7376162DA6DB805E4BD9AD9463717B6EEDACAD53AEA9E7FDBB2826588FBF8E45F390B4A44A6A01787DC8110581DD1DC00407C3868F3534241BB340AED7CC9CAB56D27F7E6B645F7CC7BA7B0D1BFB27036F09B9FB25B396575C16B0BF3177FE052F7B5C8BB97F72E69DA7971EAFA643C68E36B5F156BAD46F3E3A580A7CE56BA92ACB972143DDA4B20867A45081262DF2E7A1F80A9D3588C60D48010F10461A8AE675CF8EE47E66425A5A6A0D95F1076AFEC6246C3AA635C13AC1E9CEA760316FD89AE2C19FDF696A106BC20B5A2F8E14613A4633726ADC92FD67B6E219CE1A419FE7F397F153C2591547EE08B19C54C8F04B0F6824EABD2572AF9115486479567A77853DDA31CB84609154BA3A043AD0548204875FF365047BC4B7382FD03AF;010001;1;0;0;;Generated with details from sigtool --print-certs
+Test.Sig.CRB.TrustCert;1;a5f872f51516a7b95493a152eb79b61d8999188c;e8fe30ff40549bb36227b3b6fa978bc3b7c93a1b;CA5767E912FAC33005614BF5A30360CBB1C194B3B5EA7AE78DF228B76A745AE803F248CFFAE9BD8690935CE5173BB31565D04A931DD2F1D99E17B1BDD35C066F2DD097A87B1786F437156995193D5F1FD49CD855AF0FD9A3BBEA2F8A267770F0F402B28107087142A166C3FDAF673F75518F74DBA6014669FC4377D572F32F58E32F1E575508E547AA2FE25B085B58414562D77F7FE85E92F285F0B52C276A6B68A7E17E9ACBD62DD40ACD1319EE844772EADBACB789A42583953827F2EF6D796292C3ABD2F9533EB07EF196EC7274C17E7FC43B182B543FE1AC4612A995820CAEA2BF3F4FDC4BCC559E95D6180D1B34F51F7D46E40B6CAA88C0BDCDF07E9A8B415E87F57F6BAA207CBC5843D70E5C0A98E643A5E1D8614C3D9C8765B617A1568133DF55FE7E4DC7AB717EAA670E1590569FE0423619DCB062F9E2579717E9231EE44C95DE7218F2D602828C33D08305049BDE439F783B7C478B0F41DB0ADB607429D7CE33E8CB7DC98FE5ECACF21D135D0B4D5F1361BF3898450A9923D00804657CB1A5940B6D25E10A615FC77F68A60A589A2A5BA052FB6B97C22538ED1801D34950FBF4401CB3CAD2839DD3E733F3F0A8F279C886FDE63F5384B3507F03A1A6FF314A32A724D9D5C4794B7A5B01183F7977AACD402B778B900BA03C2E2D52E3A6F1C8524B833701DC6EB4538EDBD516B64BD2CAE8B7AF23312407C0F09421;010001;1;0;0;;Generated with details from sigtool --print-certs
--- a/win32/compat/dirent.c
+++ b/win32/compat/dirent.c
@ -22,11 +22,11 @@
 #include <errno.h>

 #include <Windows.h>
-//#include "clamav.h"
-//#include "others.h"
+// #include "clamav.h"
+// #include "others.h"
 #include "dirent.h"
 #include "w32_stat.h"
-//#include "misc.h"
+// #include "misc.h"

 DIR *opendir(const char *name)
 {
--- a/win32/compat/strptime.c
+++ b/win32/compat/strptime.c
@ -19,7 +19,7 @@

 #define strncasecmp _strnicmp
 #ifndef _LIBC
-//# include <config.h>
+// # include <config.h>
 #endif

 #include <time.h>
@ -31,7 +31,7 @@
 #endif
 #include <limits.h>
 #include <string.h>
-//#include <stdbool.h>
+// #include <stdbool.h>

 #ifdef _LIBC
 #include "../locale/localeinfo.h"
--- a/win32/res/common.rc
+++ b/win32/res/common.rc
@ -6,8 +6,8 @@
 #define REPO_VERSION VERSION
 #endif

-#define RES_VER_Q 1,0,6,0
-#define RES_VER_S "ClamAV 1.0.6"
+#define RES_VER_Q 1,0,7,0
+#define RES_VER_S "ClamAV 1.0.7"

 VS_VERSION_INFO VERSIONINFO
    FILEVERSION RES_VER_Q