From: Andy Polyakov <appro@openssl.org>
Date: Sat, 12 Mar 2005 11:28:22 +0000 (+0000)
Subject: Cygwin to use DSO_FLFCN and mingw to use DSO_WIN32 (required for FIPS).
X-Git-Tag: OpenSSL_0_9_7f~14
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9d14506f292f36f78993dc813eda84008ecc0175;p=oweals%2Fopenssl.git

Cygwin to use DSO_FLFCN and mingw to use DSO_WIN32 (required for FIPS).
---

diff --git a/Configure b/Configure
index 574bf55f57..a83c5d406c 100755
--- a/Configure
+++ b/Configure
@@ -527,7 +527,7 @@ my %table=(
 
 # Cygwin
 "Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32",
-"Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:win32:cygwin-shared:::.dll",
+"Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:cygwin-shared:::.dll",
 
 # DJGPP
 "DJGPP", "gcc:-I/dev/env/WATT_ROOT/inc -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -Wall -DDEVRANDOM=\"/dev/urandom\\x24\":::MSDOS:-L/dev/env/WATT_ROOT/lib -lwatt:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::",
diff --git a/TABLE b/TABLE
index b871ce8863..dda6b50159 100644
--- a/TABLE
+++ b/TABLE
@@ -92,7 +92,7 @@ $cast_obj     = asm/cx86-out.o
 $rc4_obj      = asm/rx86-out.o
 $rmd160_obj   = asm/rm86-out.o
 $rc5_obj      = asm/r586-out.o
-$dso_scheme   = win32
+$dso_scheme   = dlfcn
 $shared_target= cygwin-shared
 $shared_cflag = 
 $shared_ldflag = 
diff --git a/crypto/dso/dso_win32.c b/crypto/dso/dso_win32.c
index 6c30deb250..3fa90eb27c 100644
--- a/crypto/dso/dso_win32.c
+++ b/crypto/dso/dso_win32.c
@@ -61,7 +61,7 @@
 #include "cryptlib.h"
 #include <openssl/dso.h>
 
-#if !defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WINCE)
+#if !defined(DSO_WIN32)
 DSO_METHOD *DSO_METHOD_win32(void)
 	{
 	return NULL;