From patchwork Wed Dec 23 08:09:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 11987855 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06F8BC433E0 for ; Wed, 23 Dec 2020 08:15:19 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B8B362070B for ; Wed, 23 Dec 2020 08:15:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B8B362070B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=CJsx3ANfMYK4925Oi/wjMn7oGunaHtqc8scK/wdjDsk=; b=VmT5p4L6CFn5bvR7MsFTAyj9s DNgcdmx6MNr7NrebhnoDdRA/VSJvXT5hCOAs/JXY5qeOiJssdB/raacUla6OYhCfeHaHQsczUtbrx v/ctRWm/R4p/9psWa9nza9LCDHXX6KcvttJoesBrYu4qfsofhuD4CThcU85emtobdt0Dapm/NQRJe JroFAzhx9tsuSp+PYi0fmWakh+9MbjjiFjtbVNSqzZqCiTMsVMRBdE/89fIKSv+P/BluStygZil0V e6F+CGV+Tv9R5cvxO7sel3S4ePR0XahBwFzg9uu0fjc73vTgQvmj9IWqfqKHicAjtk0oHHosJtBnG 9qyxE40TQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1krzHH-0007Df-BZ; Wed, 23 Dec 2020 08:13:47 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1krzGT-0006xD-Iy for linux-arm-kernel@lists.infradead.org; Wed, 23 Dec 2020 08:13:03 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id AA16B224D4; Wed, 23 Dec 2020 08:12:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1608711176; bh=q4F9axpwjHT+hZCneYUehP2waWRDVZo8NQHm18Rvv8A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bRgb0YHY7nLLWkRGRYheVHAwG0hkbfuZl72KhzElKOFinUleUQ4wTPZULrx1EOiS/ 91+jd1LkKsWFcRWBQ6tw0Nu+k42lFGIkiCcMuuopKoNLR+ukNCuyykggGUqGbB/FeE VF38QzIeILBMrE3hoJ6k1oMOLz75rn9WPCm0xM0TMtmCVEb1nGNGvUOW+h2FSqs+yX LMKs71l1HfIu2jxyJc8b81qEWoHSHbVJax1NGm4Z1yalmGhd9ej3Zd7R7FXqilYTUj +wVRwMdfL4Q+1oe/05+qbxglVphIa86kPAeP4w7yY+2d9xeK5CYXCnDtJDL/D9eWYB NVfRIEmJURd2Q== From: Eric Biggers To: linux-crypto@vger.kernel.org Subject: [PATCH v3 08/14] crypto: blake2s - adjust include guard naming Date: Wed, 23 Dec 2020 00:09:57 -0800 Message-Id: <20201223081003.373663-9-ebiggers@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201223081003.373663-1-ebiggers@kernel.org> References: <20201223081003.373663-1-ebiggers@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201223_031257_769327_A5C873F2 X-CRM114-Status: GOOD ( 12.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Jason A . Donenfeld" , Herbert Xu , David Sterba , Ard Biesheuvel , linux-arm-kernel@lists.infradead.org, Paul Crowley Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Eric Biggers Use the full path in the include guards for the BLAKE2s headers to avoid ambiguity and to match the convention for most files in include/crypto/. Signed-off-by: Eric Biggers Acked-by: Ard Biesheuvel --- include/crypto/blake2s.h | 6 +++--- include/crypto/internal/blake2s.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/crypto/blake2s.h b/include/crypto/blake2s.h index f1c8330a61a91..3f06183c2d804 100644 --- a/include/crypto/blake2s.h +++ b/include/crypto/blake2s.h @@ -3,8 +3,8 @@ * Copyright (C) 2015-2019 Jason A. Donenfeld . All Rights Reserved. */ -#ifndef BLAKE2S_H -#define BLAKE2S_H +#ifndef _CRYPTO_BLAKE2S_H +#define _CRYPTO_BLAKE2S_H #include #include @@ -105,4 +105,4 @@ static inline void blake2s(u8 *out, const u8 *in, const u8 *key, void blake2s256_hmac(u8 *out, const u8 *in, const u8 *key, const size_t inlen, const size_t keylen); -#endif /* BLAKE2S_H */ +#endif /* _CRYPTO_BLAKE2S_H */ diff --git a/include/crypto/internal/blake2s.h b/include/crypto/internal/blake2s.h index 867ef3753f5c1..8e50d487500f2 100644 --- a/include/crypto/internal/blake2s.h +++ b/include/crypto/internal/blake2s.h @@ -4,8 +4,8 @@ * Keep this in sync with the corresponding BLAKE2b header. */ -#ifndef BLAKE2S_INTERNAL_H -#define BLAKE2S_INTERNAL_H +#ifndef _CRYPTO_INTERNAL_BLAKE2S_H +#define _CRYPTO_INTERNAL_BLAKE2S_H #include #include @@ -116,4 +116,4 @@ static inline int crypto_blake2s_final(struct shash_desc *desc, u8 *out, return 0; } -#endif /* BLAKE2S_INTERNAL_H */ +#endif /* _CRYPTO_INTERNAL_BLAKE2S_H */