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

diff --git a/ChangeLog b/ChangeLog
index cc7f8658d51451e0d5ecf33a9e30967050def172..9f1b9e4a7822f040d94f0269cce8fc7cc6cb88ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,10 @@ $Id$
   user-defined scripts has been completely revamped in favor
   of execve() on unix and CreateProcess() on Windows.
 
+* 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.
+
 2008.06.11 -- Version 2.1_rc8
 
 * Added client authentication and packet filtering capability

diff --git a/easy-rsa/Windows/vars.bat.sample b/easy-rsa/Windows/vars.bat.sample
index 8ab65e1f67e2eb57ebe4ede25d9199231fd7f0dd..3c4b607a7fdd37ea0b48aaa1b06742b0decb87b7 100644 (file)
--- a/easy-rsa/Windows/vars.bat.sample
+++ b/easy-rsa/Windows/vars.bat.sample
@@ -31,5 +31,5 @@ rem Don't leave any of these parms blank.
 set KEY_COUNTRY=US
 set KEY_PROVINCE=CA
 set KEY_CITY=SanFrancisco
-set KEY_ORG=FortFunston
+set KEY_ORG=OpenVPN
 set KEY_EMAIL=mail@host.domain

diff --git a/install-win32/getopenssl b/install-win32/getopenssl
index 118fcb386506f61359cacd0acdbc814ebd2d5349..8c78f54a51d42de1fad5e2b02566bcabc108071f 100644 (file)
--- 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 896ff0cb21571e6a0546ff2020f0f2376f21173d..085ce94e5ca06fe2cef10d1619fef2110e50185e 100644 (file)
--- 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\r
  \r
  @rem Generate the DLLs and input libraries\r
-@@ -20,7 +26,9 @@
- dllwrap --dllname libssl32.dll --output-lib out/libssl32.a --def ms/ssleay32.def out/libssl.a out/libeay32.a\r
- if errorlevel 1 goto end\r
- \r
-+@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\r
- \r
- :end\r
--\r