libbb: code shrink

Fix some compiler warnings and move the CNG algorithm caches into
get_alg_handle().

Saves 32 bytes in the x86_64 build with CNG enabled.

2 files changed, 30 insertions, 16 deletions

diff --git a/libbb/hash_hmac.c b/libbb/hash_hmac.c
index 8cda2590a..3f8ea0252 100644
--- a/libbb/hash_hmac.c
+++ b/libbb/hash_hmac.c
@@ -169,13 +169,13 @@ void FAST_FUNC hmac_hash_v(hmac_ctx_t *ctx, va_list va)
  */
 unsigned hmac_peek_hash(hmac_ctx_t *ctx, uint8_t *out, ...)
 {
+        va_list va;
 #if !ENABLE_FEATURE_USE_CNG_API
         hmac_ctx_t tmpctx = *ctx; /* struct copy */
 #else
         hmac_ctx_t tmpctx;
         hmac_clone(ctx, &tmpctx);
 #endif
-        va_list va;
 
         va_start(va, out);
         hmac_hash_v(&tmpctx, va);
diff --git a/libbb/hash_md5_sha.c b/libbb/hash_md5_sha.c
index 587cf2e3d..1a8581c63 100644
--- a/libbb/hash_md5_sha.c
+++ b/libbb/hash_md5_sha.c
@@ -17,30 +17,44 @@
 # include <windows.h>
 # include <bcrypt.h>
 
-
-static wchar_t *alg_id_mappings[] = {
-        BCRYPT_MD5_ALGORITHM,
-        BCRYPT_SHA1_ALGORITHM,
-        BCRYPT_SHA256_ALGORITHM,
-        BCRYPT_SHA384_ALGORITHM,
-        BCRYPT_SHA512_ALGORITHM
-};
-
-static BCRYPT_ALG_HANDLE algorithm_provider_cache[5] = { INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE };
-static BCRYPT_ALG_HANDLE algorithm_provider_hmac_cache[5] = { INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE };
-
 /*
  * Requests an algorithm handle from the store,
  * or creates it if it does not exist.
  */
 
-BCRYPT_ALG_HANDLE get_alg_handle(enum cng_algorithm_identifier algorithm_identifier, bool hmac) {
-        BCRYPT_ALG_HANDLE *cache = hmac ? algorithm_provider_hmac_cache : algorithm_provider_cache;
+BCRYPT_ALG_HANDLE get_alg_handle(enum cng_algorithm_identifier algorithm_identifier, bool hmac)
+{
+        const wchar_t *alg_id_mappings[] = {
+                BCRYPT_MD5_ALGORITHM,
+                BCRYPT_SHA1_ALGORITHM,
+                BCRYPT_SHA256_ALGORITHM,
+                BCRYPT_SHA384_ALGORITHM,
+                BCRYPT_SHA512_ALGORITHM
+        };
+        static BCRYPT_ALG_HANDLE algorithm_provider_cache[5] = {
+                INVALID_HANDLE_VALUE,
+                INVALID_HANDLE_VALUE,
+                INVALID_HANDLE_VALUE,
+                INVALID_HANDLE_VALUE,
+                INVALID_HANDLE_VALUE
+        };
+        static BCRYPT_ALG_HANDLE algorithm_provider_hmac_cache[5] = {
+                INVALID_HANDLE_VALUE,
+                INVALID_HANDLE_VALUE,
+                INVALID_HANDLE_VALUE,
+                INVALID_HANDLE_VALUE,
+                INVALID_HANDLE_VALUE
+                };
+        BCRYPT_ALG_HANDLE *cache;
+        NTSTATUS status;
 
+        cache = hmac ? algorithm_provider_hmac_cache : algorithm_provider_cache;
         if (cache[algorithm_identifier] != INVALID_HANDLE_VALUE) {
                 return cache[algorithm_identifier];
         }
-        NTSTATUS status = BCryptOpenAlgorithmProvider(&cache[algorithm_identifier], alg_id_mappings[algorithm_identifier], NULL, hmac ? BCRYPT_ALG_HANDLE_HMAC_FLAG : 0);
+        status = BCryptOpenAlgorithmProvider(&cache[algorithm_identifier],
+                alg_id_mappings[algorithm_identifier], NULL,
+                hmac ? BCRYPT_ALG_HANDLE_HMAC_FLAG : 0);
         mingw_die_if_error(status, "BCryptOpenAlgorithmProvider");
 
         return cache[algorithm_identifier];