backports #5930 to 1.8.2 release branch and updates to RC2 #5936
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bumps the version of the `securedrop-keyring` package, preserving the
old/current release signing key, but adding a new pubkey.
* Old/current fingerprint: 22245C81E3BAEB4138B36061310F561200F4AD77
* New/next fingerprint: 2359E6538C0613E652955E6C188EDD3B7B22E6A3
This this is a soft rotation, we'll make sure that all instances have
the new key first, then later remove reference to the old key.
As with previous updates, here's the command I used to import the new
key into the keyring:
gpg --no-default-keyring --keyring \
install_files/securedrop-keyring/etc/apt/trusted.gpg.d/securedrop-keyring.gpg \
--import \
install_files/ansible-base/roles/install-fpf-repo/files/fpf-signing-key-2021.pub
Note the tweak to the target file to import, i.e. the "2021" suffix.
(cherry picked from commit c1cf240)
We still need to support both keys, during the transition period. Let's make sure that the new key is added, and a signature from either is considered valid. (cherry picked from commit dd84f81)
zenmonkeykstop
requested review from
conorsch,
emkll,
kushaldas and
redshiftzero
as code owners
conorsch
approved these changes
May 11, 2021
|
CI is failing on the safety check. Looks like that's because #5888 is still missing from the point release, so that's as expected. OK to override for merge and press on with rc2. |
|
OK, CI is also failing for |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Status
Ready for review
Description of Changes
Towards #5929 - backports pubkey addition from #5930, bumps version to 1.8.2-rc2
Testing