GitList

Browse code

Fix several codesign bugs

We were signing with the signing key + signing cert and verifying
with the intermediate cert + root cert. However, we should have been
signing with the signing key + signing cert + intermediate cert, and
verifying with just the root cert.
To fix this, I...
1. Provided new certs and test file .sign files to use the correct
signing method.
2. Restructured the `unit_tests/input/signing` directory to highlight
which files are for signing and which are for verification.

There is a multi-arch build issue because I previously used i8 to
represent a C character. I switched it to c_char, which should fix the
clamav-debian multi-arch Docker image build.

It turns out we weren't failing out when signing if one of the provided
intermediate certificate paths is incorrect. Instead of using
`filter_map()`, I switched to just iterate the list to populate the
vector of intermediate certs.

Val Snyder authored on 2025/03/30 09:38:08
Showing 25 changed files

certs/clamav-beta.crt index 57dde69..0b98457 100644
libclamav_rust/src/codesign.rs index f3ecc3e..50a23c1 100644
sigtool/sigtool.c index 91aed8c..7b24300 100644
unit_tests/CMakeLists.txt index 6c0fd74..94e938a 100644
unit_tests/input/CMakeLists.txt index f058e66..56fd930 100644
unit_tests/input/freshclam_testfiles/test-1.cvd.sign index 8f3a395..2b0cf00 100644
unit_tests/input/freshclam_testfiles/test-2.cdiff.sign index 1d4af5f..b5cb853 100644
unit_tests/input/freshclam_testfiles/test-2.cvd.sign index 9505632..7434f30 100644
unit_tests/input/freshclam_testfiles/test-3.cdiff.sign index 36fa315..79ec668 100644
unit_tests/input/freshclam_testfiles/test-3.cvd.sign index 782158a..b7d5d2d 100644
unit_tests/input/freshclam_testfiles/test-4.cdiff.sign index 370b4b6..cc6e597 100644
unit_tests/input/freshclam_testfiles/test-4.cvd.sign index 0019701..1c4feda 100644
unit_tests/input/freshclam_testfiles/test-5.cdiff.sign index 39f1bf3..eb315d2 100644
unit_tests/input/freshclam_testfiles/test-5.cvd.sign index 5f44034..f29393e 100644
unit_tests/input/freshclam_testfiles/test-6.cdiff.sign index bdbb586..13ad199 100644
unit_tests/input/freshclam_testfiles/test-6.cvd.sign index 02771f2..7e62f94 100644
unit_tests/input/signing/private/signing-test.crt index 2aa0a96..0000000
unit_tests/input/signing/private/signing-test.key.xor index d8dd837..0000000
unit_tests/input/signing/public/clamav-test.crt index 6525f56..0000000
unit_tests/input/signing/sign/intermediate-test.crt index 0000000..37e4a2c
unit_tests/input/signing/sign/signing-test.crt index 0000000..2aa0a96
unit_tests/input/signing/sign/signing-test.key.xor index 0000000..d8dd837
unit_tests/input/signing/verify/clamav-test.crt index 0000000..3410e0b
unit_tests/input/verify/clamav.crt index 0000000..3410e0b
unit_tests/sigtool_test.py index f790e54..fed40d7 100644

@@ -29,125 +29,3 @@ Bd/OoRMlH6aAxOD3W8PR18TkR7wt5++qMEC+hvpTIBfqDzM6q/l1Gv1/xzKtDiFL
 ZmIM79osXAOPMn/dNAh4hVURBl2n7/69FSRzQbVIBGt2YYlWV9HVfOXquuYJ3py
                      pOQCrNNrFjEMFifHqO2ktkn7c8Tsw4dFVnIhKFU=
                      -----END CERTIFICATE-----
                     -Certificate:
                     -    Data:
                     -        Version: 3 (0x2)
                     -        Serial Number: 0 (0x0)
                     -        Signature Algorithm: sha256WithRSAEncryption
                     -        Issuer: C=US, ST=MD, L=Laurel, O=Cisco, OU=Talos, CN=ClamAV BETA Root CA
                     -        Validity
                     -            Not Before: Mar 26 21:31:56 2025 GMT
                     -            Not After : Jul 24 21:31:56 2025 GMT
                     -        Subject: C=US, ST=MD, O=Cisco, OU=Talos, CN=ClamAV BETA Intermediate Signing CA
                     -        Subject Public Key Info:
                     -            Public Key Algorithm: rsaEncryption
                     -                RSA Public-Key: (4096 bit)
                     -                Modulus:
                     -                    00:a1:6b:6a:b0:76:70:35:e1:d3:e5:49:1d:3f:e0:
                     -                    2c:1f:f3:bd:38:cb:cb:7b:ec:e3:f3:20:27:1c:99:
                     -                    1e:99:89:d0:f4:11:ef:b2:18:6c:1b:25:40:55:18:
                     -                    b0:c4:e8:03:0a:64:30:11:fa:b2:2b:6f:cb:2b:b8:
                     -                    aa:0c:29:36:77:6f:cf:12:35:67:14:e9:02:65:ad:
                     -                    6e:fb:fa:f9:b3:a2:9c:1b:d8:90:70:15:10:d0:29:
                     -                    2b:9f:49:6b:dc:75:fb:34:36:e8:cf:22:10:03:8d:
                     -                    7e:97:2c:c6:9c:be:29:33:b8:6b:b8:54:92:a0:28:
                     -                    92:a0:0c:ef:46:a6:0f:94:7a:c4:51:ef:a9:93:0f:
                     -                    46:43:63:1d:36:f8:51:4c:be:8f:89:06:a9:05:6f:
                     -                    e2:40:a9:b4:e3:69:d5:20:48:2d:b0:d8:2b:25:b1:
                     -                    af:08:3b:a8:a6:18:84:0c:05:54:2d:40:a0:e1:bf:
                     -                    af:18:22:2d:87:69:83:89:6d:cf:d3:5f:2b:01:7d:
                     -                    d4:4e:db:2c:80:b2:77:25:5f:55:e1:d4:d4:fe:ad:
                     -                    7a:7c:2b:b3:ef:32:73:aa:f7:f2:43:4e:ae:d3:25:
                     -                    69:57:c8:0b:cf:8c:bd:33:d9:05:87:9d:7b:09:e2:
                     -                    59:3f:01:d2:54:af:c4:8a:97:d7:4b:ce:d9:ad:15:
                     -                    6f:21:8a:e2:24:27:03:60:2e:6d:1d:dd:be:eb:77:
                     -                    a3:4d:ac:d6:01:4a:d4:ec:86:b7:b6:9d:02:3d:2a:
                     -                    7f:e0:5f:02:0f:58:d1:0b:cb:7b:e2:ff:e9:f3:5d:
                     -                    0f:6f:d1:12:77:5f:80:e7:96:67:dd:d7:13:2e:3c:
                     -                    cf:b7:d6:36:33:55:6e:e4:f8:67:08:bb:ed:9a:61:
                     -                    44:27:b0:e2:11:0a:b9:3f:fd:a5:2b:96:e4:7f:5e:
                     -                    60:c6:7d:8c:d6:19:64:79:ff:02:98:eb:53:db:35:
                     -                    9f:ac:a7:02:51:92:85:37:9a:23:1e:f3:c4:b6:cb:
                     -                    0b:7d:65:ed:50:10:94:47:0d:cc:2a:34:a7:65:fd:
                     -                    de:c0:c1:01:ac:e9:4f:c2:02:2d:b2:eb:c5:f8:e6:
                     -                    db:cd:aa:87:91:63:94:40:5e:00:0b:f1:08:07:04:
                     -                    85:79:ce:c8:43:cf:c9:af:66:31:20:e7:58:bf:dd:
                     -                    6b:cb:d4:a4:89:e2:c0:11:15:02:ca:80:cc:97:2a:
                     -                    36:f6:7f:9c:78:f2:5c:35:70:c9:58:6f:95:91:25:
                     -                    88:e3:d7:da:c0:0f:b8:cd:5e:2e:9f:67:d2:14:74:
                     -                    c7:31:09:91:87:0d:97:9f:30:f3:72:1c:ac:98:c1:
                     -                    da:f2:b3:8d:9e:36:21:cb:e8:d9:53:4f:98:2e:d8:
                     -                    ad:44:af
                     -                Exponent: 65537 (0x10001)
                     -        X509v3 extensions:
                     -            X509v3 Basic Constraints: critical
                     -                CA:TRUE
                     -            X509v3 Key Usage: critical
                     -                Certificate Sign, CRL Sign
                     -            X509v3 Extended Key Usage:
                     -                OCSP Signing, E-mail Protection
                     -            Netscape Cert Type:
                     -                SSL CA
                     -    Signature Algorithm: sha256WithRSAEncryption
                     -         4c:8c:2d:f9:22:a4:de:f6:91:30:8e:50:ad:1b:1c:f8:f1:e0:
                     -         e5:93:7b:57:1c:75:b4:e1:3b:f1:43:12:c1:af:5a:00:c4:a1:
                     -         5b:6e:9b:07:74:83:68:01:7c:d4:44:25:41:30:34:7d:79:59:
                     -         f4:ac:df:4a:44:1c:f0:a2:e2:ac:1d:60:b5:83:48:55:a8:45:
                     -         66:31:43:9d:2a:0c:df:0e:06:5e:e5:e1:1d:d7:99:2d:33:60:
                     -         2f:f2:39:f0:3c:1f:c3:a8:ff:85:34:75:dd:27:35:d2:a2:f3:
                     -         36:bc:17:80:ce:60:89:29:66:0c:ee:8e:1d:82:df:a6:33:2b:
                     -         47:a9:fc:2a:e3:82:b2:07:e2:8a:3a:df:ed:3c:4e:61:d5:c3:
                     -         f8:df:d2:d3:c6:f4:d7:b9:a7:71:32:bf:42:e9:d2:99:25:ef:
                     -         0d:8d:7e:0f:2c:17:2b:b2:c6:e0:31:7f:06:85:af:ae:52:e9:
                     -         b3:4c:06:7f:1a:9d:ee:21:f2:e1:53:94:73:cd:7c:96:5d:c0:
                     -         b7:1a:55:55:72:c8:13:4f:b0:c6:ca:6a:46:75:aa:f9:1c:9d:
                     -         74:94:d5:87:50:39:36:4a:41:eb:4e:78:c9:b6:9d:ce:ef:68:
                     -         57:76:e6:89:a6:82:b9:eb:69:84:8e:24:e2:62:6d:3f:4d:02:
                     -         ea:2a:5d:cf:a0:74:6a:0a:0c:b5:31:5c:54:61:96:86:c9:07:
                     -         c0:f4:b5:e0:66:25:63:28:9e:3e:ec:63:a6:04:aa:03:dd:30:
                     -         40:7f:74:e5:8c:55:79:1f:41:6d:52:72:ce:92:ed:9a:13:ae:
                     -         30:68:80:04:86:5d:bb:42:e3:f6:63:20:e2:86:f5:72:78:30:
                     -         34:91:58:35:1d:db:68:02:7a:61:de:61:73:e2:5e:df:96:c7:
                     -         5a:02:13:8f:66:df:9d:05:99:71:e9:ef:6d:a9:cf:28:83:40:
                     -         8e:48:d3:8f:6a:37:b5:f0:a6:13:63:28:76:8d:3f:3d:35:94:
                     -         d8:ef:3a:15:bc:ac:5c:63:0a:ae:60:fa:78:6f:1e:67:0d:7d:
                     -         22:b4:60:3d:95:10:93:5a:49:ee:30:58:81:e3:5c:07:65:46:
                     -         b2:02:76:32:6c:2e:2c:79:0c:f7:d9:c1:4f:5a:e4:20:53:08:
                     -         d7:68:79:36:a8:59:e2:ce:7a:8f:50:32:20:a7:b6:6a:ba:33:
                     -         55:b6:bd:a6:e8:91:c3:36:b1:3b:ab:1f:ee:d7:d4:d4:dd:28:
                     -         98:53:d5:18:f7:44:dd:e8:dd:61:88:20:39:9e:1c:53:ab:6c:
                     -         92:2b:7c:08:6a:8f:98:8b:9d:33:ac:12:b1:c6:ba:7b:45:57:
                     -         a0:9d:9b:0c:46:a1:22:e1
                     -MIIFoTCCA4mgAwIBAgIBADANBgkqhkiG9w0BAQsFADBpMQswCQYDVQQGEwJVUzEL
                     -MAkGA1UECAwCTUQxDzANBgNVBAcMBkxhdXJlbDEOMAwGA1UECgwFQ2lzY28xDjAM
                     -BgNVBAsMBVRhbG9zMRwwGgYDVQQDDBNDbGFtQVYgQkVUQSBSb290IENBMB4XDTI1
                     -MDMyNjIxMzE1NloXDTI1MDcyNDIxMzE1NlowaDELMAkGA1UEBhMCVVMxCzAJBgNV
                     -BAgMAk1EMQ4wDAYDVQQKDAVDaXNjbzEOMAwGA1UECwwFVGFsb3MxLDAqBgNVBAMM
                     -I0NsYW1BViBCRVRBIEludGVybWVkaWF0ZSBTaWduaW5nIENBMIICIjANBgkqhkiG
                     -9w0BAQEFAAOCAg8AMIICCgKCAgEAoWtqsHZwNeHT5UkdP+AsH/O9OMvLe+zj8yAn
                     -HJkemYnQ9BHvshhsGyVAVRiwxOgDCmQwEfqyK2/LK7iqDCk2d2/PEjVnFOkCZa1u
                     -+/r5s6KcG9iQcBUQ0Ckrn0lr3HX7NDbozyIQA41+lyzGnL4pM7hruFSSoCiSoAzv
                     -RqYPlHrEUe+pkw9GQ2MdNvhRTL6PiQapBW/iQKm042nVIEgtsNgrJbGvCDuophiE
                     -DAVULUCg4b+vGCIth2mDiW3P018rAX3UTtssgLJ3JV9V4dTU/q16fCuz7zJzqvfy
                     -Q06u0yVpV8gLz4y9M9kFh517CeJZPwHSVK/EipfXS87ZrRVvIYriJCcDYC5tHd2+
                     -63ejTazWAUrU7Ia3tp0CPSp/4F8CD1jRC8t74v/p810Pb9ESd1+A55Zn3dcTLjzP
                     -t9Y2M1Vu5PhnCLvtmmFEJ7DiEQq5P/2lK5bkf15gxn2M1hlkef8CmOtT2zWfrKcC
                     -UZKFN5ojHvPEtssLfWXtUBCURw3MKjSnZf3ewMEBrOlPwgItsuvF+ObbzaqHkWOU
                     -QF4AC/EIBwSFec7IQ8/Jr2YxIOdYv91ry9SkieLAERUCyoDMlyo29n+cePJcNXDJ
                     -WG+VkSWI49fawA+4zV4un2fSFHTHMQmRhw2XnzDzchysmMHa8rONnjYhy+jZU0+Y
                     -LtitRK8CAwEAAaNVMFMwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
                     -HQYDVR0lBBYwFAYIKwYBBQUHAwkGCCsGAQUFBwMEMBEGCWCGSAGG+EIBAQQEAwIC
                     -BDANBgkqhkiG9w0BAQsFAAOCAgEATIwt+SKk3vaRMI5QrRsc+PHg5ZN7Vxx1tOE7
                     -8UMSwa9aAMShW26bB3SDaAF81EQlQTA0fXlZ9KzfSkQc8KLirB1gtYNIVahFZjFD
                     -nSoM3w4GXuXhHdeZLTNgL/I58Dwfw6j/hTR13Sc10qLzNrwXgM5giSlmDO6OHYLf
                     -pjMrR6n8KuOCsgfiijrf7TxOYdXD+N/S08b017mncTK/QunSmSXvDY1+DywXK7LG
                     -4DF/BoWvrlLps0wGfxqd7iHy4VOUc818ll3AtxpVVXLIE0+wxspqRnWq+RyddJTV
                     -h1A5NkpB6054ybadzu9oV3bmiaaCuetphI4k4mJtP00C6ipdz6B0agoMtTFcVGGW
                     -hskHwPS14GYlYyiePuxjpgSqA90wQH905YxVeR9BbVJyzpLtmhOuMGiABIZdu0Lj
                     -9mMg4ob1cngwNJFYNR3baAJ6Yd5hc+Je35bHWgITj2bfnQWZcenvbanPKINAjkjT
                     -j2o3tfCmE2Modo0/PTWU2O86FbysXGMKrmD6eG8eZw19IrRgPZUQk1pJ7jBYgeNc
                     -B2VGsgJ2MmwuLHkM99nBT1rkIFMI12h5NqhZ4s56j1AyIKe2arozVba9puiRwzax
                     -O6sf7tfU1N0omFPVGPdE3ejdYYggOZ4cU6tskit8CGqPmIudM6wSsca6e0VXoJ2b
                     -DEahIuE=

@@ -115,42 +115,45 @@ pub unsafe extern "C" fn codesign_sign_file(
                          let signature_file_path_str = validate_str_param!(signature_file_path_str);
                          let signature_file_path = Path::new(signature_file_path_str);
                     -    let cert_path_strs: &[*const i8] = std::slice::from_raw_parts(cert_paths_str, cert_paths_len);
                     +    let cert_path_strs: &[*const c_char] =
                     +        std::slice::from_raw_parts(cert_paths_str, cert_paths_len);
                          // now convert the cert_path_strs to a Vec<&Path>
                     -    let cert_paths: Vec<PathBuf> = cert_path_strs
                     -        .iter()
                     -        .filter_map(|&path_str| -> Option<PathBuf> {
                     -            let path_str = if path_str.is_null() {
                     -                warn!("Intermiediate path string is NULL");
                     -                return None;
                     -            } else {
                     -                #[allow(unused_unsafe)]
                     -                match unsafe { CStr::from_ptr(path_str) }.to_str() {
                     -                    Err(e) => {
                     -                        warn!("Intermediate path string is not valid unicode: {}", e);
                     -                        return None;
                     -                    }
                     -                    Ok(s) => Some(s),
                     -                }
                     -            };
+                    -
                     -            if let Some(path_str) = path_str {
                     -                match Path::new(path_str).canonicalize() {
                     -                    Ok(path) => Some(path),
                     -                    Err(e) => {
                     -                        warn!(
                     -                            "Invalid intermediate certificate path: '{}' {}",
                     -                            path_str, e
                     -                        );
                     -                        None
                     -                    }
                     -                }
                     -            } else {
                     -                None
                     +    let mut cert_paths: Vec<PathBuf> = Vec::with_capacity(cert_paths_len);
+                    +
                     +    for &path_str in cert_path_strs {
                     +        if path_str.is_null() {
                     +            return ffi_error!(
                     +                err = err,
                     +                Error::SignFailed("Intermediate certificate path is NULL".to_string())
                     +            );
                     +        }
+                    +
                     +        #[allow(unused_unsafe)]
                     +        let path_str = CStr::from_ptr(path_str)
                     +            .to_str()
                     +            .map_err(|e| {
                     +                warn!("Intermediate path string is not valid unicode: {e}");
                     +                ffi_error!(
                     +                    err = err,
                     +                    Error::SignFailed("Intermediate certificate path is NULL".to_string())
                     +                )
                     +            })
                     +            .unwrap();
+                    +
                     +        match Path::new(path_str).canonicalize() {
                     +            Ok(path) => cert_paths.push(path),
                     +            Err(e) => {
                     +                warn!("Invalid intermediate certificate path: '{path_str}' {e}",);
                     +                return ffi_error!(
                     +                    err = err,
                     +                    Error::SignFailed(format!(
                     +                        "Invalid intermediate certificate path: '{path_str}': {e}",
                     +                    ))
                     +                );
+                                 }
                     -        })
                     -        .collect();
                     +        }
                     +    }
                          let signing_key_path_str = validate_str_param!(signing_key_path_str);
                          let signing_key_path = match Path::new(signing_key_path_str).canonicalize() {
@@ -159,8 +162,7 @@ pub unsafe extern "C" fn codesign_sign_file(
                                  return ffi_error!(
                                      err = err,
                                      Error::SignFailed(format!(
                     -                    "Invalid signing key path '{}': {}",
                     -                    signing_key_path_str, e
                     +                    "Invalid signing key path '{signing_key_path_str}': {e}",
                                      ))
                                  );
+                             }
@@ -372,7 +374,6 @@ pub unsafe extern "C" fn codesign_verifier_new(
                      #[export_name = "codesign_verifier_free"]
                      pub unsafe extern "C" fn codesign_verifier_free(verifier: *mut c_void) {
                          if verifier.is_null() {
                     -        return;
                          } else {
                              let _ = unsafe { Box::from_raw(verifier as *mut Verifier) };
+                         }

@@ -980,7 +980,7 @@ static int sign(const struct optstruct *opts)
                          if (NULL == target) {
                              mprintf(LOGG_ERROR, "sign: No target file specified.\n");
                              mprintf(LOGG_ERROR, "To sign a file with sigtool, you must specify a target file and use the --key and --cert options.\n");
                     -        mprintf(LOGG_ERROR, "For example:  sigtool --sign myfile.cvd --key /path/to/private.key --cert /path/to/public.pem --cert /path/to/intermediate.pem --cert /path/to/root-ca.pem\n");
                     +        mprintf(LOGG_ERROR, "For example:  sigtool --sign myfile.cvd --key /path/to/private.key --cert /path/to/public.crt --cert /path/to/intermediate.crt --cert /path/to/root-ca.crt\n");
                              goto done;
+                         }
@@ -994,7 +994,7 @@ static int sign(const struct optstruct *opts)
                          if (NULL == target) {
                              mprintf(LOGG_ERROR, "sign: No private key specified.\n");
                              mprintf(LOGG_ERROR, "To sign a file with sigtool, you must specify a target file and use the --key and --cert options.\n");
                     -        mprintf(LOGG_ERROR, "For example:  sigtool --sign myfile.cvd --key /path/to/private.key --cert /path/to/public.pem --cert /path/to/intermediate.pem --cert /path/to/root-ca.pem\n");
                     +        mprintf(LOGG_ERROR, "For example:  sigtool --sign myfile.cvd --key /path/to/private.key --cert /path/to/public.crt --cert /path/to/intermediate.crt --cert /path/to/root-ca.crt\n");
                              goto done;
+                         }
@@ -1002,7 +1002,7 @@ static int sign(const struct optstruct *opts)
                          if (NULL == opt) {
                              mprintf(LOGG_ERROR, "sign: No signing or intermediate certificates specified.\n");
                              mprintf(LOGG_ERROR, "To sign a file with sigtool, you must specify a target file and use the --key and --cert options.\n");
                     -        mprintf(LOGG_ERROR, "For example:  sigtool --sign myfile.cvd --key /path/to/private.key --cert /path/to/public.pem --cert /path/to/intermediate.pem --cert /path/to/root-ca.pem\n");
                     +        mprintf(LOGG_ERROR, "For example:  sigtool --sign myfile.cvd --key /path/to/private.key --cert /path/to/public.crt --cert /path/to/intermediate.crt --cert /path/to/root-ca.crt\n");
                              goto done;
+                         }
@@ -1010,7 +1010,7 @@ static int sign(const struct optstruct *opts)
                              if (!opt->strarg) {
                                  mprintf(LOGG_ERROR, "sign: The --cert option requires a path value to a signing or intermediate certificate.\n");
                                  mprintf(LOGG_ERROR, "To sign a file with sigtool, you must specify a target file and use the --key and --cert options.\n");
                     -            mprintf(LOGG_ERROR, "For example:  sigtool --sign myfile.cvd --key /path/to/private.key --cert /path/to/public.pem --cert /path/to/intermediate.pem --cert /path/to/root-ca.pem\n");
                     +            mprintf(LOGG_ERROR, "For example:  sigtool --sign myfile.cvd --key /path/to/private.key --cert /path/to/public.crt --cert /path/to/intermediate.crt --cert /path/to/root-ca.crt\n");
                                  goto done;
+                             }

@@ -264,7 +264,7 @@ set(ENVIRONMENT
                          CK_DEFAULT_TIMEOUT=300
                          LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
                          DYLD_LIBRARY_PATH=${LD_LIBRARY_PATH}
                     -    CVD_CERTS_DIR=${CMAKE_SOURCE_DIR}/unit_tests/input/signing/public
                     +    CVD_CERTS_DIR=${CMAKE_SOURCE_DIR}/unit_tests/input/signing/verify
                          PATH=${NEW_PATH}
                          LIBSSL=${LIBSSL}
                          LIBCRYPTO=${LIBCRYPTO}

@@ -57,7 +57,7 @@ set(ENCRYPTED_TESTFILES
                          clamav_hdb_scanfiles/clam.exe.2007.one
                          clamav_hdb_scanfiles/clam.exe.2010.one
                          clamav_hdb_scanfiles/clam.exe.webapp-export.one
                     -    signing/private/signing-test.key
                     +    signing/sign/signing-test.key
+                     )
                      if(ENABLE_UNRAR)
@@ -69,7 +69,7 @@ endif()
                      add_custom_target(tgt_build_unit_tests_directories ALL
                          COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/clamav_hdb_scanfiles
                     -    COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/signing/private
                     +    COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/signing/sign
+                     )
                      # Decrypt test file

@@ -1,2 +1,2 @@
                      #clamsign-1.0
                     -220::pkcs7-pem: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
                     +220::pkcs7-pem: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

                     deleted file mode 100644
@@ -1,122 +0,0 @@
                     -Certificate:
                     -    Data:
                     -        Version: 3 (0x2)
                     -        Serial Number: 0 (0x0)
                     -        Signature Algorithm: sha256WithRSAEncryption
                     -        Issuer: C=US, ST=MD, O=Cisco, OU=Talos, CN=ClamAV TEST Intermediate Signing CA
                     -        Validity
                     -            Not Before: Mar 26 17:56:33 2025 GMT
                     -            Not After : Mar 24 17:56:33 2035 GMT
                     -        Subject: C=US, ST=MD, O=Cisco, OU=Talos, CN=ClamAV TEST CVD Signing Cert
                     -        Subject Public Key Info:
                     -            Public Key Algorithm: rsaEncryption
                     -                RSA Public-Key: (4096 bit)
                     -                Modulus:
                     -                    00:bf:ea:90:5a:0d:4c:d4:5a:05:82:5b:8b:2e:5c:
                     -                    14:e2:af:17:a7:f5:9c:f2:c3:be:4f:41:71:cc:25:
                     -                    fb:02:98:fb:8b:7f:b1:fd:14:e2:32:db:23:88:4e:
                     -                    4c:ad:ff:f0:98:2f:cc:63:e1:10:f9:9e:16:4d:0c:
                     -                    37:74:56:f8:fa:c5:0c:6b:2d:a7:5b:ed:d8:5d:44:
                     -                    c5:ca:34:01:30:10:d0:dd:a3:44:e9:a3:32:d2:cc:
                     -                    48:fb:45:7d:01:85:61:aa:92:df:5e:12:17:e3:4b:
                     -                    eb:33:80:48:fd:b3:74:76:33:3d:d9:a7:3f:7c:7a:
                     -                    49:1f:b9:77:80:72:49:67:87:a6:01:3c:20:4b:7f:
                     -                    58:67:61:c4:44:a9:17:8e:e7:59:04:f6:a8:de:fb:
                     -                    49:93:24:4d:10:66:70:cd:c7:98:f4:e8:98:80:96:
                     -                    34:89:4c:a4:11:a2:ec:9a:05:0d:72:0d:8c:33:05:
                     -                    00:19:ff:fc:b3:a0:87:57:2e:df:24:c0:f4:33:3b:
                     -                    83:98:1b:fc:f0:9d:37:2d:4d:8a:a5:f5:af:93:9b:
                     -                    a7:23:55:26:11:5e:24:ab:72:95:fe:01:5e:c9:87:
                     -                    d2:ac:ac:b8:12:d0:7e:13:57:14:5f:3b:93:31:c3:
                     -                    a3:ef:18:25:76:cd:d0:4f:9b:a2:b5:3a:7c:59:3d:
                     -                    97:a4:bb:71:8d:6a:fd:eb:5a:da:7c:f6:9d:f2:63:
                     -                    4c:8d:16:37:5f:c3:ed:c3:de:6e:18:45:f3:eb:d4:
                     -                    57:aa:27:8c:4c:fd:66:73:cd:2f:c4:70:22:ae:27:
                     -                    c7:8a:e8:0c:ff:11:66:2b:16:6a:f1:d7:46:a6:41:
                     -                    c9:98:66:3a:02:01:60:90:87:31:b2:5d:6f:e0:0a:
                     -                    08:65:6b:78:d9:1e:b4:13:4d:a2:f7:89:c6:8e:c9:
                     -                    6d:d7:16:bd:f2:03:c0:33:d7:7e:ad:67:f3:d1:ca:
                     -                    75:e6:7c:44:28:44:1e:2b:a6:2e:0b:d6:37:6d:f4:
                     -                    1b:93:c1:b0:f0:df:ff:f6:25:fc:a0:f7:ad:7c:9f:
                     -                    43:a2:c3:35:cd:f8:e4:61:19:b0:f9:e9:6f:e2:8a:
                     -                    18:d0:b5:2a:86:eb:83:2f:8a:8a:05:e4:ec:ef:1d:
                     -                    42:0c:68:f8:e6:74:f5:f7:8f:0b:94:ed:53:3a:73:
                     -                    8f:19:64:25:54:4d:22:5a:2f:b1:c6:30:f7:2e:68:
                     -                    ca:aa:42:e5:d8:43:2e:f2:44:f3:ae:bc:fd:3b:30:
                     -                    28:21:87:0a:b5:15:57:65:99:eb:a3:cf:2d:58:8e:
                     -                    f8:e7:0a:b0:2a:9d:d6:29:a0:21:b6:51:0d:29:f7:
                     -                    7e:01:ea:bd:a7:d1:76:f4:9b:d8:24:5b:63:19:49:
                     -                    2f:19:27
                     -                Exponent: 65537 (0x10001)
                     -        X509v3 extensions:
                     -            X509v3 Basic Constraints: critical
                     -                CA:FALSE
                     -            X509v3 Key Usage: critical
                     -                Digital Signature
                     -            X509v3 Extended Key Usage: critical
                     -                Code Signing, E-mail Protection
                     -            X509v3 Subject Key Identifier:
                     -                33:FE:76:C8:0A:53:42:DB:61:DC:B7:5E:48:7C:DF:C1:81:C0:16:70
                     -    Signature Algorithm: sha256WithRSAEncryption
                     -         8f:57:26:a0:71:a3:e7:0c:fa:ba:01:a7:86:c4:1b:8d:0a:2c:
                     -         24:38:52:e7:2c:c8:be:33:9a:98:78:55:d8:cb:68:65:0c:bc:
                     -         9c:e8:07:c7:1f:6e:61:64:f3:a8:86:72:e2:a0:35:6c:cb:44:
                     -         86:9c:4b:98:08:e3:0e:ac:bf:ac:31:1b:d7:db:f9:27:2d:72:
                     -         69:0b:f1:47:b9:c5:06:3c:9b:61:1f:ae:db:09:52:13:8b:99:
                     -         e4:dd:cb:14:6b:ac:83:e7:ee:97:9e:81:a7:31:25:85:83:e2:
                     -         7b:01:eb:c9:7e:6f:bf:88:50:8f:a6:07:14:de:e9:13:d6:7b:
                     -         ab:27:7f:94:27:57:74:62:61:03:8e:3a:48:f3:d6:07:74:32:
                     -         b4:e9:e7:d5:a2:96:0c:0b:74:36:a3:fd:7b:33:81:ff:85:18:
                     -         a4:65:f7:4f:60:eb:23:69:eb:68:c1:3b:ad:66:3d:2e:4e:6c:
                     -         8d:04:85:2b:4d:2d:ef:6d:c9:3f:da:cd:2d:cb:99:bf:53:57:
                     -         e0:22:0a:e5:19:6c:76:68:0e:58:ef:e9:ce:61:cf:da:73:61:
                     -         55:e1:19:05:08:3c:b3:d8:5f:1c:69:a3:4d:b8:dc:f5:75:59:
                     -         94:1f:e5:b3:fe:a0:24:65:10:4c:3b:ab:2c:63:65:ff:01:bb:
                     -         ab:83:3b:9e:99:2a:19:39:b5:2a:52:b2:7d:1c:a8:56:f1:c3:
                     -         af:5b:9a:19:2b:ec:f6:71:b0:db:92:f8:54:fb:0d:4f:de:a4:
                     -         8d:3d:18:73:56:34:6f:4a:d3:a8:40:77:30:78:3d:5a:6b:4d:
                     -         9f:12:72:6c:d3:9f:56:22:4c:e8:71:31:e2:30:ec:17:32:87:
                     -         30:e8:68:5f:da:3f:5b:b3:8e:95:c6:31:de:01:f6:d0:0b:0a:
                     -         d3:ae:34:49:cd:d6:d9:95:39:ba:4a:d4:7d:27:34:13:e3:a3:
                     -         24:f2:a4:01:df:2a:b8:47:31:4b:6f:16:da:8f:43:44:af:5f:
                     -         51:15:d7:18:c1:d1:24:19:8d:d3:5c:db:d6:5c:aa:b9:af:4e:
                     -         7d:87:43:a5:33:d2:da:27:5f:59:1e:8d:9a:f0:32:ff:d2:79:
                     -         42:4e:f9:7d:81:be:3c:f7:71:43:d3:ee:cc:95:a7:3c:50:77:
                     -         39:7f:23:dc:05:bb:d4:8e:58:5f:5d:39:05:c6:ea:ac:3a:cf:
                     -         5e:50:33:56:f6:9c:56:c3:bf:f8:c8:2f:56:85:ec:a1:4e:22:
                     -         60:4d:77:de:68:bb:bb:39:cb:af:3b:a8:ed:c1:c9:04:95:65:
                     -         a5:c1:bf:66:0a:4e:00:84:6c:be:e2:94:ba:25:bb:8d:47:f8:
                     -         25:6c:c3:d2:39:d1:9b:f5
                     -MIIFpTCCA42gAwIBAgIBADANBgkqhkiG9w0BAQsFADBoMQswCQYDVQQGEwJVUzEL
                     -MAkGA1UECAwCTUQxDjAMBgNVBAoMBUNpc2NvMQ4wDAYDVQQLDAVUYWxvczEsMCoG
                     -A1UEAwwjQ2xhbUFWIFRFU1QgSW50ZXJtZWRpYXRlIFNpZ25pbmcgQ0EwHhcNMjUw
                     -MzI2MTc1NjMzWhcNMzUwMzI0MTc1NjMzWjBhMQswCQYDVQQGEwJVUzELMAkGA1UE
                     -CAwCTUQxDjAMBgNVBAoMBUNpc2NvMQ4wDAYDVQQLDAVUYWxvczElMCMGA1UEAwwc
                     -Q2xhbUFWIFRFU1QgQ1ZEIFNpZ25pbmcgQ2VydDCCAiIwDQYJKoZIhvcNAQEBBQAD
                     -ggIPADCCAgoCggIBAL/qkFoNTNRaBYJbiy5cFOKvF6f1nPLDvk9Bccwl+wKY+4t/
                     -sf0U4jLbI4hOTK3/8JgvzGPhEPmeFk0MN3RW+PrFDGstp1vt2F1Exco0ATAQ0N2j
                     -ROmjMtLMSPtFfQGFYaqS314SF+NL6zOASP2zdHYzPdmnP3x6SR+5d4BySWeHpgE8
                     -IEt/WGdhxESpF47nWQT2qN77SZMkTRBmcM3HmPTomICWNIlMpBGi7JoFDXINjDMF
                     -ABn//LOgh1cu3yTA9DM7g5gb/PCdNy1NiqX1r5ObpyNVJhFeJKtylf4BXsmH0qys
                     -uBLQfhNXFF87kzHDo+8YJXbN0E+borU6fFk9l6S7cY1q/eta2nz2nfJjTI0WN1/D
                     -7cPebhhF8+vUV6onjEz9ZnPNL8RwIq4nx4roDP8RZisWavHXRqZByZhmOgIBYJCH
                     -MbJdb+AKCGVreNketBNNoveJxo7JbdcWvfIDwDPXfq1n89HKdeZ8RChEHiumLgvW
                     -N230G5PBsPDf//Yl/KD3rXyfQ6LDNc345GEZsPnpb+KKGNC1Kobrgy+KigXk7O8d
                     -Qgxo+OZ09fePC5TtUzpzjxlkJVRNIlovscYw9y5oyqpC5dhDLvJE8668/TswKCGH
                     -CrUVV2WZ66PPLViO+OcKsCqd1imgIbZRDSn3fgHqvafRdvSb2CRbYxlJLxknAgMB
                     -AAGjYTBfMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMCAGA1UdJQEB/wQW
                     -MBQGCCsGAQUFBwMDBggrBgEFBQcDBDAdBgNVHQ4EFgQUM/52yApTQtth3LdeSHzf
                     -wYHAFnAwDQYJKoZIhvcNAQELBQADggIBAI9XJqBxo+cM+roBp4bEG40KLCQ4Uucs
                     -yL4zmph4VdjLaGUMvJzoB8cfbmFk86iGcuKgNWzLRIacS5gI4w6sv6wxG9fb+Sct
                     -cmkL8Ue5xQY8m2EfrtsJUhOLmeTdyxRrrIPn7peegacxJYWD4nsB68l+b7+IUI+m
                     -BxTe6RPWe6snf5QnV3RiYQOOOkjz1gd0MrTp59WilgwLdDaj/Xszgf+FGKRl909g
                     -6yNp62jBO61mPS5ObI0EhStNLe9tyT/azS3Lmb9TV+AiCuUZbHZoDljv6c5hz9pz
                     -YVXhGQUIPLPYXxxpo0243PV1WZQf5bP+oCRlEEw7qyxjZf8Bu6uDO56ZKhk5tSpS
                     -sn0cqFbxw69bmhkr7PZxsNuS+FT7DU/epI09GHNWNG9K06hAdzB4PVprTZ8ScmzT
                     -n1YiTOhxMeIw7BcyhzDoaF/aP1uzjpXGMd4B9tALCtOuNEnN1tmVObpK1H0nNBPj
                     -oyTypAHfKrhHMUtvFtqPQ0SvX1EV1xjB0SQZjdNc29ZcqrmvTn2HQ6Uz0tonX1ke
                     -jZrwMv/SeUJO+X2Bvjz3cUPT7syVpzxQdzl/I9wFu9SOWF9dOQXG6qw6z15QM1b2
                     -nFbDv/jIL1aF7KFOImBNd95ou7s5y687qO3ByQSVZaXBv2YKTgCEbL7ilLolu41H
                     -+CVsw9I50Zv1

121	1	deleted file mode 100644
122	2	Binary files a/unit_tests/input/signing/private/signing-test.key.xor and /dev/null differ

                     deleted file mode 100644
@@ -1,153 +0,0 @@
                     -MIIFWTCCA0ECFE2pmfv8w11dekWvzh/bw7eQEp99MA0GCSqGSIb3DQEBCwUAMGkx
                     -CzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNRDEPMA0GA1UEBwwGTGF1cmVsMQ4wDAYD
                     -VQQKDAVDaXNjbzEOMAwGA1UECwwFVGFsb3MxHDAaBgNVBAMME0NsYW1BViBURVNU
                     -IFJvb3QgQ0EwHhcNMjUwMzI2MTc1NjMyWhcNMjcwMzI2MTc1NjMyWjBpMQswCQYD
                     -VQQGEwJVUzELMAkGA1UECAwCTUQxDzANBgNVBAcMBkxhdXJlbDEOMAwGA1UECgwF
                     -Q2lzY28xDjAMBgNVBAsMBVRhbG9zMRwwGgYDVQQDDBNDbGFtQVYgVEVTVCBSb290
                     -IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA1ARsUmzhLiv2scny
                     -9viNJPeROHSrZ8pPG4weMyjDdDhbrrCjPoBXMFYDqLGt853W20gWpbBq9wdZbbaS
                     -kqgv5DMy5FAtZcplx68Ern5TbbJkD5KiE9FA1FPAGL9Cq6JXKerSxj0njX6U8K+d
                     -FqOUXqyWRk1HMD8UiynrpwDD6tpsfevOTIlbLpwvi3xb79EAXq2vHoyH2bkiY/+H
                     -QzezYkBVRxRDt1q4XiklPpoX/2vnROQ9n8yQ0CH/bC0SSwQNHBXOTmTDsKtCfEhD
                     -mGCY62dfBlotZiJTKj/mCZZ1/Yb3UCRm1yqhuDJFnubAyHsTL1KScN73ICI2JA8b
                     -jiqHr5Cl8Q2olgd4iQs+HdzxXObZUGoaG+3mOG5SRq9CWyjGn37HZpTQsll3jlld
                     -kRWVliVDfwTSqp8R2aqd8cDrjtzKqUkCAVgLswTLybpFvlIvY+VDyCvlszFxxvVY
                     -9qKn9IBXaT33zO4oAgxQGsnXLpL6lM86n81Dl6Yvb2r8SY5mMIvuMQYm16fKCf9C
                     -2ZCV7pQcOgaUKk3/eqqwu4Bvt4Y2wtG5ABSoboAMixOdE2XUPzBKcKxdNN/PcD5P
                     -Hb3ogTCeUM44o3onhD2xaMR7tOtZtGT2AdA4zhVfuJi7MsU7ia/oCA2/Om6LUYL1
                     -H7YXGl4/FKz9OTZqGtnn6qt1lPkCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAMAQQ
                     -i6IgsNzSijrtykLCs0Ocjzjr1vGEY9gs0z+InleRD+SOPnS9/aa7ZlvduR3pPlMp
                     -/roV8+GSEwV6tgvxF5V5KYXpAl1hmeZnx6p/BtPtaTkq6uKJOoErrQuC2KkHn8Dp
                     -olb4N9IkDNkVmPYupSDTy4ZX2GRFkCOvPnUVP+pXY7IVVuR6LEAQ9bm+Rwfyd+TZ
                     -bdKA3wnNLmTAyLjS2UNTBlXAf6iKi/k/UEfbriCEDaXafx860DX2iTdhNUlBL5ba
                     -GpW/AZpCEsLGAQ6wFOXpmGFjjKgND3B83MRAiaH5iINrDB2c2+pNU/5QXhOGEkDq
                     -/I7jRq/t96fYH+xpyCg5gNlKfQznvvS01GrssNblGZ1sdDuRMp9TCZ31WS09BM01
                     -6hXM85CSnoYXdv77bapx3v9bAupo5hUyY5pGDJu6GRJZ6u/xd7c4CJv/NlKMeKX4
                     -H51VoTZiU47DZ9uplnDB5fXsgsf6gutdQrr8DmKeEhS7YhBdRhoQOt4FRwknlS76
                     -bFMAGSxH/XPJDqOFXXR2arhZNP/s//suaNVSWF4gLgVSmmzLB5I2RzG/klW6b1GT
                     -46tsFUOLkEWnMKOvHfo3zPstS8u/W9CYf0xCqLaSINXmaNXver/dXugixu9M15bc
                     -72CWJ5EESQkTUCIuJIR6uLWu73rKPEy+0LOkDDQ=
                     -Certificate:
                     -    Data:
                     -        Version: 3 (0x2)
                     -        Serial Number: 0 (0x0)
                     -        Signature Algorithm: sha256WithRSAEncryption
                     -        Issuer: C=US, ST=MD, L=Laurel, O=Cisco, OU=Talos, CN=ClamAV TEST Root CA
                     -        Validity
                     -            Not Before: Mar 26 17:56:32 2025 GMT
                     -            Not After : Mar 24 17:56:32 2035 GMT
                     -        Subject: C=US, ST=MD, O=Cisco, OU=Talos, CN=ClamAV TEST Intermediate Signing CA
                     -        Subject Public Key Info:
                     -            Public Key Algorithm: rsaEncryption
                     -                RSA Public-Key: (4096 bit)
                     -                Modulus:
                     -                    00:f1:ea:9a:80:66:7a:15:d7:7c:09:93:bb:0a:f4:
                     -                    c3:a0:7f:cc:c1:2a:bc:c8:27:5b:0a:87:f0:63:53:
                     -                    cf:b5:9b:6c:84:26:68:0b:0e:2c:df:d3:8b:36:db:
                     -                    65:b3:2f:b7:4d:1a:ba:b8:69:f5:ad:d1:73:1c:63:
                     -                    f2:e6:c1:82:9e:47:78:00:62:2f:7c:3a:c1:2b:06:
                     -                    7f:af:8c:ea:28:16:0f:3a:61:a7:9a:1e:01:01:a4:
                     -                    be:f3:72:0a:44:99:c6:f2:a4:6d:3e:27:30:59:2e:
                     -                    85:1c:81:1a:71:0b:b3:59:7d:4b:43:76:96:53:85:
                     -                    75:e5:31:2f:97:a5:1a:41:d7:44:0e:d1:9e:15:5f:
                     -                    a5:51:ca:b7:ef:a7:0c:d3:71:5f:9d:74:74:6e:40:
                     -                    04:2a:df:8a:26:77:e8:8c:4a:fb:c6:76:35:66:00:
                     -                    6f:7c:92:d4:8a:1e:20:ef:88:9e:07:52:dd:7a:9f:
                     -                    77:5c:c8:f9:62:c6:e8:55:8f:23:5f:75:e2:7b:f6:
                     -                    99:c3:e1:8d:0c:c8:fe:e6:42:72:35:9c:38:0f:b1:
                     -                    3b:4e:12:5b:db:ea:9f:ff:86:cf:0e:11:fa:5d:ba:
                     -                    b0:f3:cc:c8:81:9d:ea:83:ae:a1:72:2b:85:fd:72:
                     -                    ce:82:7c:8d:e1:04:7b:48:76:67:87:f6:ff:ed:4d:
                     -                    07:cb:36:2e:11:e9:e5:bb:70:1f:f0:65:5a:4a:2d:
                     -                    e3:22:40:9d:a1:02:48:90:bb:55:01:4a:7c:a0:06:
                     -                    fe:3a:e4:16:26:7b:af:24:6b:26:f0:c1:71:3d:c2:
                     -                    f2:7d:cb:a0:dd:33:1c:b6:81:0c:a4:da:96:07:39:
                     -                    43:00:39:e5:72:c9:cf:5d:1e:2c:68:d2:59:70:37:
                     -                    f4:91:69:75:00:2c:93:ee:46:98:d1:4e:f6:bc:aa:
                     -                    f2:0f:63:f0:5b:64:45:c5:0c:7a:90:f4:8e:71:b7:
                     -                    30:fa:ed:53:28:28:e8:81:d1:23:2f:d5:87:61:8a:
                     -                    ec:34:76:03:14:b9:6e:3a:7a:82:8c:ec:b2:dc:35:
                     -                    95:dd:25:57:3e:48:3a:76:93:e6:ea:45:c6:bb:c7:
                     -                    75:36:cf:98:50:da:96:06:4d:6f:d2:69:88:a1:35:
                     -                    fc:f3:1d:c5:65:15:21:e9:ec:b3:13:fd:2b:71:85:
                     -                    a8:93:11:7c:1e:25:3f:6a:25:12:bf:70:4d:0e:94:
                     -                    6b:a7:4d:8a:a9:a0:be:f5:bb:ba:e3:f4:67:db:46:
                     -                    a5:9e:93:4c:06:21:6d:04:05:93:91:e9:ae:3e:78:
                     -                    cc:7f:6d:5e:16:00:1c:27:4c:2b:b0:4b:6e:da:f7:
                     -                    5f:bb:8c:01:71:a0:97:f9:52:ee:55:cb:10:af:6f:
                     -                    b9:87:93
                     -                Exponent: 65537 (0x10001)
                     -        X509v3 extensions:
                     -            X509v3 Basic Constraints: critical
                     -                CA:TRUE
                     -            X509v3 Key Usage: critical
                     -                Certificate Sign, CRL Sign
                     -            X509v3 Extended Key Usage:
                     -                OCSP Signing, E-mail Protection
                     -            Netscape Cert Type:
                     -                SSL CA
                     -    Signature Algorithm: sha256WithRSAEncryption
                     -         60:bb:44:94:79:f6:2a:15:44:12:ff:a2:2c:38:26:a9:40:4b:
                     -         cd:a4:b6:1f:30:e7:73:16:39:06:12:48:dd:b2:a2:0d:59:bd:
                     -         cb:2c:d2:6e:59:01:02:95:d3:f5:1c:bf:7f:01:a6:0d:5b:bf:
                     -         fe:56:e5:b6:90:a3:72:24:ed:ea:82:0f:d8:ab:b4:ae:e5:eb:
                     -         88:5a:31:30:09:6e:f5:1c:c6:28:14:5d:f6:3d:94:b1:8a:1a:
                     -         52:18:bb:b3:ad:3d:69:ee:ec:5e:ca:76:a4:52:a0:c6:11:e1:
                     -         f8:2e:e3:8d:fb:f5:db:98:a5:69:6b:98:20:0d:0b:f8:b2:39:
                     -         8e:8c:6f:56:d1:97:59:6f:d9:b5:8c:d9:1b:12:23:74:79:05:
                     -         06:3b:1b:f3:5e:9e:72:62:fb:be:e1:39:41:85:63:97:4c:ed:
                     -         06:05:65:e0:bb:3a:d5:e9:16:78:e7:3c:07:7f:c3:c3:b9:62:
                     -         fe:7a:f3:c1:47:79:90:d5:83:c9:a1:a1:c8:54:94:f4:0e:d7:
                     -         f2:31:ac:9e:be:98:7d:aa:48:a5:a4:45:d0:f1:11:9c:1d:51:
                     -         89:4c:8d:1e:68:43:92:ae:bd:65:ba:b1:cd:f6:0f:30:2e:bd:
                     -         3a:f5:48:5b:7a:4b:5e:ec:12:d0:2b:7d:b7:f4:3a:e4:67:81:
                     -         0c:37:fe:cc:6a:c0:e3:7f:3c:00:02:66:86:19:4d:4e:5c:76:
                     -         22:2b:08:e4:2f:bf:de:00:30:33:f2:f8:9b:fb:fd:85:f7:46:
                     -         a9:31:20:78:d1:04:b9:84:e3:30:53:4a:aa:ac:e2:c5:19:ff:
                     -         23:56:6d:81:aa:6d:16:5e:ea:ab:79:30:f1:2e:79:38:4a:4b:
                     -         57:cc:7f:ac:a6:37:13:98:76:40:e6:4d:ea:8e:a2:5e:3a:09:
                     -         5b:72:c3:d2:a7:3b:06:65:1a:8f:43:5a:5f:8e:d3:1c:93:99:
                     -         84:a0:60:6c:51:7d:e7:8a:23:db:e1:dd:8b:a6:64:2e:06:6d:
                     -         8c:a7:c8:8d:b2:32:53:8f:49:22:47:55:9a:ad:eb:f5:91:c4:
                     -         e6:c3:a5:3e:67:45:2d:00:da:19:3a:11:09:be:07:ae:52:c1:
                     -         e8:ff:61:5f:10:31:59:11:84:4b:4a:88:41:99:6e:5a:3a:b0:
                     -         23:9c:1e:cc:ba:ff:13:38:f2:03:77:d0:ae:4d:2e:09:11:21:
                     -         8a:86:b8:c2:b0:c7:5b:77:9e:81:b6:3e:7f:0c:1e:f3:85:0f:
                     -         b8:8e:e3:db:81:90:b1:a0:10:1f:73:e3:76:07:db:35:97:b7:
                     -         a7:88:cc:78:d2:64:a3:42:55:ba:02:f1:59:dd:cf:f3:03:ed:
                     -         b9:9e:6a:22:75:3c:d7:f5
                     -MIIFoTCCA4mgAwIBAgIBADANBgkqhkiG9w0BAQsFADBpMQswCQYDVQQGEwJVUzEL
                     -MAkGA1UECAwCTUQxDzANBgNVBAcMBkxhdXJlbDEOMAwGA1UECgwFQ2lzY28xDjAM
                     -BgNVBAsMBVRhbG9zMRwwGgYDVQQDDBNDbGFtQVYgVEVTVCBSb290IENBMB4XDTI1
                     -MDMyNjE3NTYzMloXDTM1MDMyNDE3NTYzMlowaDELMAkGA1UEBhMCVVMxCzAJBgNV
                     -BAgMAk1EMQ4wDAYDVQQKDAVDaXNjbzEOMAwGA1UECwwFVGFsb3MxLDAqBgNVBAMM
                     -I0NsYW1BViBURVNUIEludGVybWVkaWF0ZSBTaWduaW5nIENBMIICIjANBgkqhkiG
                     -9w0BAQEFAAOCAg8AMIICCgKCAgEA8eqagGZ6Fdd8CZO7CvTDoH/MwSq8yCdbCofw
                     -Y1PPtZtshCZoCw4s39OLNttlsy+3TRq6uGn1rdFzHGPy5sGCnkd4AGIvfDrBKwZ/
                     -r4zqKBYPOmGnmh4BAaS+83IKRJnG8qRtPicwWS6FHIEacQuzWX1LQ3aWU4V15TEv
                     -l6UaQddEDtGeFV+lUcq376cM03FfnXR0bkAEKt+KJnfojEr7xnY1ZgBvfJLUih4g
                     -74ieB1Ldep93XMj5YsboVY8jX3Xie/aZw+GNDMj+5kJyNZw4D7E7ThJb2+qf/4bP
                     -DhH6Xbqw88zIgZ3qg66hciuF/XLOgnyN4QR7SHZnh/b/7U0HyzYuEenlu3Af8GVa
                     -Si3jIkCdoQJIkLtVAUp8oAb+OuQWJnuvJGsm8MFxPcLyfcug3TMctoEMpNqWBzlD
                     -ADnlcsnPXR4saNJZcDf0kWl1ACyT7kaY0U72vKryD2PwW2RFxQx6kPSOcbcw+u1T
                     -KCjogdEjL9WHYYrsNHYDFLluOnqCjOyy3DWV3SVXPkg6dpPm6kXGu8d1Ns+YUNqW
                     -Bk1v0mmIoTX88x3FZRUh6eyzE/0rcYWokxF8HiU/aiUSv3BNDpRrp02KqaC+9bu6
                     -4/Rn20alnpNMBiFtBAWTkemuPnjMf21eFgAcJ0wrsEtu2vdfu4wBcaCX+VLuVcsQ
                     -r2+5h5MCAwEAAaNVMFMwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
                     -HQYDVR0lBBYwFAYIKwYBBQUHAwkGCCsGAQUFBwMEMBEGCWCGSAGG+EIBAQQEAwIC
                     -BDANBgkqhkiG9w0BAQsFAAOCAgEAYLtElHn2KhVEEv+iLDgmqUBLzaS2HzDncxY5
                     -BhJI3bKiDVm9yyzSblkBApXT9Ry/fwGmDVu//lbltpCjciTt6oIP2Ku0ruXriFox
                     -MAlu9RzGKBRd9j2UsYoaUhi7s609ae7sXsp2pFKgxhHh+C7jjfv125ilaWuYIA0L
                     -+LI5joxvVtGXWW/ZtYzZGxIjdHkFBjsb816ecmL7vuE5QYVjl0ztBgVl4Ls61ekW
                     -eOc8B3/Dw7li/nrzwUd5kNWDyaGhyFSU9A7X8jGsnr6YfapIpaRF0PERnB1RiUyN
                     -HmhDkq69ZbqxzfYPMC69OvVIW3pLXuwS0Ct9t/Q65GeBDDf+zGrA4388AAJmhhlN
                     -Tlx2IisI5C+/3gAwM/L4m/v9hfdGqTEgeNEEuYTjMFNKqqzixRn/I1ZtgaptFl7q
                     -q3kw8S55OEpLV8x/rKY3E5h2QOZN6o6iXjoJW3LD0qc7BmUaj0NaX47THJOZhKBg
                     -bFF954oj2+Hdi6ZkLgZtjKfIjbIyU49JIkdVmq3r9ZHE5sOlPmdFLQDaGToRCb4H
                     -rlLB6P9hXxAxWRGES0qIQZluWjqwI5wezLr/EzjyA3fQrk0uCREhioa4wrDHW3ee
                     -gbY+fwwe84UPuI7j24GQsaAQH3PjdgfbNZe3p4jMeNJko0JVugLxWd3P8wPtuZ5q
                     -InU81/U=

0	122	new file mode 100644
1	123	Binary files /dev/null and b/unit_tests/input/signing/sign/signing-test.key.xor differ

@@ -167,11 +167,12 @@ class TC(testcase.TestCase):
                              self.log.warning('VG: {}'.format(os.getenv("VG")))
                     -        command = '{valgrind} {valgrind_args} {sigtool} --sign {input} --key {key} --cert {cert}'.format(
                     +        command = '{valgrind} {valgrind_args} {sigtool} --sign {input} --key {signing_key} --cert {signing_cert} --cert {intermediate_cert}'.format(
                                  valgrind=TC.valgrind, valgrind_args=TC.valgrind_args, sigtool=TC.sigtool,
                                  input=TC.path_tmp / 'file_to_sign',
                     -            key=TC.path_build / 'unit_tests' / 'input' / 'signing' / 'private' / 'signing-test.key',
                     -            cert=TC.path_source / 'unit_tests' / 'input' / 'signing' / 'private' / 'signing-test.crt'
                     +            signing_key=TC.path_build / 'unit_tests' / 'input' / 'signing' / 'sign' / 'signing-test.key',
                     +            signing_cert=TC.path_source / 'unit_tests' / 'input' / 'signing' / 'sign' / 'signing-test.crt',
                     +            intermediate_cert=TC.path_source / 'unit_tests' / 'input' / 'signing' / 'sign' / 'intermediate-test.crt'
+                             )
                              output = self.execute_command(command)
@@ -182,7 +183,7 @@ class TC(testcase.TestCase):
                              command = '{valgrind} {valgrind_args} {sigtool} --verify {input} --cvdcertsdir {cvdcertsdir}'.format(
                                  valgrind=TC.valgrind, valgrind_args=TC.valgrind_args, sigtool=TC.sigtool,
                                  input=TC.path_tmp / 'file_to_sign',
                     -            cvdcertsdir=TC.path_source / 'unit_tests' / 'input' / 'signing' / 'public'
                     +            cvdcertsdir=TC.path_source / 'unit_tests' / 'input' / 'signing' / 'verify'
+                             )
                              output = self.execute_command(command)
@@ -203,7 +204,7 @@ class TC(testcase.TestCase):
                              command = '{valgrind} {valgrind_args} {sigtool} --verify {input} --cvdcertsdir {cvdcertsdir}'.format(
                                  valgrind=TC.valgrind, valgrind_args=TC.valgrind_args, sigtool=TC.sigtool,
                                  input=TC.path_tmp / 'file_to_sign',
                     -            cvdcertsdir=TC.path_source / 'unit_tests' / 'input' / 'signing' / 'public'
                     +            cvdcertsdir=TC.path_source / 'unit_tests' / 'input' / 'signing' / 'verify'
+                             )
                              output = self.execute_command(command)