From: Duy Nguyen <pclouds@gmail.com>
To: "brian m. carlson" <sandals@crustytoothpaste.net>
Cc: "Git Mailing List" <git@vger.kernel.org>,
"Jeff King" <peff@peff.net>, "Derrick Stolee" <stolee@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: [PATCH v2 12/13] hash: add an SHA-256 implementation using OpenSSL
Date: Tue, 16 Oct 2018 17:36:40 +0200 [thread overview]
Message-ID: <CACsJy8B3cK7VUfRYBa+Tqnke6gJ6FT9u+AsffAcGJQhQ5wcjvQ@mail.gmail.com> (raw)
In-Reply-To: <20181015021900.1030041-13-sandals@crustytoothpaste.net>
On Mon, Oct 15, 2018 at 4:22 AM brian m. carlson
<sandals@crustytoothpaste.net> wrote:
>
> We already have OpenSSL routines available for SHA-1, so add routines
> for SHA-256 as well.
Since we have "hash-speed" tool now, it would be great to keep some
numbers of these hash implementations in the commit message (and maybe
sha1 as well just for comparison).
>
> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
> ---
> Makefile | 7 +++++++
> hash.h | 2 ++
> 2 files changed, 9 insertions(+)
>
> diff --git a/Makefile b/Makefile
> index 3d91555a81..3164e2aeee 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -183,6 +183,8 @@ all::
> #
> # Define GCRYPT_SHA256 to use the SHA-256 routines in libgcrypt.
> #
> +# Define OPENSSL_SHA256 to use the SHA-256 routines in OpenSSL.
> +#
> # Define NEEDS_CRYPTO_WITH_SSL if you need -lcrypto when using -lssl (Darwin).
> #
> # Define NEEDS_SSL_WITH_CRYPTO if you need -lssl when using -lcrypto (Darwin).
> @@ -1638,6 +1640,10 @@ endif
> endif
> endif
>
> +ifdef OPENSSL_SHA256
> + EXTLIBS += $(LIB_4_CRYPTO)
> + BASIC_CFLAGS += -DSHA256_OPENSSL
> +else
> ifdef GCRYPT_SHA256
> BASIC_CFLAGS += -DSHA256_GCRYPT
> EXTLIBS += -lgcrypt
> @@ -1645,6 +1651,7 @@ else
> LIB_OBJS += sha256/block/sha256.o
> BASIC_CFLAGS += -DSHA256_BLK
> endif
> +endif
>
> ifdef SHA1_MAX_BLOCK_SIZE
> LIB_OBJS += compat/sha1-chunked.o
> diff --git a/hash.h b/hash.h
> index 9df562f2f6..9df06d56b4 100644
> --- a/hash.h
> +++ b/hash.h
> @@ -17,6 +17,8 @@
>
> #if defined(SHA256_GCRYPT)
> #include "sha256/gcrypt.h"
> +#elif defined(SHA256_OPENSSL)
> +#include <openssl/sha.h>
> #else
> #include "sha256/block/sha256.h"
> #endif
--
Duy
next prev parent reply other threads:[~2018-10-16 15:37 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-15 2:18 [PATCH v2 00/13] Base SHA-256 implementation brian m. carlson
2018-10-15 2:18 ` [PATCH v2 01/13] sha1-file: rename algorithm to "sha1" brian m. carlson
2018-10-16 15:17 ` Duy Nguyen
2018-10-17 22:53 ` brian m. carlson
2018-10-15 2:18 ` [PATCH v2 02/13] sha1-file: provide functions to look up hash algorithms brian m. carlson
2018-10-17 13:32 ` SZEDER Gábor
2018-10-15 2:18 ` [PATCH v2 03/13] hex: introduce functions to print arbitrary hashes brian m. carlson
2018-10-16 1:54 ` Junio C Hamano
2018-10-17 23:49 ` brian m. carlson
2018-10-15 2:18 ` [PATCH v2 04/13] cache: make hashcmp and hasheq work with larger hashes brian m. carlson
2018-10-16 15:44 ` Duy Nguyen
2018-10-15 2:18 ` [PATCH v2 05/13] t: add basic tests for our SHA-1 implementation brian m. carlson
2018-10-15 2:18 ` [PATCH v2 06/13] t: make the sha1 test-tool helper generic brian m. carlson
2018-10-15 2:18 ` [PATCH v2 07/13] sha1-file: add a constant for hash block size brian m. carlson
2018-10-15 2:18 ` [PATCH v2 08/13] t/helper: add a test helper to compute hash speed brian m. carlson
2018-10-15 2:18 ` [PATCH v2 09/13] commit-graph: convert to using the_hash_algo brian m. carlson
2018-10-15 15:10 ` Derrick Stolee
2018-10-15 2:18 ` [PATCH v2 10/13] Add a base implementation of SHA-256 support brian m. carlson
2018-10-15 14:59 ` Duy Nguyen
2018-10-15 23:30 ` brian m. carlson
2018-10-16 14:59 ` Duy Nguyen
2018-10-17 16:12 ` SZEDER Gábor
2018-10-17 23:04 ` brian m. carlson
2018-10-15 2:18 ` [PATCH v2 11/13] sha256: add an SHA-256 implementation using libgcrypt brian m. carlson
2018-10-15 2:18 ` [PATCH v2 12/13] hash: add an SHA-256 implementation using OpenSSL brian m. carlson
2018-10-16 15:36 ` Duy Nguyen [this message]
2018-10-15 2:19 ` [PATCH v2 13/13] commit-graph: specify OID version for SHA-256 brian m. carlson
2018-10-15 15:11 ` Derrick Stolee
2018-10-16 2:00 ` Junio C Hamano
2018-10-16 22:39 ` brian m. carlson
2018-10-16 15:35 ` Duy Nguyen
2018-10-16 16:01 ` Derrick Stolee
2018-10-16 16:09 ` Duy Nguyen
2018-10-16 22:44 ` brian m. carlson
2018-10-17 14:31 ` Duy Nguyen
2018-10-18 0:06 ` brian m. carlson
2018-10-18 13:03 ` Derrick Stolee
2018-10-19 22:21 ` brian m. carlson
2018-10-17 12:21 ` Derrick Stolee
2018-10-17 22:38 ` brian m. carlson
2018-10-16 2:00 ` [PATCH v2 00/13] Base SHA-256 implementation Junio C Hamano
2018-10-16 4:01 ` Junio C Hamano
2018-10-16 22:45 ` brian m. carlson
2018-10-16 15:39 ` Duy Nguyen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CACsJy8B3cK7VUfRYBa+Tqnke6gJ6FT9u+AsffAcGJQhQ5wcjvQ@mail.gmail.com \
--to=pclouds@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.net \
--cc=stolee@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).