From: Matteo Croce Date: Sat, 28 Apr 2018 13:32:57 +0000 (+0200) Subject: sha512sum: use kernel crypto API X-Git-Tag: v1.0~5665 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=833bb2f5a5acc8d0958051acfe102f771ba89fc9;p=gnulib.git sha512sum: use kernel crypto API Use AF_ALG for sha384 and sha512 too Signed-off-by: Matteo Croce --- diff --git a/ChangeLog b/ChangeLog index d529ec224f..d267347b9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2018-04-28 Matteo Croce + + sha512sum: Use AF_ALG when available. + * lib/sha512.c: Include af_alg.h. + (sha512_stream, sha384_stream): Use afalg_stream when available. + * modules/crypto/sha512 (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 sha256sum: Use AF_ALG when available. diff --git a/lib/sha512.c b/lib/sha512.c index 8a6dd4e83a..72e5fdd241 100644 --- a/lib/sha512.c +++ b/lib/sha512.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 @@ -185,8 +189,20 @@ sha512_stream (FILE *stream, void *resblock) { struct sha512_ctx ctx; size_t sum; + char *buffer; + +#ifdef HAVE_LINUX_IF_ALG_H + int ret; + + ret = afalg_stream(stream, resblock, "sha512", SHA512_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; @@ -256,8 +272,20 @@ sha384_stream (FILE *stream, void *resblock) { struct sha512_ctx ctx; size_t sum; + char *buffer; + +#ifdef HAVE_LINUX_IF_ALG_H + int ret; + + ret = afalg_stream(stream, resblock, "sha384", SHA384_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/sha512 b/modules/crypto/sha512 index 4c97604cde..6d0dd1019a 100644 --- a/modules/crypto/sha512 +++ b/modules/crypto/sha512 @@ -5,8 +5,11 @@ Files: lib/gl_openssl.h lib/sha512.h lib/sha512.c +lib/af_alg.h +lib/af_alg.c m4/gl-openssl.m4 m4/sha512.m4 +m4/linux-if-alg.m4 Depends-on: extern-inline @@ -16,9 +19,10 @@ u64 configure.ac: gl_SHA512 +gl_LINUX_IF_ALG_H Makefile.am: -lib_SOURCES += sha512.c +lib_SOURCES += sha512.c af_alg.c Include: "sha512.h"