mxe-octave: src/msvc-openssl-1.patch annotate

annotate src/msvc-openssl-1.patch @ 3725:2acaa9943159

qscintilla: update 2.8.4 * src/qscintilla.mk: update to version and checksum for 2.8.4

author	John Donoghue
date	Mon, 20 Oct 2014 11:01:00 -0400
parents	45018a221c4a
children

rev	line source
3299 45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	1 diff -ur openssl-1.0.1e-orig/Configure openssl-1.0.1e/Configure
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	2 --- openssl-1.0.1e-orig/Configure 2013-02-11 10:26:04 -0500
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	3 +++ openssl-1.0.1e/Configure 2013-11-09 12:34:55 -0500
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	4 @@ -534,6 +534,7 @@
3113 1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	5
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	6 # MinGW
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	7 "mingw", "gcc:-mno-cygwin -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -fomit-frame-pointer -O3 -march=i486 -Wall::-D_MT:MINGW32:-lws2_32 -lgdi32 -lcrypt32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN:${x86_asm}:coff:win32:cygwin-shared:-D_WINDLL -DOPENSSL_USE_APPLINK:-mno-cygwin:.dll.a",
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	8 +"msvc", "clgcc:-DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DOPENSSL_SYSNAME_WIN32 -O2 -Wall::-D_MT:MINGW32:-lws2_32 -lgdi32 -lcrypt32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN:${x86_asm}:coff:win32:cygwin-shared:-D_WINDLL -DOPENSSL_USE_APPLINK::.lib",
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	9 # As for OPENSSL_USE_APPLINK. Applink makes it possible to use .dll
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	10 # compiled with one compiler with application compiled with another
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	11 # compiler. It's possible to engage Applink support in mingw64 build,
3299 45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	12 @@ -1122,7 +1123,7 @@
3113 1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	13
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	14 my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds;
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	15
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	16 -$exe_ext=".exe" if ($target eq "Cygwin" \|\| $target eq "DJGPP" \|\| $target =~ /^mingw/);
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	17 +$exe_ext=".exe" if ($target eq "Cygwin" \|\| $target eq "DJGPP" \|\| $target =~ /^mingw/ \|\| $target =~ /^msvc/);
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	18 $exe_ext=".nlm" if ($target =~ /netware/);
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	19 $exe_ext=".pm" if ($target =~ /vos/);
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	20 $openssldir="/usr/local/ssl" if ($openssldir eq "" and $prefix eq "");
3299 45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	21 @@ -1177,6 +1178,7 @@
3113 1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	22 my $shared_cflag = $fields[$idx_shared_cflag];
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	23 my $shared_ldflag = $fields[$idx_shared_ldflag];
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	24 my $shared_extension = $fields[$idx_shared_extension];
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	25 +my $shared_prefix = "lib";
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	26 my $ranlib = $ENV{'RANLIB'} \|\| $fields[$idx_ranlib];
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	27 my $ar = $ENV{'AR'} \|\| "ar";
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	28 my $arflags = $fields[$idx_arflags];
3299 45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	29 @@ -1203,6 +1205,11 @@
3113 1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	30 $shared_ldflag =~ s/\-mno\-cygwin\s*//;
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	31 }
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	32
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	33 +if ($target =~ /^msvc/)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	34 + {
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	35 + $shared_prefix = "";
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	36 + }
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	37 +
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	38 my $no_shared_warn=0;
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	39 my $no_user_cflags=0;
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	40
3299 45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	41 @@ -1603,6 +1610,7 @@
3113 1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	42 s/^SHLIB_MAJOR=.*/SHLIB_MAJOR=$shlib_major/;
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	43 s/^SHLIB_MINOR=.*/SHLIB_MINOR=$shlib_minor/;
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	44 s/^SHLIB_EXT=.*/SHLIB_EXT=$shared_extension/;
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	45 + s/^SHLIB_PRE=.*/SHLIB_PRE=$shared_prefix/;
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	46 s/^INSTALLTOP=.*$/INSTALLTOP=$prefix/;
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	47 s/^MULTILIB=.*$/MULTILIB=$multilib/;
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	48 s/^OPENSSLDIR=.*$/OPENSSLDIR=$openssldir/;
3299 45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	49 @@ -1808,6 +1816,12 @@
3113 1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	50 $foo =~ s/\\/\\\\/g;
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	51 print OUT "#define ENGINESDIR \"$foo\"\n";
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	52 }
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	53 + elsif (/^#define\s+OPENSSLROOT/)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	54 + {
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	55 + my $foo = "$prefix";
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	56 + $foo =~ s/\\/\\\\/g;
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	57 + print OUT "#define OPENSSLROOT \"$foo\"\n";
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	58 + }
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	59 elsif (/^#((define)\|(undef))\s+OPENSSL_EXPORT_VAR_AS_FUNCTION/)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	60 { printf OUT "#undef OPENSSL_EXPORT_VAR_AS_FUNCTION\n"
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	61 if $export_var_as_fn;
3299 45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	62 diff -ur openssl-1.0.1e-orig/Makefile.org openssl-1.0.1e/Makefile.org
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	63 --- openssl-1.0.1e-orig/Makefile.org 2013-02-11 10:26:04 -0500
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	64 +++ openssl-1.0.1e/Makefile.org 2013-11-09 12:34:55 -0500
3113 1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	65 @@ -10,6 +10,7 @@
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	66 SHLIB_MAJOR=
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	67 SHLIB_MINOR=
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	68 SHLIB_EXT=
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	69 +SHLIB_PRE=lib
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	70 PLATFORM=dist
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	71 OPTIONS=
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	72 CONFIGURE_ARGS=
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	73 @@ -170,8 +171,8 @@
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	74 EDIRS= times doc bugs util include certs ms shlib mt demos perl sf dep VMS
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	75 WDIRS= windows
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	76 LIBS= libcrypto.a libssl.a
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	77 -SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	78 -SHARED_SSL=libssl$(SHLIB_EXT)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	79 +SHARED_CRYPTO=$(SHLIB_PRE)crypto$(SHLIB_EXT)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	80 +SHARED_SSL=$(SHLIB_PRE)ssl$(SHLIB_EXT)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	81 SHARED_LIBS=
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	82 SHARED_LIBS_LINK_EXTS=
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	83 SHARED_LDFLAGS=
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	84 @@ -204,7 +205,7 @@
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	85
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	86 BUILDENV= PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	87 CC='$(CC)' CFLAG='$(CFLAG)' \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	88 - AS='$(CC)' ASFLAG='$(CFLAG) -c' \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	89 + AS='$(AS)' ASFLAG='$(CFLAG) -c' \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	90 AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)' \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	91 CROSS_COMPILE='$(CROSS_COMPILE)' \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	92 PERL='$(PERL)' ENGDIRS='$(ENGDIRS)' \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	93 @@ -219,7 +220,7 @@
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	94 KRB5_INCLUDES='$(KRB5_INCLUDES)' LIBKRB5='$(LIBKRB5)' \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	95 ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)' \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	96 EXE_EXT='$(EXE_EXT)' SHARED_LIBS='$(SHARED_LIBS)' \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	97 - SHLIB_EXT='$(SHLIB_EXT)' SHLIB_TARGET='$(SHLIB_TARGET)' \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	98 + SHLIB_PRE='$(SHLIB_PRE)' SHLIB_EXT='$(SHLIB_EXT)' SHLIB_TARGET='$(SHLIB_TARGET)' \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	99 PEX_LIBS='$(PEX_LIBS)' EX_LIBS='$(EX_LIBS)' \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	100 CPUID_OBJ='$(CPUID_OBJ)' \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	101 BN_ASM='$(BN_ASM)' DES_ENC='$(DES_ENC)' \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	102 @@ -295,7 +296,7 @@
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	103 $(FIPSLIBDIR)fips_premain.c $(FIPSLIBDIR)fipscanister.o \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	104 libcrypto.a $(EX_LIBS)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	105
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	106 -libcrypto$(SHLIB_EXT): libcrypto.a fips_premain_dso$(EXE_EXT)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	107 +$(SHLIB_PRE)crypto$(SHLIB_EXT): libcrypto.a fips_premain_dso$(EXE_EXT)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	108 @if [ "$(SHLIB_TARGET)" != "" ]; then \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	109 if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	110 FIPSLD_LIBCRYPTO=libcrypto.a ; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	111 @@ -308,7 +309,7 @@
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	112 exit 1; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	113 fi
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	114
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	115 -libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	116 +$(SHLIB_PRE)ssl$(SHLIB_EXT): $(SHLIB_PRE)crypto$(SHLIB_EXT) libssl.a
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	117 @if [ "$(SHLIB_TARGET)" != "" ]; then \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	118 $(MAKE) SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	119 else \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	120 @@ -324,7 +325,7 @@
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	121 ( set -x; rm -f lib$$i$$j ); \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	122 done; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	123 fi; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	124 - ( set -x; rm -f lib$$i$(SHLIB_EXT) ); \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	125 + ( set -x; rm -f $(SHLIB_PRE)$$i$(SHLIB_EXT) ); \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	126 if [ "$(PLATFORM)" = "Cygwin" ]; then \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	127 ( set -x; rm -f cyg$$i$(SHLIB_EXT) lib$$i$(SHLIB_EXT).a ); \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	128 fi; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	129 @@ -583,16 +584,21 @@
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	130 chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	131 mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	132 fi ); \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	133 - if expr $(PLATFORM) : 'mingw' > /dev/null; then \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	134 - ( case $$i in \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	135 - crypto) i=libeay32.dll;; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	136 - ssl) i=ssleay32.dll;; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	137 + case $(PLATFORM) in \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	138 + mingw \| msvc) \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	139 + ( \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	140 + case $$i in \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	141 + crypto) i=@LIBRARY_PREFIX@crypto32@LIBRARY_SUFFIX@.dll;; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	142 + ssl) i=@LIBRARY_PREFIX@ssl32@LIBRARY_SUFFIX@.dll;; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	143 esac; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	144 echo installing $$i; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	145 cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	146 chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	147 - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i ); \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	148 - fi; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	149 + mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	150 + $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	151 + ); \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	152 + ;; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	153 + esac; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	154 fi; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	155 done; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	156 ( here="`pwd`"; \
3299 45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	157 diff -ur openssl-1.0.1e-orig/Makefile.shared openssl-1.0.1e/Makefile.shared
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	158 --- openssl-1.0.1e-orig/Makefile.shared 2013-02-11 10:26:04 -0500
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	159 +++ openssl-1.0.1e/Makefile.shared 2013-11-09 12:34:55 -0500
3113 1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	160 @@ -261,13 +261,15 @@
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	161 SHLIB=cyg$(LIBNAME); \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	162 base=-Wl,--enable-auto-image-base; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	163 deffile=; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	164 - if expr $(PLATFORM) : 'mingw' > /dev/null; then \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	165 - SHLIB=$(LIBNAME)eay32; base=; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	166 + case $(PLATFORM) in \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	167 + mingw \| msvc) \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	168 + SHLIB=@LIBRARY_PREFIX@$(LIBNAME)32; base=; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	169 if test -f $(LIBNAME)eay32.def; then \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	170 deffile=$(LIBNAME)eay32.def; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	171 fi; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	172 - fi; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	173 - SHLIB_SUFFIX=.dll; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	174 + ;; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	175 + esac; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	176 + SHLIB_SUFFIX=@LIBRARY_SUFFIX@.dll; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	177 LIBVERSION="$(LIBVERSION)"; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	178 SHLIB_SOVER=${LIBVERSION:+"-$(LIBVERSION)"}; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	179 ALLSYMSFLAGS='-Wl,--whole-archive'; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	180 @@ -278,26 +280,28 @@
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	181 link_a.cygwin:
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	182 @ $(CALC_VERSIONS); \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	183 INHIBIT_SYMLINKS=yes; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	184 - SHLIB=cyg$(LIBNAME); SHLIB_SOVER=-$(LIBVERSION); SHLIB_SUFFIX=.dll; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	185 + SHLIB=cyg$(LIBNAME); SHLIB_SOVER=-$(LIBVERSION); SHLIB_SUFFIX=@LIBRARY_SUFFIX@.dll; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	186 dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; extras=; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	187 base=-Wl,--enable-auto-image-base; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	188 - if expr $(PLATFORM) : 'mingw' > /dev/null; then \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	189 + case $(PLATFORM) in \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	190 + mingw \| msvc) \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	191 case $(LIBNAME) in \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	192 - crypto) SHLIB=libeay;; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	193 - ssl) SHLIB=ssleay;; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	194 + crypto) SHLIB=@LIBRARY_PREFIX@crypto;; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	195 + ssl) SHLIB=@LIBRARY_PREFIX@ssl;; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	196 esac; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	197 SHLIB_SOVER=32; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	198 extras="$(LIBNAME).def"; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	199 - $(PERL) util/mkdef.pl 32 $$SHLIB > $$extras; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	200 + $(PERL) util/mkdef.pl 32 $(LIBNAME) > $$extras; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	201 base=; [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x63000000; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	202 - fi; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	203 + ;; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	204 + esac; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	205 dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	206 $(PERL) util/mkrc.pl $$dll_name \| \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	207 $(CROSS_COMPILE)windres -o rc.o; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	208 extras="$$extras rc.o"; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	209 ALLSYMSFLAGS='-Wl,--whole-archive'; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	210 NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	211 - SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-s,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a $$extras"; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	212 + SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-s,-Bsymbolic -Wl,--out-implib,$(SHLIB_PRE)$(LIBNAME)$(SHLIB_EXT) $$extras"; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	213 [ -f apps/$$dll_name ] && rm apps/$$dll_name; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	214 [ -f test/$$dll_name ] && rm test/$$dll_name; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	215 $(LINK_SO_A) \|\| exit 1; \
3299 45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	216 diff -ur openssl-1.0.1e-orig/crypto/Makefile openssl-1.0.1e/crypto/Makefile
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	217 --- openssl-1.0.1e-orig/crypto/Makefile 2013-02-11 10:26:04 -0500
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	218 +++ openssl-1.0.1e/crypto/Makefile 2013-11-09 12:34:55 -0500
3113 1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	219 @@ -33,7 +33,7 @@
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	220 GENERAL=Makefile README crypto-lib.com install.com
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	221
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	222 LIB= $(TOP)/libcrypto.a
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	223 -SHARED_LIB= libcrypto$(SHLIB_EXT)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	224 +SHARED_LIB= $(SHLIB_PRE)crypto$(SHLIB_EXT)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	225 LIBSRC= cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c cpt_err.c \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	226 ebcdic.c uid.c o_time.c o_str.c o_dir.c o_fips.c o_init.c fips_ers.c
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	227 LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o cpt_err.o ebcdic.o \
3299 45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	228 diff -ur openssl-1.0.1e-orig/crypto/cryptlib.c openssl-1.0.1e/crypto/cryptlib.c
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	229 --- openssl-1.0.1e-orig/crypto/cryptlib.c 2013-02-11 10:26:04 -0500
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	230 +++ openssl-1.0.1e/crypto/cryptlib.c 2013-11-09 13:25:02 -0500
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	231 @@ -926,6 +926,84 @@
3113 1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	232
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	233 void *OPENSSL_stderr(void) { return stderr; }
3299 45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	234
3113 1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	235 +#ifdef _MSC_VER
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	236 +char* OPENSSL_relocate(const char* path)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	237 +{
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	238 + static char* openssl_root = NULL;
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	239 + static size_t openssl_root_len = 0;
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	240 +
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	241 + if (path == NULL)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	242 + return path;
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	243 +
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	244 + if (openssl_root == NULL)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	245 + {
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	246 + HMODULE hMod;
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	247 +
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	248 + if (GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS,
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	249 + (LPCTSTR)OPENSSL_relocate,
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	250 + &hMod))
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	251 + {
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	252 + DWORD len = 256, rlen;
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	253 +
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	254 + while (1)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	255 + {
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	256 + openssl_root = (char*)OPENSSL_realloc(openssl_root, len);
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	257 + if (openssl_root == NULL)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	258 + {
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	259 + OPENSSL_showfatal("Unable to allocate internal buffer");
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	260 + break;
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	261 + }
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	262 + rlen = GetModuleFileName(hMod, openssl_root, len);
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	263 + if (rlen == 0)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	264 + OPENSSL_showfatal("Unable to retrieve OpenSSL module file name");
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	265 + else if (rlen < len)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	266 + {
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	267 + char* p;
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	268 +
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	269 + p = strrchr(openssl_root, '\\');
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	270 + if (p != NULL)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	271 + {
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	272 + *p = '\0';
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	273 + rlen = strlen(openssl_root);
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	274 + }
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	275 +
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	276 + if (rlen >= 4 && strcmp(openssl_root+rlen-4, "\\bin") == 0)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	277 + {
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	278 + openssl_root[rlen-4] = '\0';
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	279 + rlen -= 4;
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	280 + }
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	281 + openssl_root_len = rlen;
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	282 +
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	283 + /* Convert to forward slashes */
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	284 + for (p = openssl_root; *p; ++p)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	285 + if (*p == '\\')
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	286 + *p = '/';
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	287 +
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	288 + break;
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	289 + }
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	290 + else
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	291 + len *= 2;
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	292 + }
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	293 + }
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	294 + else
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	295 + OPENSSL_showfatal("Unable to get OpenSSL module handle");
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	296 + }
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	297 +
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	298 + if (strncmp(path, OPENSSLROOT, sizeof(OPENSSLROOT)-1) == 0)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	299 + {
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	300 + size_t plen = openssl_root_len + strlen(path) - sizeof(OPENSSLROOT) + 2;
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	301 + char* new_path = (char*)OPENSSL_malloc(plen);
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	302 +
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	303 + BUF_strlcpy(new_path, openssl_root, plen);
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	304 + BUF_strlcat(new_path, path + sizeof(OPENSSLROOT) - 1, plen);
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	305 +
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	306 + return new_path;
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	307 + }
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	308 + else
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	309 + return OPENSSL_strdup(path);
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	310 +}
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	311 +#endif
3299 45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	312 +
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	313 int CRYPTO_memcmp(const void in_a, const void in_b, size_t len)
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	314 {
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	315 size_t i;
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	316 diff -ur openssl-1.0.1e-orig/crypto/cryptlib.h openssl-1.0.1e/crypto/cryptlib.h
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	317 --- openssl-1.0.1e-orig/crypto/cryptlib.h 2013-02-11 10:26:04 -0500
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	318 +++ openssl-1.0.1e/crypto/cryptlib.h 2013-11-09 12:34:55 -0500
3113 1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	319 @@ -103,6 +103,9 @@
3299 45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	320 void OPENSSL_showfatal(const char *fmta,...);
3113 1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	321 void *OPENSSL_stderr(void);
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	322 extern int OPENSSL_NONPIC_relocated;
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	323 +#ifdef _MSC_VER
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	324 +extern char* OPENSSL_relocate(const char* path);
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	325 +#endif
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	326
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	327 #ifdef __cplusplus
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	328 }
3299 45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	329 diff -ur openssl-1.0.1e-orig/crypto/dso/dso_win32.c openssl-1.0.1e/crypto/dso/dso_win32.c
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	330 --- openssl-1.0.1e-orig/crypto/dso/dso_win32.c 2013-02-11 10:26:04 -0500
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	331 +++ openssl-1.0.1e/crypto/dso/dso_win32.c 2013-11-09 12:34:55 -0500
3113 1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	332 @@ -638,7 +638,9 @@
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	333 (strstr(filename, ":") == NULL));
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	334 if(transform)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	335 /* We will convert this to "%s.dll" */
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	336 - translated = OPENSSL_malloc(len + 5);
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	337 + translated = OPENSSL_malloc(len + 5 +
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	338 + strlen("@LIBRARY_PREFIX@") +
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	339 + strlen("32@LIBRARY_SUFFIX@"));
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	340 else
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	341 /* We will simply duplicate filename */
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	342 translated = OPENSSL_malloc(len + 1);
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	343 @@ -649,7 +651,7 @@
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	344 return(NULL);
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	345 }
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	346 if(transform)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	347 - sprintf(translated, "%s.dll", filename);
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	348 + sprintf(translated, "%s%s%s.dll", "@LIBRARY_PREFIX@", filename, "32@LIBRARY_SUFFIX@");
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	349 else
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	350 sprintf(translated, "%s", filename);
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	351 return(translated);
3299 45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	352 diff -ur openssl-1.0.1e-orig/crypto/engine/eng_list.c openssl-1.0.1e/crypto/engine/eng_list.c
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	353 --- openssl-1.0.1e-orig/crypto/engine/eng_list.c 2013-02-11 10:26:04 -0500
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	354 +++ openssl-1.0.1e/crypto/engine/eng_list.c 2013-11-09 12:34:55 -0500
3113 1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	355 @@ -401,8 +401,12 @@
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	356 #ifdef OPENSSL_SYS_VMS
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	357 if((load_dir = getenv("OPENSSL_ENGINES")) == 0) load_dir = "SSLROOT:[ENGINES]";
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	358 #else
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	359 +#ifdef _MSC_VER
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	360 + if((load_dir = getenv("OPENSSL_ENGINES")) == 0) load_dir = OPENSSL_relocate(ENGINESDIR);
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	361 +#else
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	362 if((load_dir = getenv("OPENSSL_ENGINES")) == 0) load_dir = ENGINESDIR;
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	363 #endif
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	364 +#endif
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	365 iterator = ENGINE_by_id("dynamic");
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	366 if(!iterator \|\| !ENGINE_ctrl_cmd_string(iterator, "ID", id, 0) \|\|
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	367 !ENGINE_ctrl_cmd_string(iterator, "DIR_LOAD", "2", 0) \|\|
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	368 @@ -410,9 +414,15 @@
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	369 load_dir, 0) \|\|
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	370 !ENGINE_ctrl_cmd_string(iterator, "LOAD", NULL, 0))
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	371 goto notfound;
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	372 +#ifdef _MSC_VER
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	373 + if (load_dir != NULL) OPENSSL_free(load_dir);
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	374 +#endif
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	375 return iterator;
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	376 }
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	377 notfound:
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	378 +#ifdef _MSC_VER
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	379 + if (load_dir != NULL) OPENSSL_free(load_dir);
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	380 +#endif
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	381 ENGINE_free(iterator);
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	382 ENGINEerr(ENGINE_F_ENGINE_BY_ID,ENGINE_R_NO_SUCH_ENGINE);
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	383 ERR_add_error_data(2, "id=", id);
3299 45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	384 diff -ur openssl-1.0.1e-orig/crypto/opensslconf.h.in openssl-1.0.1e/crypto/opensslconf.h.in
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	385 --- openssl-1.0.1e-orig/crypto/opensslconf.h.in 2013-02-11 10:26:04 -0500
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	386 +++ openssl-1.0.1e/crypto/opensslconf.h.in 2013-11-09 12:34:55 -0500
3113 1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	387 @@ -5,6 +5,7 @@
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	388
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	389 #if !(defined(VMS) \|\| defined(__VMS)) /* VMS uses logical names instead */
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	390 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	391 +#define OPENSSLROOT "/usr/local"
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	392 #define ENGINESDIR "/usr/local/lib/engines"
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	393 #define OPENSSLDIR "/usr/local/ssl"
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	394 #endif
3299 45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	395 diff -ur openssl-1.0.1e-orig/crypto/x509/x509_def.c openssl-1.0.1e/crypto/x509/x509_def.c
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	396 --- openssl-1.0.1e-orig/crypto/x509/x509_def.c 2013-02-11 10:02:48 -0500
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	397 +++ openssl-1.0.1e/crypto/x509/x509_def.c 2013-11-09 12:34:55 -0500
3113 1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	398 @@ -61,21 +61,31 @@
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	399 #include <openssl/crypto.h>
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	400 #include <openssl/x509.h>
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	401
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	402 +#ifdef _MSC_VER
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	403 +#define X509_GET_DEFAULT_PATH(p) \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	404 +static char* __internal__ = NULL; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	405 +if (__internal__ == NULL) \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	406 + __internal__ = OPENSSL_relocate(p); \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	407 +return __internal__
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	408 +#else
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	409 +#define X509_GET_DEFAULT_PATH(p) return(p)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	410 +#endif
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	411 +
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	412 const char *X509_get_default_private_dir(void)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	413 - { return(X509_PRIVATE_DIR); }
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	414 -
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	415 + { X509_GET_DEFAULT_PATH(X509_PRIVATE_DIR); }
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	416 +
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	417 const char *X509_get_default_cert_area(void)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	418 - { return(X509_CERT_AREA); }
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	419 + { X509_GET_DEFAULT_PATH(X509_CERT_AREA); }
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	420
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	421 const char *X509_get_default_cert_dir(void)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	422 - { return(X509_CERT_DIR); }
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	423 + { X509_GET_DEFAULT_PATH(X509_CERT_DIR); }
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	424
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	425 const char *X509_get_default_cert_file(void)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	426 - { return(X509_CERT_FILE); }
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	427 + { X509_GET_DEFAULT_PATH(X509_CERT_FILE); }
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	428
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	429 const char *X509_get_default_cert_dir_env(void)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	430 - { return(X509_CERT_DIR_EVP); }
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	431 + { X509_GET_DEFAULT_PATH(X509_CERT_DIR_EVP); }
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	432
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	433 const char *X509_get_default_cert_file_env(void)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	434 - { return(X509_CERT_FILE_EVP); }
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	435 + { X509_GET_DEFAULT_PATH(X509_CERT_FILE_EVP); }
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	436
3299 45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	437 diff -ur openssl-1.0.1e-orig/engines/Makefile openssl-1.0.1e/engines/Makefile
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	438 --- openssl-1.0.1e-orig/engines/Makefile 2013-02-11 10:26:04 -0500
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	439 +++ openssl-1.0.1e/engines/Makefile 2013-11-09 12:34:56 -0500
3113 1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	440 @@ -116,7 +116,7 @@
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	441 DSO_BEOS) sfx=".so";; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	442 DSO_DLFCN) sfx=`expr "$(SHLIB_EXT)" : '.$\.[a-z][a-z]$' \\| ".so"`;; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	443 DSO_DL) sfx=".sl";; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	444 - DSO_WIN32) sfx="eay32.dll"; pfx=;; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	445 + DSO_WIN32) sfx="32@LIBRARY_SUFFIX@.dll"; pfx="@LIBRARY_PREFIX@";; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	446 *) sfx=".bad";; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	447 esac; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	448 cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
3299 45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	449 diff -ur openssl-1.0.1e-orig/engines/ccgost/Makefile openssl-1.0.1e/engines/ccgost/Makefile
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	450 --- openssl-1.0.1e-orig/engines/ccgost/Makefile 2013-11-09 12:34:06 -0500
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	451 +++ openssl-1.0.1e/engines/ccgost/Makefile 2013-11-09 12:34:56 -0500
3113 1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	452 @@ -50,7 +50,7 @@
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	453 DSO_BEOS) sfx=".so";; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	454 DSO_DLFCN) sfx=`expr "$(SHLIB_EXT)" : '.$\.[a-z][a-z]$' \\| ".so"`;; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	455 DSO_DL) sfx=".sl";; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	456 - DSO_WIN32) sfx="eay32.dll"; pfx=;; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	457 + DSO_WIN32) sfx="32@LIBRARY_SUFFIX@.dll"; pfx="@LIBRARY_PREFIX@";; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	458 *) sfx=".bad";; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	459 esac; \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	460 cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
3299 45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	461 diff -ur openssl-1.0.1e-orig/ssl/Makefile openssl-1.0.1e/ssl/Makefile
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	462 --- openssl-1.0.1e-orig/ssl/Makefile 2013-02-11 10:26:04 -0500
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	463 +++ openssl-1.0.1e/ssl/Makefile 2013-11-09 12:34:56 -0500
3113 1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	464 @@ -19,7 +19,7 @@
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	465 APPS=
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	466
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	467 LIB=$(TOP)/libssl.a
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	468 -SHARED_LIB= libssl$(SHLIB_EXT)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	469 +SHARED_LIB= $(SHLIB_PRE)ssl$(SHLIB_EXT)
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	470 LIBSRC= \
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	471 s2_meth.c s2_srvr.c s2_clnt.c s2_lib.c s2_enc.c s2_pkt.c \
3299 45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	472 s3_meth.c s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c s3_pkt.c s3_both.c s3_cbc.c \
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	473 diff -ur openssl-1.0.1e-orig/util/mkdef.pl openssl-1.0.1e/util/mkdef.pl
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	474 --- openssl-1.0.1e-orig/util/mkdef.pl 2013-02-11 10:26:04 -0500
45018a221c4a [MSVC] Update openssl patch to newer version. Michael Goffioul <michael.goffioul@gmail.com> parents: 3113 diff changeset	475 +++ openssl-1.0.1e/util/mkdef.pl 2013-11-09 12:34:56 -0500
3113 1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	476 @@ -1306,7 +1306,7 @@
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	477 ; Definition file for the DLL version of the $name library from OpenSSL
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	478 ;
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	479
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	480 -LIBRARY $libname $liboptions
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	481 +LIBRARY @LIBRARY_PREFIX@$libname@LIBRARY_SUFFIX@ $liboptions
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	482
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	483 EOF
1fbdd34dd2ef [MSVC] enable OpenSSL compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	484

Mercurial > mxe-octave

annotate src/msvc-openssl-1.patch @ 3725:2acaa9943159