From patchwork Tue Oct 13 04:33:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Golle X-Patchwork-Id: 529572 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 951EA140273 for ; Tue, 13 Oct 2015 15:34:16 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id ECC99289CA0; Tue, 13 Oct 2015 06:32:24 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00, T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 6EF9D286F0B for ; Tue, 13 Oct 2015 06:32:19 +0200 (CEST) X-policyd-weight: using cached result; rate: -7.6 Received: from fudo.makrotopia.org (fudo.makrotopia.org [5.135.190.93]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Tue, 13 Oct 2015 06:32:19 +0200 (CEST) Received: from local by fudo.makrotopia.org with esmtpsa (TLSv1.2:AES128-GCM-SHA256:128) (Exim 4.85) (envelope-from ) id 1ZlrHZ-0008Tf-W6 for openwrt-devel@lists.openwrt.org; Tue, 13 Oct 2015 06:33:50 +0200 Date: Tue, 13 Oct 2015 06:33:48 +0200 From: Daniel Golle To: openwrt-devel@lists.openwrt.org Message-ID: <20151013043341.GA32208@makrotopia.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) Subject: [OpenWrt-Devel] [PATCH] modules: crypto-rng changes additions for kernel 4.3 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Signed-off-by: Daniel Golle --- package/kernel/linux/modules/crypto.mk | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index 82d2ca8..1179fff 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -100,15 +100,25 @@ $(eval $(call KernelPackage,crypto-wq)) define KernelPackage/crypto-rng TITLE:=CryptoAPI random number generation KCONFIG:=CONFIG_CRYPTO_RNG2 - FILES:= \ - $(LINUX_DIR)/crypto/rng.ko \ - $(LINUX_DIR)/crypto/krng.ko + FILES:=$(LINUX_DIR)/crypto/rng.ko +ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,4.2.0)),1) + FILES+=$(LINUX_DIR)/crypto/krng.ko +endif AUTOLOAD:=$(call AutoLoad,09,rng krng) $(call AddDepends/crypto) endef $(eval $(call KernelPackage,crypto-rng)) +define KernelPackage/crypto-rng-jitterentropy + TITLE:=Jitterentropy Non-Deterministic Random Number Generator + KCONFIG:=CONFIG_CRYPTO_JITTERENTROPY + FILES:= $(LINUX_DIR)/crypto/jitterentropy_rng.ko + AUTOLOAD:=$(call AutoLoad,10,jitterentropy-rng) + $(call AddDepends/crypto) +endef + +$(eval $(call KernelPackage,crypto-rng-jitterentropy)) define KernelPackage/crypto-iv TITLE:=CryptoAPI initialization vectors