Unverified Commit 3f16675b authored by boklm's avatar boklm
Browse files

Bug 41218: Use new Tor Browser gpg subkey for signing stable releases 

With #40964 we started using a new subkey for signing alpha releases.
We now start using the new subkey for signing stable releases too.
parent ec572810

tools/signing/linux-signer-gpg-sign

+0 −2
Changes for tools/signing/linux-signer-gpg-sign: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ set -e 
script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )

source "$script_dir/functions"



test "$tbb_version_type" = "alpha" && export GPG_NEWSUBKEY=1



cd ~/"$SIGNING_PROJECTNAME-$tbb_version"



test -n "$GPG_PASS" || read -sp "Enter gpg passphrase: " GPG_PASS

tools/signing/machines-setup/sudoers.d/sign-gpg

+1 −1
Changes for tools/signing/machines-setup/sudoers.d/sign-gpg: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
Defaults>signing-gpg env_keep += "SIGNING_PROJECTNAME GPG_NEWSUBKEY"

Defaults>signing-gpg env_keep += SIGNING_PROJECTNAME

%signing ALL = (signing-gpg) NOPASSWD: /signing/tor-browser-build/tools/signing/wrappers/sign-gpg

tools/signing/wrappers/sign-gpg

+1 −2
Changes for tools/signing/wrappers/sign-gpg: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -11,6 +11,5 @@ if test $(whoami) != 'signing-gpg'; then 
  exit 1

fi



gpg_subkey='0xe53d989a9e2d47bf!'

test -n "$GPG_NEWSUBKEY" && gpg_subkey='0x157432CF78A65729!'

gpg_subkey='0x157432CF78A65729!'

exec gpg --homedir /home/signing-gpg/.gnupg -absu "$gpg_subkey" --batch --no-tty -o- --passphrase-fd 0 -- "$1"