diff --git a/share/torbrowser-launcher/tor-browser-developers.asc b/share/torbrowser-launcher/tor-browser-developers.asc new file mode 100644 index 0000000..e121615 --- /dev/null +++ b/share/torbrowser-launcher/tor-browser-developers.asc @@ -0,0 +1,141 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=BpzM +-----END PGP PUBLIC KEY BLOCK----- diff --git a/torbrowser_launcher/common.py b/torbrowser_launcher/common.py index 8ea7545..960a1ba 100644 --- a/torbrowser_launcher/common.py +++ b/torbrowser_launcher/common.py @@ -134,7 +134,7 @@ class Common: 'tbl_bin': sys.argv[0], 'icon_file': os.path.join(os.path.dirname(SHARE), 'pixmaps/torbrowser80.xpm'), 'torproject_pem': os.path.join(SHARE, 'torproject.pem'), - 'erinn_key': os.path.join(SHARE, 'erinn.asc'), + 'signing_keys': [os.path.join(SHARE, 'erinn.asc'), os.path.join(SHARE, 'tor-browser-developers.asc')], 'mirrors_txt': [os.path.join(SHARE, 'mirrors.txt'), tbb_config+'/mirrors.txt'], 'modem_sound': os.path.join(SHARE, 'modem.ogg'), @@ -175,7 +175,8 @@ class Common: # import gpg keys def import_keys(self): print _('Importing keys') - subprocess.Popen(['/usr/bin/gpg', '--homedir', self.paths['gnupg_homedir'], '--import', self.paths['erinn_key']]).wait() + for key in self.paths['signing_keys']: + subprocess.Popen(['/usr/bin/gpg', '--homedir', self.paths['gnupg_homedir'], '--import', key).wait() # load mirrors def load_mirrors(self):