From: Darren Tucker <dtucker@dtucker.net>
Date: Wed, 22 Dec 2021 08:33:10 +0000 (+1100)
Subject: Use SHA.*_HMAC_BLOCK_SIZE if needed.
X-Git-Tag: V_8_9_P1~123
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c9853a68b2319f2e5f929179735e8fbb9988a67;p=thirdparty%2Fopenssh-portable.git

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.
---

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 <sha2.h>
 #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"