From 36ce8b356808063b156b5b3670df530cb5d6d59b Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Sun, 8 Jul 2012 11:19:28 +0100 Subject: [PATCH] Don't automatically trust Thomas Leonard's key We no longer need it to fetch the GUI, and we can now approve it automatically using the key information service. --- tests/testtrust.py | 1 - zeroinstall/injector/trust.py | 6 ------ 2 files changed, 7 deletions(-) diff --git a/tests/testtrust.py b/tests/testtrust.py index b341d63..aceb165 100755 --- a/tests/testtrust.py +++ b/tests/testtrust.py @@ -11,7 +11,6 @@ from zeroinstall import SafeException class TestTrust(BaseTest): def testInit(self): - trust.trust_db.untrust_key(thomas_fingerprint, domain = '0install.net') # Gets added by default assert not trust.trust_db.is_trusted(thomas_fingerprint) assert not trust.trust_db.is_trusted("1234") assert len(trust.trust_db.keys) == 0 diff --git a/zeroinstall/injector/trust.py b/zeroinstall/injector/trust.py index 7f9ed18..fb10d2e 100644 --- a/zeroinstall/injector/trust.py +++ b/zeroinstall/injector/trust.py @@ -141,12 +141,6 @@ class TrustDB(object): for key in stream: if key: self.keys[key] = set(['*']) - else: - # No trust database found. - # Trust Thomas Leonard's key for 0install.net by default. - # Avoids distracting confirmation box on first run when we check - # for updates to the GUI. - self.keys['92429807C9853C0744A68B9AAE07828059A53CC1'] = set(['0install.net']) def domain_from_url(url): """Extract the trust domain for a URL. -- 2.11.4.GIT