Skip to content

Commit 805d84a

Browse files
Seth Forsheemcgrof
Seth Forshee
authored andcommitted
crda: Trust regulatory.bin from Seth Forshee
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>
1 parent dd75a8f commit 805d84a

File tree

4 files changed

+23
-10
lines changed

4 files changed

+23
-10
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Modify as you see fit, note this is built into crda,
22
# so if you change it here you will have to change crda.c
33
REG_BIN?=/usr/lib/crda/regulatory.bin
4-
REG_GIT?=git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-regdb.git
4+
REG_GIT?=git://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git
55

66
PREFIX ?= /usr/
77
MANDIR ?= $(PREFIX)/share/man/

README

+9-7
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,13 @@ The package build requirements currently are:
2323
* libgcrypt or libssl (openssl) header files
2424
* nl library and header files (libnl1 and libnl-dev)
2525
available at git://git.kernel.org/pub/scm/libs/netlink/libnl.git
26-
* RSA public key of John Linville, we include this as part of this package
27-
so you do not need to install it. This RSA public key comes
28-
from the wireless-regdb.git tree and we keep it up to date here.
26+
* RSA public key of John Linville and Seth Forshee, we include these
27+
as part of this package so you do not need to install it. The RSA
28+
public keys comes from the wireless-regdb.git tree and we keep them
29+
up to date here.
2930
* regulatory database, clone this tree:
3031

31-
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-regdb.git
32+
git://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git
3233

3334
and then stuff regulatory.bin (no need to build) provided there in
3435
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.
6263

6364
Under certain circumstances it may be desirable to have the regulatory
6465
agent accept multiple keys, this can be achieved by stuffing all the keys
65-
desired into pubkeys. Right now we only use John Linville's public key.
66+
desired into pubkeys. Right now we use John Linville's and Seth Forshee's
67+
public keys.
6668

6769
REGDB AUTHORS
6870
===============
6971

70-
Authors of regulatory.bin (John Linville) first need a private key, which can
71-
be generated with something like this:
72+
Authors of regulatory.bin first need a private key, which can be generated
73+
with something like this:
7274

7375
openssl genrsa -out your.key.priv.pem 2048
7476

crda.8

+4-2
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,13 @@ files. Authorship is respected by the RSA public key packed into
4949
.I This
5050
specific
5151
.B crda
52-
package has been built with an RSA public key from
52+
package has been built with RSA public keys from
5353
.I John Linville (the Linux wireless kernel maintainer)
54+
and
55+
.I Seth Forshee (the wireless regulatory databse maintainer)
5456
and as such will only read
5557
.B regulatory.bin
56-
files signed by him. For further information see the
58+
files signed by one of them. For further information see the
5759
.B regulatory.bin
5860
man page.
5961

pubkeys/sforshee.key.pub.pem

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
-----BEGIN PUBLIC KEY-----
2+
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtUDjnCiEOQPyOddmLEE4
3+
Fax+pYNxJX6QfGjdbz/Z11k4n3xqUsIDKi1+ZvQesxJwIFvUlzI9cYs7GwgXFGth
4+
xFeLlhYc/STVCwn5aBGE+8pRDNFFGdoQRIrZ/nap/WAtGAsolbIt6oiYuNFWIfBT
5+
H/ECb+lGm5NfKJAPrDb6aCNxV1b2zNPffSrZG3NF67onhe96f6XLgMcwNtJT7uys
6+
Hucx8TainGPGZVt/JXVooerTfgBcml7YIBgydwcpEmYeNnPnlwRBN7Gxciv0oSkg
7+
fJZ5CyvQ2N7IbD+T+8XueFIRFRt69uJomef7RhaE48eh5uDSRtXhxF+gZvTaxP+V
8+
HQIDAQAB
9+
-----END PUBLIC KEY-----

0 commit comments

Comments
 (0)