diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2019-09-01 22:35:31 +0200 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2019-09-05 06:54:54 +0200 |
| commit | 34d6245fbc81e764806a65fceaeb3ab3274a1e63 (patch) | |
| tree | ec464144e0cea02d4d998e6d07777fcf78fa63d9 /arch | |
| parent | crypto: n2 - Rename arrays to avoid conflict with crypto/sha256.h (diff) | |
| download | linux-34d6245fbc81e764806a65fceaeb3ab3274a1e63.tar.xz linux-34d6245fbc81e764806a65fceaeb3ab3274a1e63.zip | |
crypto: sha256 - Merge crypto/sha256.h into crypto/sha.h
The generic sha256 implementation from lib/crypto/sha256.c uses data
structs defined in crypto/sha.h, so lets move the function prototypes
there too.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/purgatory/purgatory.c | 2 | ||||
| -rw-r--r-- | arch/x86/purgatory/purgatory.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/purgatory/purgatory.c b/arch/s390/purgatory/purgatory.c index a80c78da9985..0a423bcf6746 100644 --- a/arch/s390/purgatory/purgatory.c +++ b/arch/s390/purgatory/purgatory.c @@ -9,7 +9,7 @@ #include <linux/kexec.h> #include <linux/string.h> -#include <crypto/sha256.h> +#include <crypto/sha.h> #include <asm/purgatory.h> int verify_sha256_digest(void) diff --git a/arch/x86/purgatory/purgatory.c b/arch/x86/purgatory/purgatory.c index 7cd7a2618180..c4295256cc0c 100644 --- a/arch/x86/purgatory/purgatory.c +++ b/arch/x86/purgatory/purgatory.c @@ -9,7 +9,7 @@ */ #include <linux/bug.h> -#include <crypto/sha256.h> +#include <crypto/sha.h> #include <asm/purgatory.h> #include "../boot/string.h" |