Allow for mingw cross-compile configuration.

4 files changed, 29 insertions, 16 deletions

diff --git a/Configure b/Configure
index 726c89696a..5715b2ce67 100755
--- a/Configure
+++ b/Configure
@@ -937,8 +937,6 @@ foreach (sort (keys %disabled))
 
 my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds;
 
-$IsMK1MF=1 if ($target eq "mingw" && $^O ne "cygwin" && !is_msys());
-
 $exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target eq "mingw");
 $exe_ext=".pm"  if ($target =~ /vos/);
 $openssldir="/usr/local/ssl" if ($openssldir eq "" and $prefix eq "");
@@ -1847,11 +1845,3 @@ sub test_sanity
 	print STDERR "No sanity errors detected!\n" if $errorcnt == 0;
 	return $errorcnt;
 	}
-
-# Attempt to detect MSYS environment
-
-sub is_msys
-	{
-	return 1 if (exists $ENV{"TERM"} && $ENV{"TERM"} eq "msys");
-	return 0;
-	}
diff --git a/Makefile.shared b/Makefile.shared
index 92d50e01aa..66b620f971 100644
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -249,7 +249,7 @@ link_o.cygwin:
 	@ $(CALC_VERSIONS); \
 	INHIBIT_SYMLINKS=yes; \
 	SHLIB=cyg$(LIBNAME); \
-	expr $(PLATFORM) : 'mingw' > /dev/null && SHLIB=$(LIBNAME)eay32; \
+	expr $(PLATFORM) : 'mingw' > /dev/null && SHLIB=$(LIBNAME); \
 	SHLIB_SUFFIX=.dll; \
 	LIBVERSION="$(LIBVERSION)"; \
 	SHLIB_SOVER=${LIBVERSION:+"-$(LIBVERSION)"}; \
@@ -260,14 +260,18 @@ link_o.cygwin:
 link_a.cygwin:
 	@ $(CALC_VERSIONS); \
 	INHIBIT_SYMLINKS=yes; \
-	SHLIB=cyg$(LIBNAME); \
-	expr $(PLATFORM) : 'mingw' > /dev/null && SHLIB=$(LIBNAME)eay32; \
+	SHLIB=cyg$(LIBNAME); def=; \
+	if expr $(PLATFORM) : 'mingw' > /dev/null; then \
+		SHLIB=$(LIBNAME); \
+		def="$(LIBNAME).def"; \
+		$(PERL) util/mkdef.pl 32 $(LIBNAME) > $$def; \
+	fi; \
 	SHLIB_SUFFIX=.dll; \
 	SHLIB_SOVER=-$(LIBVERSION); \
 	ALLSYMSFLAGS='-Wl,--whole-archive'; \
 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
 	base=;  [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x63000000; \
-	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
+	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a $$def"; \
 	[ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm apps/$$SHLIB$$SHLIB_SUFFIX; \
 	[ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm test/$$SHLIB$$SHLIB_SUFFIX; \
 	$(LINK_SO_A) || exit 1; \
diff --git a/crypto/engine/engine.h b/crypto/engine/engine.h
index bf35eab171..a2067dcda2 100644
--- a/crypto/engine/engine.h
+++ b/crypto/engine/engine.h
@@ -333,10 +333,10 @@ void ENGINE_load_gmp(void);
 void ENGINE_load_nuron(void);
 void ENGINE_load_sureware(void);
 void ENGINE_load_ubsec(void);
+void ENGINE_load_gost(void);
 #endif
 void ENGINE_load_cryptodev(void);
 void ENGINE_load_padlock(void);
-void ENGINE_load_gost(void);
 void ENGINE_load_builtin_engines(void);
 
 /* Get and set global flags (ENGINE_TABLE_FLAG_***) for the implementation
diff --git a/util/libeay.num b/util/libeay.num
index 7abea035d6..28605813be 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -3458,7 +3458,6 @@ EVP_PKEY_encrypt_init                   3857	EXIST::FUNCTION:
 ASN1_PCTX_get_cert_flags                3858	EXIST::FUNCTION:
 i2d_ESS_SIGNING_CERT                    3859	EXIST::FUNCTION:
 TS_CONF_load_key                        3860	EXIST::FUNCTION:
-d2i_TS_MSG_IMPRINT_bio                  3861	EXIST::FUNCTION:
 EVP_PKEY_asn1_set_public                3862	EXIST::FUNCTION:
 b2i_PublicKey_bio                       3863	EXIST::FUNCTION:
 TS_REQ_ext_free                         3864	EXIST::FUNCTION:
@@ -3775,3 +3774,23 @@ EVP_MD_do_all                           4167	EXIST::FUNCTION:
 OCSP_REQ_CTX_free                       4168	EXIST::FUNCTION:
 OCSP_sendreq_nbio                       4169	EXIST::FUNCTION:
 OCSP_sendreq_new                        4170	EXIST::FUNCTION:
+X509_STORE_get1_crls                    4171	EXIST::FUNCTION:
+AES_ige_encrypt                         4175	EXIST::FUNCTION:AES
+X509_CRL_METHOD_free                    4176	EXIST::FUNCTION:
+ENGINE_register_pkey_asn1_meths         4177	EXIST::FUNCTION:ENGINE
+X509_CRL_set_meth_data                  4178	EXIST::FUNCTION:
+X509_CRL_match                          4179	EXIST::FUNCTION:
+X509_CRL_get_meth_data                  4180	EXIST::FUNCTION:
+AES_bi_ige_encrypt                      4181	EXIST::FUNCTION:AES
+X509_CRL_METHOD_new                     4182	EXIST::FUNCTION:
+ENGINE_register_all_pkey_asn1_meths     4183	EXIST:!VMS:FUNCTION:ENGINE
+ENGINE_reg_all_pkey_asn1_meths          4183	EXIST:VMS:FUNCTION:ENGINE
+X509_CRL_set_default_method             4184	EXIST::FUNCTION:
+X509_CRL_get0_by_serial                 4185	EXIST::FUNCTION:
+X509_STORE_get1_certs                   4186	EXIST::FUNCTION:
+X509_check_akid                         4187	EXIST::FUNCTION:
+ENGINE_unregister_pkey_asn1_meths       4188	EXIST:!VMS:FUNCTION:ENGINE
+ENGINE_unreg_pkey_asn1_meths            4188	EXIST:VMS:FUNCTION:ENGINE
+PKCS5_PBKDF2_HMAC                       4189	EXIST::FUNCTION:
+check_defer                             4190	EXIST::FUNCTION:
+ENGINE_load_gost                        4192	EXIST::FUNCTION:ENGINE,STATIC_ENGINE