oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

hcrypto: Remove w32crypt NTDDI_VERSION checks

Browse Source 
The library delay loads bcrypt.dll so that it can run on versions of
Windows older than Vista.  Remove the compile time checks.

Change-Id: I632b248dcca8b6e40e47011fc11d277e911ff209
This commit is contained in:
Jeffrey Altman
2015-03-21 15:43:33 -04:00
parent 540c3273c4
commit 2c68305856
2 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/hcrypto/evp-w32.c
View File

@@ -44,8 +44,6 @@
#include <evp-w32.h> #include <evp-w32.h>
#include <evp-hcrypto.h> #include <evp-hcrypto.h>
#if NTDDI_VERSION >= NTDDI_VISTA
#include <evp-wincng.h> #include <evp-wincng.h>
static LONG wincng_available = -1; static LONG wincng_available = -1;
@@ -102,13 +100,6 @@ _hc_w32crypto_DllMain(HINSTANCE hinstDLL,
return hc_EVP_hcrypto_ ##name (); \ return hc_EVP_hcrypto_ ##name (); \
} }
#else
#define EVP_W32CRYPTO_PROVIDER(type, name) \
EVP_W32CRYPTO_PROVIDER_CNG_UNAVAILABLE(type, name)
#endif /* NTDDI_VERSION >= NTDDI_VISTA */
#define EVP_W32CRYPTO_PROVIDER_CNG_UNAVAILABLE(type, name) \ #define EVP_W32CRYPTO_PROVIDER_CNG_UNAVAILABLE(type, name) \
\ \
const type *hc_EVP_w32crypto_ ##name (void) \ const type *hc_EVP_w32crypto_ ##name (void) \

4
lib/hcrypto/evp-wincng.c
View File

@@ -35,8 +35,6 @@
#include <windows.h> #include <windows.h>
#include <assert.h> #include <assert.h>
#if NTDDI_VERSION >= NTDDI_VISTA
#include <evp.h> #include <evp.h>
#include <evp-wincng.h> #include <evp-wincng.h>
@@ -706,5 +704,3 @@ void _hc_wincng_cleanup(void)
wincng_md_algorithm_cleanup(); wincng_md_algorithm_cleanup();
wincng_cipher_algorithm_cleanup(); wincng_cipher_algorithm_cleanup();
} }
#endif /* NTDDI_VERSION >= NTDDI_VISTA */