From cb08dad26c3de67a3c1b3d233fb8934444357093 Mon Sep 17 00:00:00 2001 From: Matteo Croce Date: Sat, 28 Apr 2018 15:32:56 +0200 Subject: [PATCH] sha256sum: use kernel crypto API Use AF_ALG for sha224 and sha256 too Signed-off-by: Matteo Croce --- ChangeLog | 9 +++++++++ lib/sha256.c | 32 ++++++++++++++++++++++++++++++-- modules/crypto/sha256 | 6 +++++- 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index acec47a18c..d529ec224f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2018-04-28 Matteo Croce + + sha256sum: Use AF_ALG when available. + * lib/sha256.c: Include af_alg.h. + (sha256_stream, sha224_stream): Use afalg_stream when available. + * modules/crypto/sha256 (Files): Add the af_alg files. + (configure.ac): Invoke gl_LINUX_IF_ALG_H. + (Makefile.am): Add af_alg.c. + 2018-04-28 Matteo Croce sha1sum: Use AF_ALG when available. diff --git a/lib/sha256.c b/lib/sha256.c index 85405b20fd..578f43e4df 100644 --- a/lib/sha256.c +++ b/lib/sha256.c @@ -32,6 +32,10 @@ #include #include +#ifdef HAVE_LINUX_IF_ALG_H +# include "af_alg.h" +#endif + #if USE_UNLOCKED_IO # include "unlocked-io.h" #endif @@ -177,8 +181,20 @@ sha256_stream (FILE *stream, void *resblock) { struct sha256_ctx ctx; size_t sum; + char *buffer; + +#ifdef HAVE_LINUX_IF_ALG_H + int ret; + + ret = afalg_stream(stream, resblock, "sha256", SHA256_DIGEST_SIZE); + if (!ret) + return 0; + + if (ret == -EIO) + return 1; +#endif - char *buffer = malloc (BLOCKSIZE + 72); + buffer = malloc (BLOCKSIZE + 72); if (!buffer) return 1; @@ -248,8 +264,20 @@ sha224_stream (FILE *stream, void *resblock) { struct sha256_ctx ctx; size_t sum; + char *buffer; + +#ifdef HAVE_LINUX_IF_ALG_H + int ret; + + ret = afalg_stream(stream, resblock, "sha224", SHA224_DIGEST_SIZE); + if (!ret) + return 0; + + if (ret == -EIO) + return 1; +#endif - char *buffer = malloc (BLOCKSIZE + 72); + buffer = malloc (BLOCKSIZE + 72); if (!buffer) return 1; diff --git a/modules/crypto/sha256 b/modules/crypto/sha256 index 37fabfd905..9d4f115786 100644 --- a/modules/crypto/sha256 +++ b/modules/crypto/sha256 @@ -5,8 +5,11 @@ Files: lib/gl_openssl.h lib/sha256.h lib/sha256.c +lib/af_alg.h +lib/af_alg.c m4/gl-openssl.m4 m4/sha256.m4 +m4/linux-if-alg.m4 Depends-on: extern-inline @@ -15,9 +18,10 @@ stdint configure.ac: gl_SHA256 +gl_LINUX_IF_ALG_H Makefile.am: -lib_SOURCES += sha256.c +lib_SOURCES += sha256.c af_alg.c Include: "sha256.h" -- 2.39.5