Fixed to compile under mingw32.

5 files changed, 26 insertions, 0 deletions

diff --git a/lib/gcrypt/Makefile.am b/lib/gcrypt/Makefile.am
index 0b3d5741ad..5a78b92f25 100644
--- a/lib/gcrypt/Makefile.am
+++ b/lib/gcrypt/Makefile.am
@@ -29,6 +29,10 @@ AM_CPPFLAGS = \
 	-I$(builddir)/../includes	\
 	-I$(srcdir)/..
 
+if ENABLE_MINITASN1
+AM_CPPFLAGS += -I$(srcdir)/../minitasn1
+endif
+
 noinst_LTLIBRARIES = libcrypto.la
 
 libcrypto_la_SOURCES = pk.c mpi.c mac.c cipher.c rnd.c init.c
diff --git a/lib/gnutls_privkey.c b/lib/gnutls_privkey.c
index c61567b073..f5efe6dcae 100644
--- a/lib/gnutls_privkey.c
+++ b/lib/gnutls_privkey.c
@@ -42,7 +42,9 @@ struct gnutls_privkey_st {
 	union {
 		gnutls_x509_privkey_t x509;
 		gnutls_pkcs11_privkey_t pkcs11;
+#ifdef ENABLE_OPENPGP
 		gnutls_openpgp_privkey_t openpgp;
+#endif
 	} key;
 
 	unsigned int flags;
@@ -79,10 +81,12 @@ int gnutls_privkey_get_pk_algorithm(gnutls_privkey_t key,
 				    unsigned int *bits)
 {
 	switch (key->type) {
+#ifdef ENABLE_OPENPGP
 	case GNUTLS_PRIVKEY_OPENPGP:
 		return gnutls_openpgp_privkey_get_pk_algorithm(key->key.
 							       openpgp,
 							       bits);
+#endif
 	case GNUTLS_PRIVKEY_PKCS11:
 		return gnutls_pkcs11_privkey_get_pk_algorithm(key->key.
 							      pkcs11,
@@ -130,9 +134,11 @@ void gnutls_privkey_deinit(gnutls_privkey_t key)
 {
 	if (key->flags & GNUTLS_PRIVKEY_IMPORT_AUTO_RELEASE)
 		switch (key->type) {
+#ifdef ENABLE_OPENPGP
 		case GNUTLS_PRIVKEY_OPENPGP:
 			return gnutls_openpgp_privkey_deinit(key->key.
 							     openpgp);
+#endif
 		case GNUTLS_PRIVKEY_PKCS11:
 			return gnutls_pkcs11_privkey_deinit(key->key.
 							    pkcs11);
@@ -191,6 +197,7 @@ int gnutls_privkey_import_x509(gnutls_privkey_t pkey,
 	return 0;
 }
 
+#ifdef ENABLE_OPENPGP
 /**
  * gnutls_privkey_import_openpgp:
  * @pkey: The private key
@@ -215,6 +222,7 @@ int gnutls_privkey_import_openpgp(gnutls_privkey_t pkey,
 
 	return 0;
 }
+#endif
 
 /**
  * gnutls_privkey_sign_data:
@@ -291,9 +299,11 @@ int gnutls_privkey_sign_hash(gnutls_privkey_t key,
 			     gnutls_datum_t * signature)
 {
 	switch (key->type) {
+#ifdef ENABLE_OPENPGP
 	case GNUTLS_PRIVKEY_OPENPGP:
 		return gnutls_openpgp_privkey_sign_hash(key->key.openpgp,
 							hash, signature);
+#endif
 	case GNUTLS_PRIVKEY_PKCS11:
 		return gnutls_pkcs11_privkey_sign_hash(key->key.pkcs11,
 						       hash, signature);
@@ -330,11 +340,13 @@ int gnutls_privkey_decrypt_data(gnutls_privkey_t key,
 	}
 
 	switch (key->type) {
+#ifdef ENABLE_OPENPGP
 	case GNUTLS_PRIVKEY_OPENPGP:
 		return gnutls_openpgp_privkey_decrypt_data(key->key.
 							   openpgp, flags,
 							   ciphertext,
 							   plaintext);
+#endif
 	case GNUTLS_PRIVKEY_X509:
 		return _gnutls_pkcs1_rsa_decrypt(plaintext, ciphertext,
 						 key->key.x509->params,
diff --git a/lib/gnutls_pubkey.c b/lib/gnutls_pubkey.c
index f1740bb63d..2460eca34a 100644
--- a/lib/gnutls_pubkey.c
+++ b/lib/gnutls_pubkey.c
@@ -268,6 +268,7 @@ int gnutls_pubkey_import_pkcs11(gnutls_pubkey_t key,
 	return 0;
 }
 
+#ifdef ENABLE_OPENPGP
 /**
  * gnutls_pubkey_import_openpgp:
  * @key: The public key
@@ -330,6 +331,8 @@ int gnutls_pubkey_import_openpgp(gnutls_pubkey_t key,
 	return 0;
 }
 
+#endif
+
 /**
  * gnutls_pubkey_export:
  * @key: Holds the certificate
diff --git a/lib/nettle/Makefile.am b/lib/nettle/Makefile.am
index 0b3d5741ad..5a78b92f25 100644
--- a/lib/nettle/Makefile.am
+++ b/lib/nettle/Makefile.am
@@ -29,6 +29,10 @@ AM_CPPFLAGS = \
 	-I$(builddir)/../includes	\
 	-I$(srcdir)/..
 
+if ENABLE_MINITASN1
+AM_CPPFLAGS += -I$(srcdir)/../minitasn1
+endif
+
 noinst_LTLIBRARIES = libcrypto.la
 
 libcrypto_la_SOURCES = pk.c mpi.c mac.c cipher.c rnd.c init.c
diff --git a/lib/pakchois/dlopen.h b/lib/pakchois/dlopen.h
index b1385fdc73..a8a5fab000 100644
--- a/lib/pakchois/dlopen.h
+++ b/lib/pakchois/dlopen.h
@@ -5,6 +5,9 @@
 
 #ifdef _WIN32
 
+#define RTLD_LOCAL 0
+#define RTLD_NOW 1
+
 void *dlopen(const char *filename, int flag);
 void *dlsym(void *handle, const char *symbol);
 int dlclose(void *handle);