[tor-bugs] #30548 [Applications/Tor Browser]: Clean up keyring files
Tor Bug Tracker & Wiki
blackhole at torproject.org
Fri Jul 5 17:48:14 UTC 2019
#30548: Clean up keyring files
--------------------------------------------+------------------------------
Reporter: boklm | Owner: tbb-team
Type: task | Status: needs_review
Priority: Medium | Milestone:
Component: Applications/Tor Browser | Version:
Severity: Normal | Resolution:
Keywords: TorBrowserTeam201907R, tbb-rbm | Actual Points:
Parent ID: | Points:
Reviewer: | Sponsor:
--------------------------------------------+------------------------------
Changes (by boklm):
* keywords: TorBrowserTeam201905, tbb-rbm => TorBrowserTeam201907R, tbb-
rbm
* status: new => needs_review
Comment:
There is a patch doing some cleanup of the keyring files in branch
`bug_30548_v2`:
https://gitweb.torproject.org/user/boklm/tor-browser-
build.git/commit/?h=bug_30548_v2&id=5a5a25f01d22d23308da66072f4d63f1cf6c3268
This branch is based on the fixup patch for #30549, which is not merged
yet.
The diff from the output of `list-all-keyrings` is:
{{{
--- 1.txt 2019-07-05 19:32:49.849000000 +0200
+++ 2.txt 2019-07-05 19:32:41.700000000 +0200
@@ -12,8 +12,8 @@
uid [ unknown] Brad King
uid [ unknown] Brad King <brad.king at kitware.com>
uid [ unknown] [jpeg image of size 4005]
-sub rsa4096/9C3A05C82A58B985 2010-02-16 [E] [expired: 2016-08-12]
-sub rsa4096/2D2CEF1034921684 2015-08-13 [S] [expired: 2016-08-12]
+sub rsa4096/9C3A05C82A58B985 2010-02-16 [E] [expires: 2019-08-12]
+sub rsa4096/2D2CEF1034921684 2015-08-13 [S] [expires: 2019-08-12]
./keyring/firefox.gpg
---------------------
@@ -98,132 +98,48 @@
./keyring/tor.gpg
-----------------
-pub rsa4096/FE43009C4607B1FB 2016-09-21 [C] [expires: 2019-09-21]
+pub rsa4096/FE43009C4607B1FB 2016-09-21 [C] [expires: 2020-09-16]
2133BC600AB133E1D826D173FE43009C4607B1FB
uid [ unknown] Nick Mathewson <nickm at alum.mit.edu>
uid [ unknown] Nick Mathewson <nickm at wangafu.net>
uid [ unknown] Nick Mathewson <nickm at freehaven.net>
uid [ unknown] Nick Mathewson <nickm at torproject.org>
-sub rsa4096/6AFEE6D49E92B601 2016-09-23 [S] [expired: 2018-09-23]
-sub rsa4096/91DDED0286AC8BFF 2016-09-23 [E] [expired: 2018-09-23]
+sub rsa4096/6AFEE6D49E92B601 2016-09-23 [S] [expires: 2020-09-16]
+sub rsa4096/91DDED0286AC8BFF 2016-09-23 [E] [expires: 2020-09-16]
pub rsa4096/C218525819F78451 2010-05-07 [SC]
F65CE37F04BA5B360AE6EE17C218525819F78451
uid [ unknown] Roger Dingledine <arma at mit.edu>
uid [ unknown] Roger Dingledine <arma at freehaven.net>
uid [ unknown] Roger Dingledine <arma at torproject.org>
-sub rsa4096/F05501B4C931269D 2010-05-07 [E] [expired: 2011-05-07]
-sub rsa4096/900BD5E8BA694D6A 2011-04-26 [E] [expired: 2012-05-08]
-sub rsa4096/366705089B11185C 2012-05-02 [E] [expired: 2013-05-02]
-sub rsa4096/690234AC0DCC0FE1 2013-05-09 [E] [expired: 2014-05-09]
-sub rsa4096/BA4F93601E7DA77B 2014-06-02 [E] [expired: 2015-06-02]
-sub rsa4096/923513C6B0E5067D 2015-06-10 [E] [expired: 2016-06-09]
-sub rsa4096/505002551A604C9F 2016-06-09 [E] [expired: 2018-06-09]
+sub rsa4096/514465B3293BCA59 2019-06-14 [E] [expires: 2021-06-13]
./keyring/torbrowser.gpg
------------------------
pub rsa4096/4E2C6E8793298290 2014-12-15 [C] [expires: 2020-08-24]
EF6E286DDA85EA2A4BA7DE684E2C6E8793298290
uid [ unknown] Tor Browser Developers (signing key)
<torbrowser at torproject.org>
-sub rsa4096/2E1AC68ED40814E0 2014-12-15 [S] [expired: 2017-08-25]
-sub rsa4096/7017ADCEF65C2036 2014-12-15 [S] [expired: 2017-08-25]
-sub rsa4096/2D000988589839A3 2014-12-15 [S] [revoked: 2015-08-26]
-sub rsa4096/D1483FA6C3C07136 2016-08-24 [S] [expired: 2018-08-24]
sub rsa4096/EB774491D9FF06E2 2018-05-26 [S] [expires: 2020-09-12]
./keyring/torbutton.gpg
-----------------------
-pub dsa1024/1B0CA30CDDC6C0AD 2006-07-26 [SC]
- BECD90EDD1EE87367980ECF81B0CA30CDDC6C0AD
-uid [ unknown] Mike Perry <mikeperry at fscked.org>
-uid [ unknown] Mike Perry <mikepery at fscked.org>
-sub elg4096/8DBC790AAF0A91D7 2006-07-26 [E]
-
-pub rsa8192/29846B3C683686CC 2013-09-11 [SC]
- C963C21D63564E2B10BB335B29846B3C683686CC
-uid [ unknown] Mike Perry <mikeperry at endarken.info>
-uid [ unknown] Mike Perry (Regular use key)
<mikeperry at torproject.org>
-uid [ unknown] Mike Perry (Regular use key)
<mikeperry at fscked.org>
-uid [ unknown] Mike Perry <mikeperry at unencrypted.info>
-sub rsa4096/717F1F130E3A92E4 2013-09-11 [S] [expired: 2014-09-11]
-sub rsa4096/A3BD8153BC40FFA0 2013-09-11 [E] [expired: 2014-09-11]
-sub rsa4096/4102F895D2F1E186 2014-09-08 [S] [expired: 2015-09-08]
-sub rsa4096/6A98BF5993125AD5 2014-09-08 [E] [expired: 2015-09-08]
-sub rsa4096/E23BB32C0F129402 2015-09-07 [S] [expired: 2016-09-11]
-sub rsa4096/B0D1CB47ACC0A961 2015-09-07 [E] [expired: 2016-09-11]
-
-pub rsa4096/94373AA94B7C3223 2013-07-30 [SC]
- 35CD74C24A9B15A19E1A81A194373AA94B7C3223
-uid [ unknown] Georg Koppen <gk at torproject.org>
-uid [ unknown] Georg Koppen <georg at getfoxyproxy.org>
-uid [ unknown] Georg Koppen <groeg at vfemail.net>
-sub rsa4096/ED714BC197955E07 2013-07-30 [E] [expired: 2014-07-30]
-sub rsa4096/E82D615DAC3A821D 2013-07-30 [S] [expired: 2014-07-30]
-sub rsa4096/EDC67D98A97A53DC 2014-07-08 [S] [expired: 2015-07-08]
-sub rsa4096/975AAD47E5AE3C98 2014-07-08 [E] [expired: 2015-07-08]
-sub rsa4096/BBB97AC924690903 2015-07-20 [S] [expired: 2016-07-19]
-sub rsa4096/57833E6F631602F4 2015-07-20 [E] [expired: 2016-07-19]
-
-pub rsa4096/94373AA94B7C3223 2013-07-30 [SC]
- 35CD74C24A9B15A19E1A81A194373AA94B7C3223
-uid [ unknown] Georg Koppen <gk at torproject.org>
-uid [ unknown] Georg Koppen <georg at getfoxyproxy.org>
-uid [ unknown] Georg Koppen <groeg at vfemail.net>
-sub rsa4096/ED714BC197955E07 2013-07-30 [E] [expired: 2014-07-30]
-sub rsa4096/E82D615DAC3A821D 2013-07-30 [S] [expired: 2014-07-30]
-sub rsa4096/EDC67D98A97A53DC 2014-07-08 [S] [expired: 2015-07-08]
-sub rsa4096/975AAD47E5AE3C98 2014-07-08 [E] [expired: 2015-07-08]
-sub rsa4096/BBB97AC924690903 2015-07-20 [S] [expired: 2016-08-01]
-sub rsa4096/57833E6F631602F4 2015-07-20 [E] [expired: 2016-08-01]
-
pub rsa4096/94373AA94B7C3223 2013-07-30 [SC]
35CD74C24A9B15A19E1A81A194373AA94B7C3223
uid [ unknown] Georg Koppen <gk at torproject.org>
uid [ unknown] Georg Koppen <georg at getfoxyproxy.org>
uid [ unknown] Georg Koppen <groeg at vfemail.net>
-sub rsa4096/ED714BC197955E07 2013-07-30 [E] [expired: 2014-07-30]
-sub rsa4096/E82D615DAC3A821D 2013-07-30 [S] [expired: 2014-07-30]
-sub rsa4096/EDC67D98A97A53DC 2014-07-08 [S] [expired: 2015-07-08]
-sub rsa4096/975AAD47E5AE3C98 2014-07-08 [E] [expired: 2015-07-08]
-sub rsa4096/BBB97AC924690903 2015-07-20 [S] [expired: 2016-08-01]
-sub rsa4096/57833E6F631602F4 2015-07-20 [E] [expired: 2016-08-01]
-sub rsa4096/2F7477373D6B000D 2016-08-01 [E] [expired: 2017-09-11]
-sub rsa4096/AA602CC00C257CF7 2016-08-01 [S] [expired: 2017-09-11]
-
-pub rsa4096/94373AA94B7C3223 2013-07-30 [SC]
- 35CD74C24A9B15A19E1A81A194373AA94B7C3223
-uid [ unknown] Georg Koppen <gk at torproject.org>
-uid [ unknown] Georg Koppen <georg at getfoxyproxy.org>
-uid [ unknown] Georg Koppen <groeg at vfemail.net>
-sub rsa4096/ED714BC197955E07 2013-07-30 [E] [expired: 2014-07-30]
-sub rsa4096/E82D615DAC3A821D 2013-07-30 [S] [expired: 2014-07-30]
-sub rsa4096/EDC67D98A97A53DC 2014-07-08 [S] [expired: 2015-07-08]
-sub rsa4096/975AAD47E5AE3C98 2014-07-08 [E] [expired: 2015-07-08]
-sub rsa4096/BBB97AC924690903 2015-07-20 [S] [expired: 2016-08-01]
-sub rsa4096/57833E6F631602F4 2015-07-20 [E] [expired: 2016-08-01]
-sub rsa4096/2F7477373D6B000D 2016-08-01 [E] [expired: 2017-09-11]
-sub rsa4096/AA602CC00C257CF7 2016-08-01 [S] [expired: 2017-09-11]
-sub rsa4096/5778071EE2DE675B 2017-09-11 [E] [expired: 2018-09-11]
-sub rsa4096/72E841BB93148AD2 2017-09-11 [S] [expired: 2018-09-11]
-
-pub rsa4096/94373AA94B7C3223 2013-07-30 [SC]
- 35CD74C24A9B15A19E1A81A194373AA94B7C3223
-uid [ unknown] Georg Koppen <gk at torproject.org>
-uid [ unknown] Georg Koppen <georg at getfoxyproxy.org>
-uid [ unknown] Georg Koppen <groeg at vfemail.net>
-sub rsa4096/ED714BC197955E07 2013-07-30 [E] [expired: 2014-07-30]
-sub rsa4096/E82D615DAC3A821D 2013-07-30 [S] [expired: 2014-07-30]
-sub rsa4096/EDC67D98A97A53DC 2014-07-08 [S] [expired: 2015-07-08]
-sub rsa4096/975AAD47E5AE3C98 2014-07-08 [E] [expired: 2015-07-08]
-sub rsa4096/BBB97AC924690903 2015-07-20 [S] [expired: 2016-08-01]
-sub rsa4096/57833E6F631602F4 2015-07-20 [E] [expired: 2016-08-01]
-sub rsa4096/2F7477373D6B000D 2016-08-01 [E] [expired: 2017-09-11]
-sub rsa4096/AA602CC00C257CF7 2016-08-01 [S] [expired: 2017-09-11]
-sub rsa4096/5778071EE2DE675B 2017-09-11 [E] [expired: 2018-09-11]
-sub rsa4096/72E841BB93148AD2 2017-09-11 [S] [expired: 2018-09-11]
sub rsa4096/A56713B4E04028B4 2018-09-09 [E] [expires: 2019-09-11]
sub rsa4096/4D92A7E4AB73EC54 2018-09-09 [S] [expires: 2019-09-11]
+pub rsa8192/29846B3C683686CC 2013-09-11 [SC]
+ C963C21D63564E2B10BB335B29846B3C683686CC
+uid [ unknown] Mike Perry <mikeperry at endarken.info>
+uid [ unknown] Mike Perry <mikeperry at unencrypted.info>
+uid [ unknown] Mike Perry (Regular use key)
<mikeperry at fscked.org>
+uid [ unknown] Mike Perry (Regular use key)
<mikeperry at torproject.org>
+sub rsa4096/660DDE645EEFF156 2019-01-23 [S] [expires: 2020-12-22]
+sub rsa4096/BB87D54A948287DE 2019-01-23 [E] [expires: 2020-12-22]
+
./keyring/ubuntu.gpg
--------------------
pub dsa1024/46181433FBB75451 2004-12-30 [SC]
}}}
The remaining expired keys are:
{{{
./keyring/llvm.gpg
------------------
pub rsa2048/8F0871F202119294 2014-05-06 [SC] [expired: 2019-04-18]
11E521D646982372EB577A1F8F0871F202119294
uid [ expired] Tom Stellard <tom at stellard.net>
sub rsa2048/B1CE97A9C733ECDD 2014-05-06 [E] [expired: never ]
./keyring/yawning.gpg
---------------------
pub rsa16384/BFBD1C7B8A6EC81A 2013-10-27 [SC]
9EB1A490C73CC5D44DFB3E47BFBD1C7B8A6EC81A
uid [ unknown] Yawning Angel <yawning at torproject.org>
uid [ unknown] Yawning Angel <yawning at schwanenlied.me>
sub rsa4096/FE2F905A0807C068 2013-10-27 [S] [expired: 2018-08-16]
sub rsa4096/EA9272CEEDD2E2F4 2013-10-27 [E] [expired: 2018-08-16]
sub rsa4096/D033D01944299925 2013-10-27 [A] [expired: 2018-08-16]
sub rsa4096/B32409AF94177139 2018-08-28 [S] [expires: 2019-08-28]
sub rsa4096/6F96E73B22F46F95 2018-08-28 [E] [expires: 2019-08-28]
sub rsa4096/2CAADBF5F632F278 2018-08-28 [A] [expires: 2019-08-28]
}}}
For the llvm.gpg key, I could not find an updated key. For Yawning's key,
we still need the expired subkey, for the obfs4 tag we are using.
--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/30548#comment:1>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online
More information about the tor-bugs
mailing list