Ticket #145: 0001-Backported-pkcs11-related-parts-of-7a8d707237bb18-to.patch

File 0001-Backported-pkcs11-related-parts-of-7a8d707237bb18-to.patch, 2.2 KB (added by Samuli Seppänen, 12 years ago)

First stab at fixing #145

  • win/config.h.in 

    From 32ff5caf5a60d54cfc727045959d99476a23c19c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuli=20Sepp=C3=A4nen?= <samuli@openvpn.net>
Date: Fri, 9 Dec 2011 14:41:58 +0200
Subject: [PATCH] Backported pkcs11-related parts of 7a8d707237bb18 to 2.2 branch

Fixes https://community.openvpn.net/openvpn/ticket/145
---
 win/config.h.in |    4 +++-
 win/msvc.mak.in |   11 ++++++++---
 win/settings.in |    4 ++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/win/config.h.in b/win/config.h.in
index 82344a0..09263d3 100644
    a b typedef unsigned long in_addr_t; 
    7474#endif
    7575
    7676/* Enable PKCS#11 support */
    77 /* #define USE_PKCS11 1 */
     77#if @USE_PKCS11@ != 0
     78#define USE_PKCS11 1
     79#endif
    7880
    7981/* Enable HTTP proxy support */
    8082#if @ENABLE_HTTP_PROXY@ != 0

  • win/msvc.mak.in 

    diff --git a/win/msvc.mak.in b/win/msvc.mak.in
index ac17ae9..7979b5e 100644
    a b  
    1414OPENSSL = @OPENSSL_DIR@
    1515OPENSSL_DYNAMIC = libeay32.lib ssleay32.lib
    1616
     17PKCS11_HELPER = @PKCS11_HELPER_DIR@
     18!ifdef INCLUDE_PKCS11
     19PKCS11_HELPER_DYNAMIC = pkcs11-helper.lib
     20!endif
     21
    1722LZO = @LZO_DIR@
    1823LZO_DYNAMIC = lzo2.lib
    1924
    20 INCLUDE_DIRS = -I$(OPENSSL)/include -I$(LZO)/include
     25INCLUDE_DIRS = -I$(OPENSSL)/include -I$(LZO)/include -I$(PKCS11_HELPER)/include
    2126
    22 LIBS = $(OPENSSL_DYNAMIC) $(LZO_DYNAMIC) ws2_32.lib crypt32.lib iphlpapi.lib winmm.lib user32.lib gdi32.lib advapi32.lib wininet.lib
     27LIBS = $(OPENSSL_DYNAMIC) $(PKCS11_HELPER_DYNAMIC) $(LZO_DYNAMIC) ws2_32.lib crypt32.lib iphlpapi.lib winmm.lib user32.lib gdi32.lib advapi32.lib wininet.lib
    2328
    24 LIB_DIRS = -LIBPATH:$(OPENSSL)\lib -LIBPATH:$(LZO)\lib
     29LIB_DIRS = -LIBPATH:$(OPENSSL)\lib -LIBPATH:$(PKCS11_HELPER)\lib -LIBPATH:$(LZO)\lib
    2530
    2631EXE = openvpn.exe
    2732

  • win/settings.in 

    diff --git a/win/settings.in b/win/settings.in
index 10c7926..a197fb8 100644
    a b  
    3333!define OPENVPN_GUI_DIR "../openvpn-gui"
    3434!define OPENVPN_GUI     "openvpn-gui-1.0.3.exe"
    3535
     36# Uncomment to use the PKCS#11 helper library
     37!define USE_PKCS11 0
     38;!define INCLUDE_PKCS11
     39
    3640# Prebuilt libraries.  DMALLOC is optional.
    3741!define OPENSSL_DIR       "../openssl"
    3842!define LZO_DIR           "../lzo"