From patchwork Fri Dec 5 19:30:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 5445491 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2E328BEEA8 for ; Fri, 5 Dec 2014 19:31:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 64D4E201F4 for ; Fri, 5 Dec 2014 19:31:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 79E09201C8 for ; Fri, 5 Dec 2014 19:31:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751717AbaLETbD (ORCPT ); Fri, 5 Dec 2014 14:31:03 -0500 Received: from mail-ob0-f174.google.com ([209.85.214.174]:46250 "EHLO mail-ob0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751645AbaLETbB (ORCPT ); Fri, 5 Dec 2014 14:31:01 -0500 Received: by mail-ob0-f174.google.com with SMTP id nt9so1112404obb.5 for ; Fri, 05 Dec 2014 11:31:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-type:content-disposition:user-agent; bh=aEeD789z+3ExMOeDmzQJQbgmsGNx4Y/aQ4esLlsK8js=; b=h1NqSa/6o1AkMo3CcyEnT5ux8UK3i8vrFCQm/uyup9KHZThfxAAmn09rmRh++73YNm uatcXnxZTb28D2jPkX3HzZfKLqWBAXDW4MAzrZXpgHX6yyfFGGQTCadGN9W9yqzpwXje /ZY0ystmGn5e2x0xNboHMdU+9MQ8xnhePsL3APeFwJxCZIh0eD8FULYY7WPCfqxnB6G3 hMfShHXK7ij7cC+pM/sySLCnQ42Vo/KWk80e4Yd2/RB3WNCipoGzM2iIc8VHRxadmkVH DJRhr3O0hScdYMBM148DMt6zYGsOGKX7CL1EujJbfC/iD/gAUm2XbvrCPTgUgh9DqO3B k3WQ== X-Gm-Message-State: ALoCoQl0eFUG5vtILi5ghum+/3rVVjko12tKz2SSR9vV5MSR/FY6q8eJzoWJ0fOEFUYkz7Uj6WWT X-Received: by 10.60.93.198 with SMTP id cw6mr11328281oeb.77.1417807860957; Fri, 05 Dec 2014 11:31:00 -0800 (PST) Received: from localhost (199-87-125-144.dyn.kc.surewest.net. [199.87.125.144]) by mx.google.com with ESMTPSA id a10sm5116054obh.7.2014.12.05.11.31.00 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 05 Dec 2014 11:31:00 -0800 (PST) Date: Fri, 5 Dec 2014 13:30:39 -0600 From: Seth Forshee To: "Luis R. Rodriguez" Cc: linux-wireless@vger.kernel.org, "John W. Linville" Subject: [PATCH] crda: Trust regulatory.bin from Seth Forshee Message-ID: <20141205193039.GB53560@ubuntu-hedt> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, T_TVD_MIME_EPI, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- Makefile | 2 +- README | 16 +++++++++------- crda.8 | 6 ++++-- pubkeys/sforshee.key.pub.pem | 9 +++++++++ 4 files changed, 23 insertions(+), 10 deletions(-) create mode 100644 pubkeys/sforshee.key.pub.pem 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-----