diff options
| -rw-r--r-- | config-win32.h.in | 5 | ||||
| -rwxr-xr-x | install-win32/openssl.bat | 2 | ||||
| -rwxr-xr-x | install-win32/prebuild | 6 | ||||
| -rwxr-xr-x | makefile.w32 | 6 |
4 files changed, 11 insertions, 8 deletions
diff --git a/config-win32.h.in b/config-win32.h.in index ab036f1..3ea4d85 100644 --- a/config-win32.h.in +++ b/config-win32.h.in @@ -264,7 +264,10 @@ typedef unsigned long in_addr_t; #define USE_LZO 1 /* LZO version number */ -#define LZO_VERSION_NUM "1" +#define LZO_VERSION_NUM "2" + +/* Use lzo/ directory prefix for LZO header files (for LZO 2.0) */ +#define LZO_HEADER_DIR 1 /* Use OpenSSL SSL library */ #define USE_SSL 1 diff --git a/install-win32/openssl.bat b/install-win32/openssl.bat index c3492e0..9ea478c 100755 --- a/install-win32/openssl.bat +++ b/install-win32/openssl.bat @@ -1,5 +1,5 @@ REM Build openssl.exe with DLL linkage to OpenSSL library REM Run this script from top level of OpenSSL source tree -REM eg.: cp /y/openvpn/20/openvpn/install-win32/openssl.bat . +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/prebuild b/install-win32/prebuild index 0112111..d646684 100755 --- a/install-win32/prebuild +++ b/install-win32/prebuild @@ -18,10 +18,10 @@ OUT=$H/21 IN=/y/openvpn/21/openvpn # Already built OpenSSL tree. -SSL=$H/openssl-0.9.7g +SSL=$H/openssl-0.9.7i # Already built LZO tree. -LZO=$H/lzo-1.08 +LZO=$H/lzo-2.02 # Already built dmalloc tree. # Optional, but leave defined even if you are not using @@ -30,7 +30,7 @@ DMALLOC=$H/dmalloc-5.4.2 # TAP binaries should be here: tap0801.sys and tapinstall.exe # These must be built with MS DDK. -TAPBIN=$I3 +TAPBIN=$H/tapbin-21 # u2d.c should exist here. SCRIPTS=$IN/install-win32 diff --git a/makefile.w32 b/makefile.w32 index 48cc3f1..4184504 100755 --- a/makefile.w32 +++ b/makefile.w32 @@ -35,8 +35,8 @@ # Change these to point to your OpenSSL, LZO, and # (optionally) dmalloc top-level directories. -OPENSSL = /c/src/openssl-0.9.7g -LZO = /c/src/lzo-1.08 +OPENSSL = /c/src/openssl-0.9.7i +LZO = /c/src/lzo-2.02 DMALLOC = /c/src/dmalloc-5.4.2 ######################################################### @@ -49,7 +49,7 @@ INCLUDE_DIRS = -I${OPENSSL}/include -I${LZO}/include INCLUDE_DIRS_DMALLOC = ${INCLUDE_DIRS} -I${DMALLOC} -LIBS = -llzo -lcrypt32 -lws2_32 -lgdi32 -liphlpapi -lwinmm +LIBS = -llzo2 -lcrypt32 -lws2_32 -lgdi32 -liphlpapi -lwinmm LIBS_DMALLOC = ${LIBS} -ldmalloc |