diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-23 09:21:15 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-23 09:21:15 +0200 |
| commit | 94676a2c44ac011fb1427f31f1fb98b9b3231b4c (patch) | |
| tree | 732d485654b0c8074db30d2e1246a24022f8442b /crypto/sm3_generic.c | |
| parent | 4c3c8f1016e9854690d93cbc4a825af6594d40e4 (diff) | |
| parent | e3b5593df487b2a100ebb41d239aa4bb7d597735 (diff) | |
| download | linux-crypto-94676a2c44ac011fb1427f31f1fb98b9b3231b4c.tar.gz linux-crypto-94676a2c44ac011fb1427f31f1fb98b9b3231b4c.zip | |
Merge 5.2-rc6 into usb-next
We need the USB fixes in here too.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'crypto/sm3_generic.c')
| -rw-r--r-- | crypto/sm3_generic.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/crypto/sm3_generic.c b/crypto/sm3_generic.c index e227bcad..34689752 100644 --- a/crypto/sm3_generic.c +++ b/crypto/sm3_generic.c @@ -1,21 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * SM3 secure hash, as specified by OSCCA GM/T 0004-2012 SM3 and * described at https://tools.ietf.org/html/draft-shen-sm3-hash-01 * * Copyright (C) 2017 ARM Limited or its affiliates. * Written by Gilad Ben-Yossef <gilad@benyossef.com> - * - * 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. - * - * 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 for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include <crypto/internal/hash.h> |