don't set filename/timestamp when signing files with Crypto Refresh enabled

Author: TJ-91

src/librepgp/stream-write.cpp

@@ -1878,6 +1878,10 @@ build_literal_hdr(const rnp_ctx_t &ctx, pgp_literal_hdr_t &hdr)
 {
     /* content type - forcing binary now */
     hdr.format = 'b';
+#if defined(ENABLE_CRYPTO_REFRESH)
+    // filename and timestamp SHOULD NOT be set (struct is zero-initialized)
+    return;
+#endif
     /* filename */
     size_t flen = ctx.filename.size();
     if (flen > 255) {

src/tests/cli_tests.py

@@ -2928,8 +2928,14 @@ def test_literal_filename(self):
         self.assertEqual(ret, 0)
         ret, out, _ = run_proc(GPG, ['--homedir', GPGHOME, GPG_LOOPBACK, '--passphrase', 'password', '--list-packets', enc])
         self.assertEqual(ret, 0)
-        self.assertRegex(out, r'(?s)^.*literal data packet.*mode b.*created \d+.*name="source.txt".*$')
+        if RNP_CRYPTO_REFRESH:
+            self.assertRegex(out, r'(?s)^.*literal data packet.*mode b.*created \d+.*name="".*$')
+        else:
+            self.assertRegex(out, r'(?s)^.*literal data packet.*mode b.*created \d+.*name="source.txt".*$')
         remove_files(enc)
+        if RNP_CRYPTO_REFRESH:
+            # skip following tests
+            return
         # Encrypt file, overriding it's name
         ret, out, _ = run_proc(RNP, ['--set-filename', 'hello', '-c', src, '--password', 'password'])
         self.assertEqual(ret, 0)
@@ -3430,7 +3436,11 @@ def test_aead_last_chunk_zero_length(self):
                 ret, _, _ = run_proc(RNP, ['--homedir', RNPDIR, '--password', PASSWORD, '-z', '0', '-r', 'alice', '--aead=eax',
                                            '--set-filename', 'cleartext-z0.txt', '--aead-chunk-bits=1', '-e', srctxt, '--output', enc])
                 self.assertEqual(ret, 0)
-                self.assertEqual(os.path.getsize(enc), eax_size)
+                if RNP_CRYPTO_REFRESH:
+                    # with crypto refresh code we set the empty filename
+                    self.assertEqual(os.path.getsize(enc), eax_size - len('cleartext-z0.txt'))
+                else:
+                    self.assertEqual(os.path.getsize(enc), eax_size)
                 # Decrypt with RNP again
                 ret, _, _ = run_proc(RNP, ['--homedir', RNPDIR, '--password', PASSWORD, '-d', enc, '--output', dec])
                 self.assertEqual(file_text(srctxt), file_text(dec))
@@ -3445,7 +3455,11 @@ def test_aead_last_chunk_zero_length(self):
                 ret, _, _ = run_proc(RNP, ['--homedir', RNPDIR, '--password', PASSWORD, '-z', '0', '-r', 'alice', '--aead=ocb',
                                            '--set-filename', 'cleartext-z0.txt', '--aead-chunk-bits=1', '-e', srctxt, '--output', enc])
                 self.assertEqual(ret, 0)
-                self.assertEqual(os.path.getsize(enc), ocb_size)
+                if RNP_CRYPTO_REFRESH:
+                    # with crypto refresh code we set the empty filename
+                    self.assertEqual(os.path.getsize(enc), ocb_size - len('cleartext-z0.txt'))
+                else:
+                    self.assertEqual(os.path.getsize(enc), ocb_size)
                 # Decrypt with RNP again
                 ret, _, _ = run_proc(RNP, ['--homedir', RNPDIR, '--password', PASSWORD, '-d', enc, '--output', dec])
                 self.assertEqual(file_text(srctxt), file_text(dec))

src/tests/ffi.cpp

@@ -3457,8 +3457,10 @@ TEST_F(rnp_tests, test_ffi_literal_filename)
     assert_non_null(json);
 
     std::string jstr = json;
+#if !defined(ENABLE_CRYPTO_REFRESH)
     assert_true(jstr.find("\"filename\":\"testfile.dat\"") != std::string::npos);
     assert_true(jstr.find("\"timestamp\":12345678") != std::string::npos);
+#endif
 
     assert_rnp_success(rnp_input_destroy(input));
     rnp_buffer_destroy(signed_buf);