Skip to content

Instantly share code, notes, and snippets.

Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save nickgnazzo/e7204e35c281e30c8fbdde08f72af1c4 to your computer and use it in GitHub Desktop.
Save nickgnazzo/e7204e35c281e30c8fbdde08f72af1c4 to your computer and use it in GitHub Desktop.
Patch to use Mozilla's GPG Keyserver in Streisand
From e494e03d2443ffe138a47d0a2d88addec61df2a9 Mon Sep 17 00:00:00 2001
From: Nick <nickgnazzo@icloud.com>
Date: Wed, 10 Jul 2019 13:14:32 -0400
Subject: [PATCH] Move to Mozilla GPG Keyserver, fix a few GPG verifications
---
.../4AE8DA82.putty@projects.tartarus.org.asc | 60 ++++++
.../B43434E4.putty@projects.tartarus.org.asc | 172 ------------------
playbooks/roles/gpg/templates/dirmngr.conf.j2 | 1 +
playbooks/roles/gpg/vars/main.yml | 9 +-
playbooks/roles/openvpn/vars/mirror.yml | 2 +-
playbooks/roles/ssh-forward/vars/mirror.yml | 2 +-
.../roles/tor-bridge/vars/mirror-download.yml | 2 +-
7 files changed, 71 insertions(+), 177 deletions(-)
create mode 100644 playbooks/roles/gpg/files/4AE8DA82.putty@projects.tartarus.org.asc
delete mode 100644 playbooks/roles/gpg/files/B43434E4.putty@projects.tartarus.org.asc
diff --git a/playbooks/roles/gpg/files/4AE8DA82.putty@projects.tartarus.org.asc b/playbooks/roles/gpg/files/4AE8DA82.putty@projects.tartarus.org.asc
new file mode 100644
index 0000000..9a55b5c
--- /dev/null
+++ b/playbooks/roles/gpg/files/4AE8DA82.putty@projects.tartarus.org.asc
@@ -0,0 +1,60 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=TUoR
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/playbooks/roles/gpg/files/B43434E4.putty@projects.tartarus.org.asc b/playbooks/roles/gpg/files/B43434E4.putty@projects.tartarus.org.asc
deleted file mode 100644
index 8de6b65..0000000
--- a/playbooks/roles/gpg/files/B43434E4.putty@projects.tartarus.org.asc
+++ /dev/null
@@ -1,172 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2
-
-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
-=wyjd
------END PGP PUBLIC KEY BLOCK-----
diff --git a/playbooks/roles/gpg/templates/dirmngr.conf.j2 b/playbooks/roles/gpg/templates/dirmngr.conf.j2
index e0401b2..8312e6e 100644
--- a/playbooks/roles/gpg/templates/dirmngr.conf.j2
+++ b/playbooks/roles/gpg/templates/dirmngr.conf.j2
@@ -1 +1,2 @@
keyserver {{ streisand_gpg_keyserver_address }}
+hkp-cacert /etc/ssl/certs/{{ streisand_gpg_keyserver_root_ca }}
diff --git a/playbooks/roles/gpg/vars/main.yml b/playbooks/roles/gpg/vars/main.yml
index f2ba992..0030f77 100644
--- a/playbooks/roles/gpg/vars/main.yml
+++ b/playbooks/roles/gpg/vars/main.yml
@@ -5,6 +5,11 @@ root_gpg_dir: "/root/.gnupg"
# Keep Streisand's GPG cruft out of the way
streisand_gpg_dir: "{{ root_gpg_dir }}/streisand"
+# GPG Keyserver's Root CA Cert
+# Currently the keyserver is using an Amazon certificate, whose root CA is signed
+# by "Starfield Services", which should be available by default in /etc/ssl/certs
+streisand_gpg_keyserver_root_ca: "Starfield_Services_Root_Certificate_Authority_-_G2.pem"
+
# Where is the Streisand specific GPG keyring kept?
streisand_gpg_keyring: "{{ streisand_gpg_dir }}/pubring.gpg"
@@ -16,7 +21,7 @@ streisand_default_gpg_flags: "--no-default-keyring --keyring {{ streisand_gpg_ke
# built into the GNUPG distribution, so we don't need to specify a CA cert
# explicitly in a dirmngr config if we stick with this particular pool.
# By default use HKP over HTTPS to the SKS Keyserver pool
-streisand_gpg_keyserver_address: "hkps://hkps.pool.sks-keyservers.net"
+streisand_gpg_keyserver_address: "hkps://gpg.mozilla.org"
# The default timeout is 30s, we use something larger
streisand_gpg_timeout: "120"
@@ -34,7 +39,7 @@ streisand_bootstrap_gpg_keys:
# Tor browser release signing key
- 93298290.torbrowser@torproject.org.asc
# PuTTY release signing key
- - B43434E4.putty@projects.tartarus.org.asc
+ - 4AE8DA82.putty@projects.tartarus.org.asc
# Stunnel release signing key
- DD3AAAA3.Michal.Trojnara@stunnel.org.asc
# Streisand maintainer - Github @cpu
diff --git a/playbooks/roles/openvpn/vars/mirror.yml b/playbooks/roles/openvpn/vars/mirror.yml
index 8eac171..c03f4a5 100644
--- a/playbooks/roles/openvpn/vars/mirror.yml
+++ b/playbooks/roles/openvpn/vars/mirror.yml
@@ -16,7 +16,7 @@ openvpn_windows_installer_sig_filename: "{{ openvpn_windows_installer_filename }
openvpn_windows_installer_href: "{{ openvpn_mirror_href_base }}/{{ openvpn_windows_installer_filename }}"
openvpn_windows_installer_sig_href: "{{ openvpn_mirror_href_base }}/{{ openvpn_windows_installer_sig_filename }}"
-openvpn_gpg_keyid: "AF131CAE"
+openvpn_gpg_keyid: "5ACFEAC6"
openvpn_download_files:
- { "file": "{{ openvpn_source_filename }}", "sig": "{{ openvpn_source_sig_filename }}" }
- { "file": "{{ openvpn_windows_installer_filename }}", "sig": "{{ openvpn_windows_installer_sig_filename }}" }
diff --git a/playbooks/roles/ssh-forward/vars/mirror.yml b/playbooks/roles/ssh-forward/vars/mirror.yml
index 82eba1f..1daa95f 100644
--- a/playbooks/roles/ssh-forward/vars/mirror.yml
+++ b/playbooks/roles/ssh-forward/vars/mirror.yml
@@ -12,7 +12,7 @@ putty_href: "{{ ssh_mirror_href_base }}/{{ putty_filename }}"
# download-and-verify.yml renames files with non-standard extensions
putty_sig_href: "{{ ssh_mirror_href_base }}/{{ putty_filename }}.asc"
-putty_gpg_keyid: "B43434E4"
+putty_gpg_keyid: "4AE8DA82"
putty_download_files:
- { "file": "{{ putty_filename }}", "sig": "{{ putty_sig_filename }}" }
diff --git a/playbooks/roles/tor-bridge/vars/mirror-download.yml b/playbooks/roles/tor-bridge/vars/mirror-download.yml
index 66e2a16..577d1a1 100644
--- a/playbooks/roles/tor-bridge/vars/mirror-download.yml
+++ b/playbooks/roles/tor-bridge/vars/mirror-download.yml
@@ -18,7 +18,7 @@ tor_browser_bundle_linux32_sig_filename: "{{ tor_browser_bundle_linux32_filename
tor_browser_bundle_linux64_filename: "{{ tor_linux64_filename_base }}_{{ locale }}.tar.xz"
tor_browser_bundle_linux64_sig_filename: "{{ tor_browser_bundle_linux64_filename }}.asc"
-tor_signer_keyid: "C3C07136"
+tor_signer_keyid: "D9FF06E2"
tor_download_files:
- { "file": "{{ tor_browser_bundle_windows_filename }}", "sig": "{{ tor_browser_bundle_windows_sig_filename }}" }
--
2.22.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment