Skip to content

Bug 41154: Update keyring/boklm.gpg for new subkeys

boklm requested to merge boklm/tor-browser-build:bug_41154 into main

Merge Info

Related Issues

Backporting

Timeline

  • Immediate: patchset needed as soon as possible
  • Next Minor Stable Release: patchset that needs to be verified in nightly before backport
  • Eventually: patchset that needs to be verified in alpha before backport
  • No Backport (preferred): patchset for the next major stable

(Optional) Justification

  • Emergency security update: patchset fixes CVEs, 0-days, etc
  • Censorship event: patchset enables censorship circumvention
  • Critical bug-fix: patchset fixes a bug in core-functionality
  • Consistency: patchset which would make development easier if it were in both the alpha and release branches; developer tools, build system changes, etc
  • Sponsor required: patchset required for sponsor
  • Other: please explain

Issue Tracking

Review

Request Reviewer

  • Request review from an applications developer depending on modified system:
    • NOTE: if the MR modifies multiple areas, please /cc all the relevant reviewers (since gitlab only allows 1 reviewer)
    • accessibility : henry
    • android : clairehurst, dan
    • build system : boklm
    • extensions : ma1
    • firefox internals (XUL/JS/XPCOM) : jwilde, ma1
    • fonts : pierov
    • frontend (implementation) : henry
    • frontend (review) : donuts, richard
    • localization : henry, pierov
    • macOS : clairehurst, dan
    • nightly builds : boklm
    • rebases/release-prep : boklm, dan, ma1, pierov, richard
    • security : jwilde, ma1
    • signing : boklm, richard
    • updater : pierov
    • windows : jwilde, richard
    • misc/other : pierov, richard

Change Description

diff from the output of ./tools/keyring/list-all-keyrings:

45,46c45,46
< sub   rsa4096/4060847C8F4D2883 2023-06-01 [S] [expired: 2024-05-31]
< sub   rsa4096/D1E5B3F8FBCC39DB 2023-06-01 [E] [expired: 2024-05-31]
---
> sub   rsa4096/648C1B157781E72F 2024-06-03 [S] [expires: 2025-06-03]
> sub   rsa4096/560E45B6946162B9 2024-06-03 [E] [expires: 2025-06-03]

How Tested

Checked with file keyring/boklm.gpg that the file is still in the right format.

Edited by boklm

Merge request reports