Message-ID: <4EBBF24B.2020602@...515...>
Date: Thu, 10 Nov 2011 17:48:27 +0200
From: =?ISO-8859-1?Q?Samuli_Sepp=E4nen?= <samuli@...515...>
MIME-Version: 1.0
References: <1320074961-3809-1-git-send-email-dejong@...1435...>
	<1320074961-3809-6-git-send-email-dejong@...1435...>
In-Reply-To: <1320074961-3809-6-git-send-email-dejong@...1435...>
Subject: Re: [Openvpn-devel] [PATCH 5/8] Added options to switch between
 OpenSSL and PolarSSL and PKCS11...
List-Id: <openvpn-devel.lists.sourceforge.net>
List-Unsubscribe: <https://lists.sourceforge.net/lists/listinfo/openvpn-devel>, 
	<mailto:openvpn-devel-request@lists.sourceforge.net?subject=unsubscribe>
List-Archive: <http://sourceforge.net/mailarchive/forum.php?forum_name=openvpn-devel>
List-Post: <mailto:openvpn-devel@lists.sourceforge.net>
List-Help: <mailto:openvpn-devel-request@lists.sourceforge.net?subject=help>
List-Subscribe: <https://lists.sourceforge.net/lists/listinfo/openvpn-devel>, 
	<mailto:openvpn-devel-request@lists.sourceforge.net?subject=subscribe>
Content-Type: text/plain; charset="ISO-8859-1"
Content-Transfer-Encoding: quoted-printable
To: Adriaan de Jong <dejong@...1435...>
Cc: "openvpn-devel@lists.sourceforge.net" <openvpn-devel@lists.sourceforge.net>



> at compile time. Also included the option to enable/disable PKCS11.
>=20
> Signed-off-by: Adriaan de Jong <dejong@...1435...>
> ---
>  win/config.h.in |   18 +++++++++++++++---
>  win/msvc.mak.in |   18 +++++++++++++++---
>  win/settings.in |   13 +++++++++++++
>  3 files changed, 43 insertions(+), 6 deletions(-)
>=20
> diff --git a/win/config.h.in b/win/config.h.in
> index ec447a2..e9df379 100644
> --- a/win/config.h.in
> +++ b/win/config.h.in
> @@ -74,7 +74,9 @@ typedef unsigned long in_addr_t;
>  #endif
>=20=20
>  /* Enable PKCS#11 support */
> -/* #define USE_PKCS11 1 */
> +#if @USE_PKCS11@ !=3D 0
> +#define USE_PKCS11 1
> +#endif
>=20=20
>  /* Enable HTTP proxy support */
>  #if @ENABLE_HTTP_PROXY@ !=3D 0
> @@ -252,7 +254,17 @@ typedef unsigned long in_addr_t;
>  #define TIME_WITH_SYS_TIME 1
>  #endif
>=20=20
> -/* Use OpenSSL crypto library */
> +/* Use the PolarSSL crypto library */
> +#if @USE_POLARSSL@ !=3D 0
> +#define USE_POLARSSL 1
> +#endif
> +
> +/* Use the OpenSSL crypto library */
> +#if @USE_OPENSSL@ !=3D 0
> +#define USE_OPENSSL 1
> +#endif
> +
> +/* Use the crypto library */
>  #define USE_CRYPTO 1
>=20=20
>  /* Use LZO compression library */
> @@ -264,7 +276,7 @@ typedef unsigned long in_addr_t;
>  /* Use lzo/ directory prefix for LZO header files (for LZO 2.0) */
>  #define LZO_HEADER_DIR 1
>=20=20
> -/* Use OpenSSL SSL library */
> +/* Use the SSL library */
>  #define USE_SSL 1
>=20=20
>  /* Version number of package */
> diff --git a/win/msvc.mak.in b/win/msvc.mak.in
> index ac17ae9..d2babcf 100644
> --- a/win/msvc.mak.in
> +++ b/win/msvc.mak.in
> @@ -12,16 +12,28 @@
>  # - OPENSSL_DIR and LZO_DIR are dynamically created from settings.in
>=20=20
>  OPENSSL =3D @OPENSSL_DIR@
> +!ifdef INCLUDE_OPENSSL
>  OPENSSL_DYNAMIC =3D libeay32.lib ssleay32.lib
> +!endif
> +
> +POLARSSL =3D @POLARSSL_DIR@
> +!ifdef INCLUDE_POLARSSL
> +POLARSSL_DYNAMIC =3D polarssl.lib
> +!endif
> +
> +PKCS11_HELPER =3D @PKCS11_HELPER_DIR@
> +!ifdef INCLUDE_PKCS11
> +PKCS11_HELPER_DYNAMIC =3D pkcs11-helper.lib
> +!endif
>=20=20
>  LZO =3D @LZO_DIR@
>  LZO_DYNAMIC =3D lzo2.lib
>=20=20
> -INCLUDE_DIRS =3D -I$(OPENSSL)/include -I$(LZO)/include
> +INCLUDE_DIRS =3D -I$(OPENSSL)/include -I$(POLARSSL)/include -I$(LZO)/inc=
lude -I$(PKCS11_HELPER)/include
>=20=20
> -LIBS =3D $(OPENSSL_DYNAMIC) $(LZO_DYNAMIC) ws2_32.lib crypt32.lib iphlpa=
pi.lib winmm.lib user32.lib gdi32.lib advapi32.lib wininet.lib
> +LIBS =3D $(OPENSSL_DYNAMIC) $(POLARSSL_DYNAMIC) $(PKCS11_HELPER_DYNAMIC)=
 $(LZO_DYNAMIC) ws2_32.lib crypt32.lib iphlpapi.lib winmm.lib user32.lib gd=
i32.lib advapi32.lib wininet.lib
>=20=20
> -LIB_DIRS =3D -LIBPATH:$(OPENSSL)\lib -LIBPATH:$(LZO)\lib
> +LIB_DIRS =3D -LIBPATH:$(OPENSSL)\lib -LIBPATH:$(POLARSSL)\build\library =
-LIBPATH:$(PKCS11_HELPER)\lib -LIBPATH:$(LZO)
>=20=20
>  EXE =3D openvpn.exe
>=20=20
> diff --git a/win/settings.in b/win/settings.in
> index 10c7926..79033dd 100644
> --- a/win/settings.in
> +++ b/win/settings.in
> @@ -33,8 +33,21 @@
>  !define OPENVPN_GUI_DIR "../openvpn-gui"
>  !define OPENVPN_GUI     "openvpn-gui-1.0.3.exe"
>=20=20
> +# Use either PolarSSL or OpenSSL. Only one may be active at a time
> +!define USE_POLARSSL 0
> +!define USE_OPENSSL 1
> +
> +# The same as above, but for library inclusion (must be defined/undefine=
d due to build system)
> +;!define INCLUDE_POLARSSL
> +!define INCLUDE_OPENSSL
> +
> +# Uncomment to use the PKCS#11 helper library
> +!define USE_PKCS11 0
> +;!define INCLUDE_PKCS11
> +
>  # Prebuilt libraries.  DMALLOC is optional.
>  !define OPENSSL_DIR	  "../openssl"
> +!define POLARSSL_DIR	  "../polarssl"
>  !define LZO_DIR		  "../lzo"
>  !define PKCS11_HELPER_DIR "../pkcs11-helper"
>=20=20

ACK, provided that my small OpenSSL build fix is applied on top of this.

--=20
Samuli Sepp=E4nen
Community Manager
OpenVPN Technologies, Inc

irc freenode net: mattock