From 93c8aaee284dd4be14963fb9d43d1586f28043cb Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Tue, 4 Oct 2016 20:58:05 +0000
Subject: [PATCH] Add a pgp key to the keyring for the change notices from the
 upcoming key changer.

---
 share/pgpkeys/keymaster.key     | 70 +++++++++++++++++++++++++++++++++
 share/pgpkeys/pgpkeys-other.xml |  5 +++
 share/pgpkeys/pgpkeys.ent       |  1 +
 3 files changed, 76 insertions(+)
 create mode 100644 share/pgpkeys/keymaster.key

diff --git a/share/pgpkeys/keymaster.key b/share/pgpkeys/keymaster.key
new file mode 100644
index 0000000000..f40fdcdb3a
--- /dev/null
+++ b/share/pgpkeys/keymaster.key
@@ -0,0 +1,70 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh keymaster 2434FEB5AB485900 ;
+-->
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
+pub   rsa4096/2434FEB5AB485900 2016-10-04 [SC]
+      Key fingerprint = 8F74 C26C 632A 8E18 0C46  F209 2434 FEB5 AB48 5900
+uid                            Self-Serve SSH key changer <keymaster@freebsd.org>
+sub   rsa4096/DCC42FF5B44E5D35 2016-10-04 [E]
+
+]]></programlisting>
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
++XxvXivqqHyVdGdp0KPzYA==
+=28l1
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
diff --git a/share/pgpkeys/pgpkeys-other.xml b/share/pgpkeys/pgpkeys-other.xml
index 1e01248b52..1b63d164ef 100644
--- a/share/pgpkeys/pgpkeys-other.xml
+++ b/share/pgpkeys/pgpkeys-other.xml
@@ -29,6 +29,11 @@
   &pgpkey.bk;
 </sect2>
 
+<sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-keymaster">
+  <title>&a.keymaster;</title>
+  &pgpkey.keymaster;
+</sect2>
+
 <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-plosher">
   <title>&a.plosher;</title>
   &pgpkey.plosher;
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index c4553d57cc..c77dcfff48 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -249,6 +249,7 @@
 <!ENTITY pgpkey.kensmith SYSTEM "kensmith.key">
 <!ENTITY pgpkey.keramida SYSTEM "keramida.key">
 <!ENTITY pgpkey.kevlo SYSTEM "kevlo.key">
+<!ENTITY pgpkey.keymaster SYSTEM "keymaster.key">
 <!ENTITY pgpkey.kib SYSTEM "kib.key">
 <!ENTITY pgpkey.kmoore SYSTEM "kmoore.key">
 <!ENTITY pgpkey.knu SYSTEM "knu.key">