diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2019-08-12 14:36:27 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2019-08-12 14:36:27 +0200 |
| commit | c37dd209adcf9a17dccab32db8a0f9fa068bf81b (patch) | |
| tree | 1f7d1531e21179d1bc47d322c97286a24a23db3e /crypto/michael_mic.c | |
| parent | dbe02bf7c56e55a5d9ef542dc3cf4cfc12f3017c (diff) | |
| parent | 0a4fa7ef65b9f8d2d8cd0db31769f3a0eb77e76f (diff) | |
| download | linux-crypto-c37dd209adcf9a17dccab32db8a0f9fa068bf81b.tar.gz linux-crypto-c37dd209adcf9a17dccab32db8a0f9fa068bf81b.zip | |
Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/urgent
Pull a single EFI fix for v5.3 from Ard:
- Fix mixed mode breakage in EFI config table handling for TPM.
Diffstat (limited to 'crypto/michael_mic.c')
| -rw-r--r-- | crypto/michael_mic.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/crypto/michael_mic.c b/crypto/michael_mic.c index 538ae793..20e6220f 100644 --- a/crypto/michael_mic.c +++ b/crypto/michael_mic.c @@ -1,13 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Cryptographic API * * Michael MIC (IEEE 802.11i/TKIP) keyed digest * * Copyright (c) 2004 Jouni Malinen <j@w1.fi> - * - * 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. */ #include <crypto/internal/hash.h> #include <asm/byteorder.h> @@ -159,6 +156,7 @@ static struct shash_alg alg = { .descsize = sizeof(struct michael_mic_desc_ctx), .base = { .cra_name = "michael_mic", + .cra_driver_name = "michael_mic-generic", .cra_blocksize = 8, .cra_alignmask = 3, .cra_ctxsize = sizeof(struct michael_mic_ctx), |