Dually define _bcrypt_derive_key_pbkdf2

Author: Julia-Garland

src/libmongoc/src/mongoc/mongoc-crypto-cng.c

@@ -155,8 +155,8 @@ _crypto_hash_size (mongoc_crypto_t *crypto)
    }
 }
 
-/* Wrapper for BCryptDeriveKeyPBKDF2 */
 #if defined(MONGOC_HAVE_BCRYPT_PBKDF2)
+/* Wrapper for BCryptDeriveKeyPBKDF2 */
 static bool
 _bcrypt_derive_key_pbkdf2 (BCRYPT_ALG_HANDLE prf,
                            const char *password,
@@ -189,16 +189,17 @@ _bcrypt_derive_key_pbkdf2 (BCRYPT_ALG_HANDLE prf,
    }
    return true;
 }
-#endif
 
+#else
 /* Compute the SCRAM step Hi() as defined in RFC5802 */
 static bool
-mongoc_crypto_cng_derive_key_pbkdf2 (mongoc_crypto_t *crypto,
+_bcrypt_derive_key_pbkdf2 (mongoc_crypto_t *crypto,
                                      const char *password,
                                      size_t password_len,
                                      const uint8_t *salt,
                                      size_t salt_len,
                                      uint32_t iterations,
+                                     size_t output_len,
                                      unsigned char *output)
 {
    uint8_t intermediate_digest[MONGOC_SCRAM_HASH_MAX_SIZE];
@@ -223,6 +224,7 @@ mongoc_crypto_cng_derive_key_pbkdf2 (mongoc_crypto_t *crypto,
    }
    return true;
 }
+#endif
 
 bool
 mongoc_crypto_cng_pbkdf2_hmac_sha1 (mongoc_crypto_t *crypto,
@@ -234,12 +236,8 @@ mongoc_crypto_cng_pbkdf2_hmac_sha1 (mongoc_crypto_t *crypto,
                                     size_t output_len,
                                     unsigned char *output)
 {
-#if defined(MONGOC_HAVE_BCRYPT_PBKDF2)
    return _bcrypt_derive_key_pbkdf2 (
-      _sha1_hmac_algo, password, password_len, salt, salt_len, iterations, output_len, output)
-#else
-   return mongoc_crypto_cng_derive_key_pbkdf2 (crypto, password, password_len, salt, salt_len, iterations, output);
-#endif
+      _sha1_hmac_algo, password, password_len, salt, salt_len, iterations, output_len, output);
 }
 
 void
@@ -283,12 +281,8 @@ mongoc_crypto_cng_pbkdf2_hmac_sha256 (mongoc_crypto_t *crypto,
                                       size_t output_len,
                                       unsigned char *output)
 {
-#if defined(MONGOC_HAVE_BCRYPT_PBKDF2)
    return _bcrypt_derive_key_pbkdf2 (
-      _sha256_hmac_algo, password, password_len, salt, salt_len, iterations, output_len, output)
-#else
-   return mongoc_crypto_cng_derive_key_pbkdf2 (crypto, password, password_len, salt, salt_len, iterations, output);
-#endif
+      _sha256_hmac_algo, password, password_len, salt, salt_len, iterations, output_len, output);
 }
 
 void