For Windows build, updated OpenSSL to 0.9.7l.

Added small OpenSSL patch to be applied
prior to Windows build.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@1328 e7ae566f-a301-0410-adde-c780ea21d3b5

4 files changed, 47 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 8207bbc..397d7cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,10 @@ Copyright (C) 2002-2005 OpenVPN Solutions LLC <info@openvpn.net>
 
 $Id$
 
-2006.09.xx -- Version 2.1-beta16
+2006.10.01 -- Version 2.1-beta16
+
+* Windows installer updated with OpenSSL 0.9.7l DLLs to fix
+  published vulnerabilities.
 
 * Fixed TAP-Win32 bug that caused BSOD on Windows Vista
   (Henry Nestler).
diff --git a/install-win32/openssl.bat b/install-win32/openssl.bat
deleted file mode 100755
index 9ea478c..0000000
--- a/install-win32/openssl.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-REM Build openssl.exe with DLL linkage to OpenSSL library
-REM Run this script from top level of OpenSSL source tree
-REM eg.: copy y:\openvpn\21\openvpn\install-win32\openssl.bat go.bat
-
-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
diff --git a/install-win32/openssl.patch b/install-win32/openssl.patch
new file mode 100644
index 0000000..16ba7c8
--- /dev/null
+++ b/install-win32/openssl.patch
@@ -0,0 +1,42 @@
+diff -wur /y/openssl/openssl-0.9.7l/ms/mw.bat openssl-0.9.7l-modified/ms/mw.bat
+--- /y/openssl/openssl-0.9.7l/ms/mw.bat	Sat Feb 22 10:02:45 2003
++++ openssl-0.9.7l-modified/ms/mw.bat	Sun Oct  1 04:24:02 2006
+@@ -11,7 +11,9 @@
+ if errorlevel 1 goto end

+ 

+ @rem Build the libraries

+-make -f ms/mingw32.mak

++
++@rem JY added --win32 flag
++make --win32 -f ms/mingw32.mak
+ if errorlevel 1 goto end

+ 

+ @rem Generate the DLLs and input libraries

+@@ -20,6 +22,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

+diff -wur /y/openssl/openssl-0.9.7l/util/pl/Mingw32.pl openssl-0.9.7l-modified/util/pl/Mingw32.pl
+--- /y/openssl/openssl-0.9.7l/util/pl/Mingw32.pl	Sun May 16 22:28:31 2004
++++ openssl-0.9.7l-modified/util/pl/Mingw32.pl	Sun Oct  1 04:54:04 2006
+@@ -99,10 +99,10 @@
+ 	$n=&bname($target);
+ 	$ret.="$target: $files $dep_libs\n";
+ 	$ret.="\t\$(LINK) ${efile}$target \$(LFLAGS) $files $libs\n";
+-	if (defined $sha1file)
+-		{
+-		$ret.="\t$openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file";
+-		}
++#	if (defined $sha1file)
++#		{
++#		$ret.="\t$openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file";
++#		}
+ 	$ret.="\n";
+ 	return($ret);
+ 	}
diff --git a/install-win32/prebuild b/install-win32/prebuild
index 6ee2c8a..62050d2 100755
--- a/install-win32/prebuild
+++ b/install-win32/prebuild
@@ -18,7 +18,7 @@ OUT=$H/21
 IN=/y/openvpn/21/openvpn
 
 # Already built OpenSSL tree.
-SSL=$H/openssl-0.9.7k
+SSL=$H/openssl-0.9.7l
 
 # Already built LZO tree.
 LZO=$H/lzo-2.02