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

Fix lib/hcrypto for Windows

Browse Source
This commit is contained in:
Nicolas Williams
2016-04-16 16:44:39 -05:00
parent 1103fb19df
commit 3d4fbf9aac
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/hcrypto/NTMakefile
View File

@@ -41,7 +41,7 @@ HEIMBASEDIR = $(SRC)\lib\base
HX509DIR = $(SRC)\lib\hx509 HX509DIR = $(SRC)\lib\hx509
!if INCLUDE_openssl_crypto !ifdef INCLUDE_openssl_crypto
openssl_inc=-I$(INCLUDE_openssl_crypto) openssl_inc=-I$(INCLUDE_openssl_crypto)
!endif !endif

16
lib/hcrypto/evp-openssl.c
View File

@@ -36,6 +36,7 @@
#include <heimbase.h> #include <heimbase.h>
#include <assert.h> #include <assert.h>
#include <evp.h>
#ifdef HAVE_HCRYPTO_W_OPENSSL #ifdef HAVE_HCRYPTO_W_OPENSSL
@@ -48,7 +49,6 @@
* never use knowledge of opaque OpenSSL type internals. * never use knowledge of opaque OpenSSL type internals.
*/ */
#include <evp.h>
#include <evp-openssl.h> #include <evp-openssl.h>
/* /*
@@ -401,6 +401,16 @@ get_EVP_MD(heim_base_once_t *once, hc_EVP_MD *hc_memoize,
&initialized, NID_##name); \ &initialized, NID_##name); \
} }
#else /* HAVE_HCRYPTO_W_OPENSSL */
#define OSSL_CIPHER_ALGORITHM(name, flags) \
const hc_EVP_CIPHER *hc_EVP_ossl_##name(void) { return NULL; }
#define OSSL_MD_ALGORITHM(name) \
const hc_EVP_MD *hc_EVP_ossl_##name(void) { return NULL; }
#endif /* HAVE_HCRYPTO_W_OPENSSL */
/** /**
* The triple DES cipher type (OpenSSL provider) * The triple DES cipher type (OpenSSL provider)
* *
@@ -621,7 +631,3 @@ OSSL_MD_ALGORITHM(sha384)
* @ingroup hcrypto_evp * @ingroup hcrypto_evp
*/ */
OSSL_MD_ALGORITHM(sha512) OSSL_MD_ALGORITHM(sha512)
#else /* HAVE_HCRYPTO_W_OPENSSL */
static char dummy;
#endif /* HAVE_HCRYPTO_W_OPENSSL */