Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp7438403rwd; Tue, 6 Jun 2023 10:40:56 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5SWzJb3IWb37ppCUGEsjU8eUT8B9soq9h9VDCIxE7ZfKPFQ21jYSCut0XN1LDQzDtrEFVV X-Received: by 2002:a05:6a20:4407:b0:105:66d3:854d with SMTP id ce7-20020a056a20440700b0010566d3854dmr3748764pzb.6.1686073255839; Tue, 06 Jun 2023 10:40:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686073255; cv=none; d=google.com; s=arc-20160816; b=vKliDKcAy9NRInj5GN6i7sO16eOQI8riHRH0s1KA7Hdba8JT507jkqnQMlwhnRo0iz TPm/hzIx7YZ+6JdTIhv6gb7BT+EhX7ju0gJoT7PzLXMRU7x7zHFMssQhmlKuHBfUAanM J7JwCGesAjak8VPpDh2OcrKnmoA+vuCdT02fZ8UvmUjiNG5H8pJ5zygQAJRKq9gQ9Zcr UIjXT5EwHwA/pitSfeHK4J0uQVk85By1SNi7gw5/+4/EBprmQ6M84TfZErj9rDBfEBlH kn0a5mKmJpIMqirrTQsjzxCUeFkeBUoUtNE/AkbIzxtky6ITFg132UDzcNqVWsKRcBBt VsjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=z8B9QZIIqzvx54solTHHaCFMBUEjbNZKImlyvx/rnhA=; b=1FgXZ6O93TkaIcsQSFn7T9nbVvpiLPExLy97LXS6dBf+2EVl32vsMUiwSbcJF3FEeJ u9oXgF3DmzNxV6CoOrIIoqC3xM5CGzJ/IdkKEhIFYSWzbdpaCn8sT+4oj63ibzA6TkS4 rJEvEoHuqxSya1iq0vRy2w8jhsADxR+v31+tqkrMzBdfn+JXiJfaJGZtaf1wnpYUbfec Y2tvGBdhmK0xp0JRIHwf2nuN09nbtZV8B7nSF8LMHp5weO0iOjS1rlXzZsRE5mXR/TDO xtUzReaKKlxmZSoP9VF7cP0Fqlw+YJbZctcKu7MLpynaxvYOMR/dsvHaAIV3xg0UEYUn VETA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JkZTRzNi; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e12-20020a65478c000000b0053fbb10e6basi7567409pgs.494.2023.06.06.10.40.37; Tue, 06 Jun 2023 10:40:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JkZTRzNi; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238396AbjFFRcJ (ORCPT + 99 others); Tue, 6 Jun 2023 13:32:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39306 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238534AbjFFRcH (ORCPT ); Tue, 6 Jun 2023 13:32:07 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DDB951707 for ; Tue, 6 Jun 2023 10:31:46 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7C2F362B3C for ; Tue, 6 Jun 2023 17:31:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DBFE2C4339C; Tue, 6 Jun 2023 17:31:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686072705; bh=ZHGtpuKKtqq1E75hZzNwkwZTjilt2miWhf5UUu3HCTw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JkZTRzNiYpP/WUFcc9rHR+O9+lG4zKdPaGBiZR5vzi7/SBN0Jnrz1LGMo9gkBOFnc JtsTBMQAoBiSLddZppuPgKXYZJ+qDXGJwfk9jMHskEUI+mTlvTa0bL+aJmuHILMM3L uKhYnO8FVnk8u9YSycJGFSMhUsxyjEoz9WZv4yaZgpu3Xu7cCqn4rTESPndeUjDKXT QdjMjve8r8MKpWLYbHoF+Av0AN5pTe2UaVRZnWhYDS5aucmzvtkCEIdCYEqCn6XjcH sxgAWvlrV5+Cd8aT+a5ikj0hREAHSdnI/UbpqaoCfs+IwPkVHm7UHKWr2Zw02ZOcRW 6Teo4LElQkbbQ== From: Ard Biesheuvel To: linux-crypto@vger.kernel.org Cc: herbert@gondor.apana.org.au, ebiggers@kernel.org, Ard Biesheuvel Subject: [PATCH 2/3] crypto: arm - add some missing SPDX headers Date: Tue, 6 Jun 2023 19:31:26 +0200 Message-Id: <20230606173127.4050254-3-ardb@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230606173127.4050254-1-ardb@kernel.org> References: <20230606173127.4050254-1-ardb@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=6151; i=ardb@kernel.org; h=from:subject; bh=ZHGtpuKKtqq1E75hZzNwkwZTjilt2miWhf5UUu3HCTw=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JIaU+N/vsOsPLCeIT3t+M3iiUozUlz1+7Nfl9iN+kqYLlW sH3XQw6SlkYxDgYZMUUWQRm/3238/REqVrnWbIwc1iZQIYwcHEKwEQa0xkZTu2LcP/JHJryvsFH 02tJ7E+TTZ1Nra43pJ7Nv5Pcsz7tGsP/LMFbf/hvLRW+9uutdtPC2dasz/ZeSeE/I5DIqHvqvM0 jDgA= X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Add some missing SPDX headers, and drop the associated boilerplate license text to/from the ARM implementations of ChaCha, CRC-32 and CRC-T10DIF. Signed-off-by: Ard Biesheuvel --- arch/arm/crypto/chacha-neon-core.S | 10 +---- arch/arm/crypto/crc32-ce-core.S | 30 ++------------- arch/arm/crypto/crct10dif-ce-core.S | 40 +------------------- 3 files changed, 5 insertions(+), 75 deletions(-) diff --git a/arch/arm/crypto/chacha-neon-core.S b/arch/arm/crypto/chacha-neon-core.S index 13d12f672656bb8d..46d708118ef948ec 100644 --- a/arch/arm/crypto/chacha-neon-core.S +++ b/arch/arm/crypto/chacha-neon-core.S @@ -1,21 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * ChaCha/XChaCha NEON helper functions * * Copyright (C) 2016 Linaro, Ltd. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * * Based on: * ChaCha20 256-bit cipher algorithm, RFC7539, x64 SSE3 functions * * Copyright (C) 2015 Martin Willi - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ /* diff --git a/arch/arm/crypto/crc32-ce-core.S b/arch/arm/crypto/crc32-ce-core.S index 3f13a76b9066e0f6..228a1f298f24d3d0 100644 --- a/arch/arm/crypto/crc32-ce-core.S +++ b/arch/arm/crypto/crc32-ce-core.S @@ -1,37 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Accelerated CRC32(C) using ARM CRC, NEON and Crypto Extensions instructions * * Copyright (C) 2016 Linaro Ltd - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ - -/* GPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 only, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License version 2 for more details (a copy is included - * in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU General Public License - * version 2 along with this program; If not, see http://www.gnu.org/licenses - * - * Please visit http://www.xyratex.com/contact if you need additional - * information or have any questions. - * - * GPL HEADER END */ /* + * Derived from the x86 SSE version: + * * Copyright 2012 Xyratex Technology Limited * * Using hardware provided PCLMULQDQ instruction to accelerate the CRC32 diff --git a/arch/arm/crypto/crct10dif-ce-core.S b/arch/arm/crypto/crct10dif-ce-core.S index 46c02c518a300ab0..5d24448fae1ccacb 100644 --- a/arch/arm/crypto/crct10dif-ce-core.S +++ b/arch/arm/crypto/crct10dif-ce-core.S @@ -1,13 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR BSD-3-Clause */ // // Accelerated CRC-T10DIF using ARM NEON and Crypto Extensions instructions // // Copyright (C) 2016 Linaro Ltd // Copyright (C) 2019 Google LLC // -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 2 as -// published by the Free Software Foundation. -// // Derived from the x86 version: // @@ -21,41 +18,6 @@ // James Guilford // Tim Chen // -// This software is available to you under a choice of one of two -// licenses. You may choose to be licensed under the terms of the GNU -// General Public License (GPL) Version 2, available from the file -// COPYING in the main directory of this source tree, or the -// OpenIB.org BSD license below: -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// * Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the -// distribution. -// -// * Neither the name of the Intel Corporation nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// -// THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION ""AS IS"" AND ANY -// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION OR -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// // Reference paper titled "Fast CRC Computation for Generic // Polynomials Using PCLMULQDQ Instruction" // URL: http://www.intel.com/content/dam/www/public/us/en/documents -- 2.39.2