[tor-commits] [ooni-probe/master] Replace 32 bit GPG keyids with full ids, see https://evil32.com/ for a reason

[art at torproject.org]

commit 7e3401223fb7f838e576c8ba0b9f299477000c38
Author: Leonid Evdokimov <leon at darkk.net.ru>
Date:   Thu Sep 29 12:39:48 2016 +0300

    Replace 32 bit GPG keyids with full ids, see https://evil32.com/ for a reason
    
    Remember that old gnupg version did not use full id even when it was
    given full id: https://bugs.gnupg.org/gnupg/issue1579
---
 Vagrantfile                   | 4 ++--
 scripts/setup-dependencies.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 71f7c7a..744246b 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -5,7 +5,7 @@ $setup_ooniprobe = <<SCRIPT
 echo "deb http://deb.torproject.org/torproject.org jessie main" >> /etc/apt/sources.list
 
 # Install deb.torproject.org key
-gpg --keyserver keys.gnupg.net --recv 886DDD89
+gpg --keyserver keys.gnupg.net --recv A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89
 gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add -
 
 apt-get update
@@ -30,7 +30,7 @@ echo "Installing Tor..."
 
 echo "deb http://deb.torproject.org/torproject.org jessie main" >> /etc/apt/sources.list
 
-gpg --keyserver keys.gnupg.net --recv 886DDD89
+gpg --keyserver keys.gnupg.net --recv A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89
 gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add -
 
 apt-get update
diff --git a/scripts/setup-dependencies.sh b/scripts/setup-dependencies.sh
index d96f2cf..e5fdf84 100755
--- a/scripts/setup-dependencies.sh
+++ b/scripts/setup-dependencies.sh
@@ -882,7 +882,7 @@ case $DISTRO_VERSION in
   echo "${DSTUFFT_PUB_KEY}" > ${DSTUFFT_KEY_FILE}
 
   # Import the Tor public key
-  DO "sudo gpg --homedir /root --no-default-keyring --keyring $TMP_KEYRING --keyserver x-hkp://pool.sks-keyservers.net --recv-keys 0x886DDD89" "0"
+  DO "sudo gpg --homedir /root --no-default-keyring --keyring $TMP_KEYRING --keyserver x-hkp://pool.sks-keyservers.net --recv-keys 0xA3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89" "0"
   sudo gpg --homedir /root --no-default-keyring --keyring $TMP_KEYRING --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
     
   HAVE_TOR_REPO="`grep deb.torproject.org/torproject.org /etc/apt/sources.list /etc/apt/sources.list.d/* 2>&1|grep torproject|head -n 1`";