From 1c9853a68b2319f2e5f929179735e8fbb9988a67 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Wed, 22 Dec 2021 19:33:10 +1100 Subject: [PATCH] Use SHA.*_HMAC_BLOCK_SIZE if needed. If the platform has a native SHA2, does not define SHA.*_BLOCK_LENGTH but does define SHA.*_HMAC_BLOCK_SIZE (eg Solaris) then use the latter. Should fix --without-openssl build on Solaris. --- digest-libc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/digest-libc.c b/digest-libc.c index 86a1dbf29..6e77a4492 100644 --- a/digest-libc.c +++ b/digest-libc.c @@ -36,6 +36,16 @@ #include #endif +#if !defined(SHA256_BLOCK_LENGTH) && defined(SHA256_HMAC_BLOCK_SIZE) +#define SHA256_BLOCK_LENGTH SHA256_HMAC_BLOCK_SIZE +#endif +#if !defined(SHA384_BLOCK_LENGTH) && defined(SHA512_HMAC_BLOCK_SIZE) +#define SHA384_BLOCK_LENGTH SHA512_HMAC_BLOCK_SIZE +#endif +#if !defined(SHA512_BLOCK_LENGTH) && defined(SHA512_HMAC_BLOCK_SIZE) +#define SHA512_BLOCK_LENGTH SHA512_HMAC_BLOCK_SIZE +#endif + #include "ssherr.h" #include "sshbuf.h" #include "digest.h"