From d0b4271b20bf53b0649d08763995bddda8aad378 Mon Sep 17 00:00:00 2001 From: james Date: Thu, 31 Jul 2008 22:03:38 +0000 Subject: In Windows build, package a statically linked openssl.exe to work around observed instabilities in the dynamic build since the migration to OpenSSL 0.9.8h. git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@3149 e7ae566f-a301-0410-adde-c780ea21d3b5 --- install-win32/getopenssl | 2 +- install-win32/openssl/openssl098.patch | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) (limited to 'install-win32') diff --git a/install-win32/getopenssl b/install-win32/getopenssl index 118fcb3..8c78f54 100644 --- a/install-win32/getopenssl +++ b/install-win32/getopenssl @@ -7,7 +7,7 @@ if [ -d "$OPENSSL_DIR" ] ; then mkdir -p $GENOUT/lib &>/dev/null mkdir -p $GENOUT/bin &>/dev/null - for f in libeay32.dll libssl32.dll openssl.exe ; do + for f in libeay32.dll libssl32.dll out/openssl.exe ; do cp $OPENSSL_DIR/$f $GENOUT/lib if [ -z "$NO_STRIP" ]; then strip $GENOUT/lib/$f diff --git a/install-win32/openssl/openssl098.patch b/install-win32/openssl/openssl098.patch index 896ff0c..085ce94 100644 --- a/install-win32/openssl/openssl098.patch +++ b/install-win32/openssl/openssl098.patch @@ -54,14 +54,3 @@ diff -urw tmp/openssl-0.9.8h/ms/mw.bat openssl-0.9.8h/ms/mw.bat if errorlevel 1 goto end @rem Generate the DLLs and input libraries -@@ -20,7 +26,9 @@ - dllwrap --dllname libssl32.dll --output-lib out/libssl32.a --def ms/ssleay32.def out/libssl.a out/libeay32.a - if errorlevel 1 goto end - -+@rem JY added openssl.exe linked to DLL -+gcc -o openssl tmp\verify.o tmp\asn1pars.o tmp\req.o tmp\dgst.o tmp\dh.o tmp\dhparam.o tmp\enc.o tmp\passwd.o tmp\gendh.o tmp\errstr.o tmp\ca.o tmp\pkcs7.o tmp\crl2p7.o tmp\crl.o tmp\rsa.o tmp\rsautl.o tmp\dsa.o tmp\dsaparam.o tmp\x509.o tmp\genrsa.o tmp\gendsa.o tmp\s_server.o tmp\s_client.o tmp\speed.o tmp\s_time.o tmp\apps.o tmp\s_cb.o tmp\s_socket.o tmp\app_rand.o tmp\version.o tmp\sess_id.o tmp\ciphers.o tmp\nseq.o tmp\pkcs12.o tmp\pkcs8.o tmp\spkac.o tmp\smime.o tmp\rand.o tmp\engine.o tmp\ocsp.o tmp\prime.o tmp\openssl.o -leay32 -lssl32 -L. -lwsock32 -lgdi32 -+ - echo Done compiling OpenSSL - - :end -- -- cgit