From patchwork Wed Sep 25 16:12:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 174377 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp843312ill; Wed, 25 Sep 2019 09:14:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqwpcb9fVE5WMNYlIE6MpJIPhNj0ms1BPIv1RhDNHrhW/5RFwzzTAANlMzbvQrwG0eLJ9xTL X-Received: by 2002:a17:906:1394:: with SMTP id f20mr27152ejc.274.1569428061074; Wed, 25 Sep 2019 09:14:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569428059; cv=none; d=google.com; s=arc-20160816; b=GeyV7wvD/ZYCYnVukjGdWxy+pN/ZLClRMDfcUpNTMPv5YZM4MT0mhOXdH9dcih+v5e g1/TobaulcrC3rBRKOJZjFA2TZR42briZTNIuHDHTXpUVfs/WFoN51WpN5RCSWXFnXGD PIxDGGBtcm6Yy4hGYFObCt3jlAs2Pk4xRWRUKjWt7Fw8grPKXuqN0dqvssuqnibaeWkW xfHnXViEtP99dmvs31NhkWCLLRbATvhh519DGi/2Prlrx07DxIooyEnaXxMyzUygTJ4+ 2saCx7Wsh3dXkZZ6bwHeYO609B0Q6TuWM4uAlh+fIONiXy9M9mDxqcA/A/HF5Izr6WeZ iFBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=vpYX5apOE5ovWt54wDvLpgCFg3w7Y3yfqWQuF42X3Ys=; b=oNPGFv2naiIyFHh4vlSKWv6PAD+pF89c91J0riIZc4Wx04ZfZZWIWwLWDE/wKc15ve NO23DVdvkBuymeUNA66bc6CH0Nnh0AtW5mQf48CoifUitQvZdC4xAGhKYCf+qVwsFg00 /CtZT8gko5g3sYYoBm7O8GH9uPnF10z9FKWJYVFmQ6Ka/vlI0eZaQB2C/swkleCFvPEu J0rgJ5nJX7J45QCUjTVjsXFhGv776yOaxGKt42RXTioieGS88kglnUox0p0Zz7fA2d7v ZDmf9u+km57bz/F/rNOEZ77jv3+zu9C/ZCo5/zQddSDN9/Vj346v99PvyM2O5xkqe7C7 /z3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EoCQ8h10; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g18si3540139edq.209.2019.09.25.09.14.18; Wed, 25 Sep 2019 09:14:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EoCQ8h10; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2439511AbfIYQOS (ORCPT + 3 others); Wed, 25 Sep 2019 12:14:18 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:52610 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2439058AbfIYQOR (ORCPT ); Wed, 25 Sep 2019 12:14:17 -0400 Received: by mail-wm1-f68.google.com with SMTP id r19so4848968wmh.2 for ; Wed, 25 Sep 2019 09:14:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vpYX5apOE5ovWt54wDvLpgCFg3w7Y3yfqWQuF42X3Ys=; b=EoCQ8h108o9ud79LK9qo/lEUOOMuQ+8osdvhOyjax1WhpI2184srTIyoMNIe740+DL PUcEG2HHc8fCdWvJb0SSJwMZIKVyRKNTMVEsFB/8IU8VDms3Ne0Ef83bLBd2cjCrYtCR SRjrANqSyHMKwUfeqL39Bkzo2NRv8UpRkVkvQL1q6pPRCeKZJ0h9J2+OnNwtpoZnCsk4 QZXfquoD3+tk/HriLcgx5buUFhjTYbb1OVamAfkLtzqaItM7tx+AGUk4nIO73VVcZS1E j9+B+x5xSA4YGcEfUl9jsKx6VPygEvioFVenr5YkCjIlbkiIo9ejOO4tZXy3lJXs2H0N lYqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vpYX5apOE5ovWt54wDvLpgCFg3w7Y3yfqWQuF42X3Ys=; b=k5wksaYRRKX2rI9YElXe+8fbIyWv+Gmo4NAi2yeSx9g0ER9nsxCUpgkm2rXM2vy9Zz Vp+NyiA0TG6F4ZO6Ns/dXK+imLjrugpe3idgaaBglQtSsa67S7zDSl9UDZQcsiWJzQp2 lnStIAAvPo+S+/r9cNitFo6H8R/kNrMtukuYLXwq084xd26ak7USAD89qcfaTOyw4RQT 6pjH7mA2pGBQQU4FzAw/zwisSvCfX1HRx6uWsPDjN2bMrCbXqG7pnzJftnrvTXb1Iz6p 2S3NzFBVPhg3GMR+w0LbNQiXCMcBK11p6oZDSt88DDwdU58xAW/7dvn10tcaSx+ybGO2 kM8A== X-Gm-Message-State: APjAAAUhL0QHJbJ1+dVGdn5kA2NFymLavKzpEidRS1vPTm4/8CpTfenx 1AvlRC+Lm9myNo/Zgc0f37XLVnJkESi2Y9ov X-Received: by 2002:a1c:7ed7:: with SMTP id z206mr9232689wmc.124.1569428054603; Wed, 25 Sep 2019 09:14:14 -0700 (PDT) Received: from localhost.localdomain (laubervilliers-657-1-83-120.w92-154.abo.wanadoo.fr. [92.154.90.120]) by smtp.gmail.com with ESMTPSA id o70sm4991085wme.29.2019.09.25.09.14.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2019 09:14:13 -0700 (PDT) From: Ard Biesheuvel To: linux-crypto@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Ard Biesheuvel , Herbert Xu , David Miller , Greg KH , Linus Torvalds , "Jason A . Donenfeld" , Samuel Neves , Dan Carpenter , Arnd Bergmann , Eric Biggers , Andy Lutomirski , Will Deacon , Marc Zyngier , Catalin Marinas Subject: [RFC PATCH 17/18] wg switch to lib/crypto algos Date: Wed, 25 Sep 2019 18:12:54 +0200 Message-Id: <20190925161255.1871-18-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190925161255.1871-1-ard.biesheuvel@linaro.org> References: <20190925161255.1871-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org --- drivers/net/Kconfig | 6 +++--- drivers/net/wireguard/cookie.c | 4 ++-- drivers/net/wireguard/messages.h | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) -- 2.20.1 diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index c26aef673538..3bd4dc662392 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -77,9 +77,9 @@ config WIREGUARD depends on IPV6 || !IPV6 select NET_UDP_TUNNEL select DST_CACHE - select ZINC_CHACHA20POLY1305 - select ZINC_BLAKE2S - select ZINC_CURVE25519 + select CRYPTO_LIB_CHACHA20POLY1305 + select CRYPTO_LIB_BLAKE2S + select CRYPTO_LIB_CURVE25519 help WireGuard is a secure, fast, and easy to use replacement for IPSec that uses modern cryptography and clever networking tricks. It's diff --git a/drivers/net/wireguard/cookie.c b/drivers/net/wireguard/cookie.c index bd23a14ff87f..104b739c327f 100644 --- a/drivers/net/wireguard/cookie.c +++ b/drivers/net/wireguard/cookie.c @@ -10,8 +10,8 @@ #include "ratelimiter.h" #include "timers.h" -#include -#include +#include +#include #include #include diff --git a/drivers/net/wireguard/messages.h b/drivers/net/wireguard/messages.h index 3cfd1c5e9b02..4bbb1f97af04 100644 --- a/drivers/net/wireguard/messages.h +++ b/drivers/net/wireguard/messages.h @@ -6,9 +6,9 @@ #ifndef _WG_MESSAGES_H #define _WG_MESSAGES_H -#include -#include -#include +#include +#include +#include #include #include