crda: Trust regulatory.bin from Seth Forsheev3.18

I have taken over maintenance of the regulatory database from
linville. Add my key so that regulatory.bin files signed by me
will be trusted, but also keep John's key so that existing files
will continue to be trusted. Update the makefile to point to the
new wireless-regdb repository location, and update the readme and
man page to reflect the change in maintainership.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>

4 files changed, 23 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index 1f25509..a3ead30 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Modify as you see fit, note this is built into crda,
 # so if you change it here you will have to change crda.c
 REG_BIN?=/usr/lib/crda/regulatory.bin
-REG_GIT?=git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-regdb.git
+REG_GIT?=git://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git
 
 PREFIX ?= /usr/
 MANDIR ?= $(PREFIX)/share/man/
diff --git a/README b/README
index f3ead48..5d89b83 100644
--- a/README
+++ b/README
@@ -23,12 +23,13 @@ The package build requirements currently are:
  * libgcrypt or libssl (openssl) header files
  * nl library and header files (libnl1 and libnl-dev)
    available at git://git.kernel.org/pub/scm/libs/netlink/libnl.git
- * RSA public key of John Linville, we include this as part of this package
-   so you do not need to install it. This RSA public key comes
-   from the wireless-regdb.git tree and we keep it up to date here.
+ * RSA public key of John Linville and Seth Forshee, we include these
+   as part of this package so you do not need to install it. The RSA
+   public keys comes from the wireless-regdb.git tree and we keep them
+   up to date here.
  * regulatory database, clone this tree:
 
-   git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-regdb.git
+   git://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git
 
    and then stuff regulatory.bin (no need to build) provided there in
    REG_BIN location specified in this Makefile. This regulatory.bin file
@@ -62,13 +63,14 @@ user reboots or all the wireless modules get unloaded and reloaded.
 
 Under certain circumstances it may be desirable to have the regulatory
 agent accept multiple keys, this can be achieved by stuffing all the keys
-desired into pubkeys. Right now we only use John Linville's public key.
+desired into pubkeys. Right now we use John Linville's and Seth Forshee's
+public keys.
 
  REGDB AUTHORS
 ===============
 
-Authors of regulatory.bin (John Linville) first need a private key, which can
-be generated with something like this:
+Authors of regulatory.bin first need a private key, which can be generated
+with something like this:
 
 	openssl genrsa -out your.key.priv.pem 2048
 
diff --git a/crda.8 b/crda.8
index d45af30..d934228 100644
--- a/crda.8
+++ b/crda.8
@@ -49,11 +49,13 @@ files. Authorship is respected by the RSA public key packed into
 .I This
 specific
 .B crda
-package has been built with an RSA public key from
+package has been built with RSA public keys from
 .I John Linville (the Linux wireless kernel maintainer)
+and
+.I Seth Forshee (the wireless regulatory databse maintainer)
 and as such will only read
 .B regulatory.bin
-files signed by him. For further information see the
+files signed by one of them. For further information see the
 .B regulatory.bin
 man page.
 
diff --git a/pubkeys/sforshee.key.pub.pem b/pubkeys/sforshee.key.pub.pem
new file mode 100644
index 0000000..73d580e
--- /dev/null
+++ b/pubkeys/sforshee.key.pub.pem
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtUDjnCiEOQPyOddmLEE4
+Fax+pYNxJX6QfGjdbz/Z11k4n3xqUsIDKi1+ZvQesxJwIFvUlzI9cYs7GwgXFGth
+xFeLlhYc/STVCwn5aBGE+8pRDNFFGdoQRIrZ/nap/WAtGAsolbIt6oiYuNFWIfBT
+H/ECb+lGm5NfKJAPrDb6aCNxV1b2zNPffSrZG3NF67onhe96f6XLgMcwNtJT7uys
+Hucx8TainGPGZVt/JXVooerTfgBcml7YIBgydwcpEmYeNnPnlwRBN7Gxciv0oSkg
+fJZ5CyvQ2N7IbD+T+8XueFIRFRt69uJomef7RhaE48eh5uDSRtXhxF+gZvTaxP+V
+HQIDAQAB
+-----END PUBLIC KEY-----