Merge pull request #5979 from freedomofpress/remove-old-key

Removes old release signing key from securedrop-keyring
freedomofpress · Aug 13, 2021 · 57aa2d4 · 57aa2d4
2 parents 058d5a0 + d934e03
commit 57aa2d4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/install_files/securedrop-keyring/etc/apt/trusted.gpg.d/securedrop-keyring.gpg b/install_files/securedrop-keyring/etc/apt/trusted.gpg.d/securedrop-keyring.gpg
diff --git a/molecule/testinfra/common/test_fpf_apt_repo.py b/molecule/testinfra/common/test_fpf_apt_repo.py
@@ -43,8 +43,8 @@ def test_fpf_apt_repo_fingerprint(host):
       * 2016-10
       * 2021-06
 
-    So let's make sure that the fingerprints accepted by the system covers both
-    in the interim.
+    The old key has been removed, so only the new key's fingerprint should be
+    returned.
     """
 
     c = host.run('apt-key finger')
@@ -53,7 +53,7 @@ def test_fpf_apt_repo_fingerprint(host):
     fpf_gpg_pub_key_info_new = "2359 E653 8C06 13E6 5295  5E6C 188E DD3B 7B22 E6A3"
 
     assert c.rc == 0
-    assert fpf_gpg_pub_key_info_old in c.stdout
+    assert fpf_gpg_pub_key_info_old not in c.stdout
     assert fpf_gpg_pub_key_info_new in c.stdout