Engage Applink in mingw. [from HEAD]

diff --git a/Configure b/Configure
index 7234d01e1ca57e397c4a329b56cb627dff05991b..999ec20309ad317be20ef63c7ad856dce6efca8b 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -472,7 +472,7 @@ my %table=(
 "BC-32","bcc32::::WIN32::BN_LLONG DES_PTR RC4_INDEX EXPORT_VAR_AS_FN:${no_asm}:win32",
 
 # MinGW
-"mingw", "gcc:-mno-cygwin -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall -D_WIN32_WINNT=0x333:::MINGW32:-lwsock32 -lgdi32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN:${x86_coff_asm}:win32:cygwin-shared:-D_WINDLL:-mno-cygwin -shared:.dll.a",
+"mingw", "gcc:-mno-cygwin -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall -D_WIN32_WINNT=0x333:::MINGW32:-lwsock32 -lgdi32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN:${x86_coff_asm}:win32:cygwin-shared:-D_WINDLL -DOPENSSL_USE_APPLINK:-mno-cygwin -shared:.dll.a",
 
 # UWIN 
 "UWIN", "cc:-DTERMIOS -DL_ENDIAN -O -Wall:::UWIN::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:win32",
@@ -1133,6 +1133,7 @@ else
        $openssl_other_defines.="#define OPENSSL_NO_STATIC_ENGINE\n";
        }
 
+$cpuid_obj.=" uplink.o uplink-cof.o" if ($cflags =~ /\-DOPENSSL_USE_APPLINK/);
 # Compiler fix-ups
 if ($target =~ /icc$/)
        {

diff --git a/TABLE b/TABLE
index 70ccd7e73ef3ec9a04cfd791afe814ae57caf7fb..35b06f8d7a40e2173f5adf19c05882e6f80f5917 100644 (file)
--- a/TABLE
+++ b/TABLE
@@ -2991,7 +2991,7 @@ $rmd160_obj   = rm86-cof.o
 $rc5_obj      = r586-cof.o
 $dso_scheme   = win32
 $shared_target= cygwin-shared
-$shared_cflag = -D_WINDLL
+$shared_cflag = -D_WINDLL -DOPENSSL_USE_APPLINK
 $shared_ldflag = -mno-cygwin -shared
 $shared_extension = .dll.a
 $ranlib       = 

diff --git a/crypto/Makefile b/crypto/Makefile
index 9f309e0256b2074d2d02a483b24c21ded272e805..c6c76c26ac3553610a5950766a51f714ff15a267 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -67,6 +67,12 @@ x86cpuid-cof.s: x86cpuid.pl perlasm/x86asm.pl
 x86cpuid-out.s: x86cpuid.pl perlasm/x86asm.pl
        $(PERL) x86cpuid.pl a.out $(CFLAGS) $(PROCESSOR) > $@
 
+uplink.o:      ../ms/uplink.c
+       $(CC) $(CFLAGS) -c -o $@ ../ms/uplink.c
+
+uplink-cof.s:  ../ms/uplink.pl
+       $(PERL) ../ms/uplink.pl coff > $@
+
 x86_64cpuid.s: x86_64cpuid.pl
        $(PERL) x86_64cpuid.pl $@
 ia64cpuid.s: ia64cpuid.S

diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c
index c97ac146515d96dc6af219ef7d34844f7279cd84..dd17802f8fb18b7a7cd204ed81518ad64fd03b17 100644 (file)
--- a/crypto/bio/bss_file.c
+++ b/crypto/bio/bss_file.c
@@ -236,12 +236,17 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr)
                b->shutdown=(int)num&BIO_CLOSE;
                b->ptr=ptr;
                b->init=1;
-#if BIO_FLAGS_UPLINK!=0 && defined(_IOB_ENTRIES)
+#if BIO_FLAGS_UPLINK!=0
+#if defined(__MINGW32__) && defined(__MSVCRT__) && !defined(_IOB_ENTRIES)
+#define _IOB_ENTRIES 20
+#endif
+#if defined(_IOB_ENTRIES)
                /* Safety net to catch purely internal BIO_set_fp calls */
                if ((size_t)ptr >= (size_t)stdin &&
                    (size_t)ptr <  (size_t)(stdin+_IOB_ENTRIES))
                        BIO_clear_flags(b,BIO_FLAGS_UPLINK);
 #endif
+#endif
 #ifdef UP_fsetmode
                if (b->flags&BIO_FLAGS_UPLINK)
                        UP_fsetmode(b->ptr,num&BIO_FP_TEXT?'t':'b');

diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h
index 9711f42e225848c9f33a2e6d0362bd552c45395f..fc249c57f3793b4ed277b69c39514a3db9c97512 100644 (file)
--- a/crypto/cryptlib.h
+++ b/crypto/cryptlib.h
@@ -66,7 +66,7 @@
 
 #ifdef OPENSSL_USE_APPLINK
 #define BIO_FLAGS_UPLINK 0x8000
-#include "uplink.h"
+#include "ms/uplink.h"
 #endif
 
 #include <openssl/crypto.h>

diff --git a/ms/uplink.pl b/ms/uplink.pl
index cd9d37f56f74df5dd87f4de25cfa798e6eb4545b..5dacc4f1a1057bf1296bcb95f236a5e5a52a8eda 100755 (executable)
--- a/ms/uplink.pl
+++ b/ms/uplink.pl
@@ -44,7 +44,7 @@ print <<___;
 .align 4
 .Lazy$i:
        pushl   \$$i
-       pushl   _OPENSSL_UplinkTable
+       pushl   \$_OPENSSL_UplinkTable
        call    _OPENSSL_Uplink
        addl    \$8,%esp
        jmp     *(_OPENSSL_UplinkTable+4*$i)

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index 6334317cd7f9cdf9154482111743bbde9310b62b..5888dcbfefb1cffc19e06b8a358ec344f2bd7650 100644 (file)
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -99,23 +99,18 @@ if ($shlib)
        # Engage Applink...
        #
        $app_ex_obj.=" \$(OBJ_D)\\applink.obj /implib:\$(TMP_D)\\junk.lib";
-       $cflags.=" -DOPENSSL_USE_APPLINK";
+       $cflags.=" -DOPENSSL_USE_APPLINK -I.";
        # I'm open for better suggestions than overriding $banner...
        $banner=<<'___';
        @echo Building OpenSSL
 
 $(OBJ_D)\applink.obj:  ms\applink.c
        $(CC) /Fo$(OBJ_D)\applink.obj $(APP_CFLAGS) -c ms\applink.c
-$(OBJ_D)\uplink.obj:   ms\uplink.c $(OBJ_D)\applink.c
+$(OBJ_D)\uplink.obj:   ms\uplink.c ms\applink.c
        $(CC) /Fo$(OBJ_D)\uplink.obj $(SHLIB_CFLAGS) -c ms\uplink.c
-$(INCL_D)\uplink.h:    ms\uplink.h
-       $(CP) ms\uplink.h $(INCL_D)\uplink.h
 $(INCO_D)\applink.c:   ms\applink.c
        $(CP) ms\applink.c $(INCO_D)\applink.c
-$(OBJ_D)\applink.c:    ms\applink.c
-       $(CP) ms\applink.c $(OBJ_D)\applink.c
 
-HEADER=$(HEADER) $(INCL_D)\uplink.h
 EXHEADER= $(EXHEADER) $(INCO_D)\applink.c
 
 LIBS_DEP=$(LIBS_DEP) $(OBJ_D)\applink.obj