Series of patches to fix Windows builds and other errors

--- a/plugin.h +++ b/plugin.h @@ -132,7 +132,7 @@ plugin_call(const struct plugin_list *pl, { return plugin_call_ssl(pl, type, av, pr, es
#ifdef USE_SSL - -1, NULL + , -1, NULL #endif ); }

Signed-off-by Adriaan de Jong <[email protected]...>

---
 plugin.h |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)

plugin.h +10 -4

index 7aacb47..948ab88 100644
@@ -122,6 +122,16 @@ void plugin_list_open (struct plugin_list *pl,
 
 struct plugin_list *plugin_list_inherit (const struct plugin_list *src);
 
+int plugin_call_ssl (const struct plugin_list *pl,
+		 const int type,
+		 const struct argv *av,
+		 struct plugin_return *pr,
+		 struct env_set *es
+#ifdef USE_SSL
+		 , int current_cert_depth,
+		 x509_cert_t *current_cert
+#endif
+		);
 
 static inline int
 plugin_call(const struct plugin_list *pl,

@@ -137,17 +147,6 @@ plugin_call(const struct plugin_list *pl,
       );
 }
 
-int plugin_call_ssl (const struct plugin_list *pl,
-		 const int type,
-		 const struct argv *av,
-		 struct plugin_return *pr,

-----Original Message-----
From: [email protected]... [mailto:[email protected]...]
Sent: woensdag 9 november 2011 10:50
To: [email protected]
Subject: [Openvpn-devel] [PATCH] Fixed a regression causing VS2008/Python build failure

From: Samuli Seppänen <[email protected]...>

Patch "Added options to switch between OpenSSL and PolarSSL and PKCS11" caused a
regression when building OpenVPN with Visual Studio 2008/Python build system.
The underlying cause was a wrong path to lzo2.lib.

---
 win/msvc.mak.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

win/msvc.mak.in +0 -0

index d2babcf..26d7a33 100644
@@ -33,7 +33,7 @@ INCLUDE_DIRS = -I$(OPENSSL)/include -

I$(POLARSSL)/include -I$(LZO)/include -I$(P

LIBS = $(OPENSSL_DYNAMIC) $(POLARSSL_DYNAMIC) $(PKCS11_HELPER_DYNAMIC)
$(LZO_DYNAMIC) ws2_32.lib crypt32.lib iphlpapi.lib winmm.lib user32.lib gdi32.lib advapi32.lib wininet.lib

win/msvc.mak.in +1 -4

-LIB_DIRS = -LIBPATH:$(OPENSSL)\lib -LIBPATH:$(POLARSSL)\build\library
-LIBPATH:$(PKCS11_HELPER)\lib -LIBPATH:$(LZO)
+LIB_DIRS = -LIBPATH:$(OPENSSL)\lib -LIBPATH:$(POLARSSL)\build\library
-LIBPATH:$(PKCS11_HELPER)\lib -LIBPATH:$(LZO)\lib
 
 EXE = openvpn.exe
 
--

1.7.4.1

-----------------------------------------------------------------------
-------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel

at compile time. Also included the option to enable/disable PKCS11.

Signed-off-by Adriaan de Jong <[email protected]...>

---
 win/config.h.in |   18 +++++++++++++++---
 win/msvc.mak.in |   18 +++++++++++++++---
 win/settings.in |   13 +++++++++++++
 3 files changed, 43 insertions(+), 6 deletions(-)

win/config.h.in +15 -3

index ec447a2..e9df379 100644
@@ -74,7 +74,9 @@ typedef unsigned long in_addr_t;
 #endif
 
 /* Enable PKCS#11 support */
-/* #define USE_PKCS11 1 */
+#if @USE_PKCS11@ != 0
+#define USE_PKCS11 1
+#endif
 
 /* Enable HTTP proxy support */
 #if @ENABLE_HTTP_PROXY@ != 0

@@ -252,7 +254,17 @@ typedef unsigned long in_addr_t;
 #define TIME_WITH_SYS_TIME 1
 #endif
 
-/* Use OpenSSL crypto library */
+/* Use the PolarSSL crypto library */
+#if @USE_POLARSSL@ != 0
+#define USE_POLARSSL 1
+#endif
+
+/* Use the OpenSSL crypto library */
+#if @USE_OPENSSL@ != 0
+#define USE_OPENSSL 1
+#endif
+
+/* Use the crypto library */
 #define USE_CRYPTO 1
 
 /* 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
 
-/* Use OpenSSL SSL library */
+/* Use the SSL library */
 #define USE_SSL 1
 
 /* Version number of package */

win/msvc.mak.in +15 -3

index ac17ae9..d2babcf 100644
@@ -12,16 +12,28 @@
 # - OPENSSL_DIR and LZO_DIR are dynamically created from settings.in
 
 OPENSSL = @OPENSSL_DIR@
+!ifdef INCLUDE_OPENSSL
 OPENSSL_DYNAMIC = libeay32.lib ssleay32.lib
+!endif
+
+POLARSSL = @POLARSSL_DIR@
+!ifdef INCLUDE_POLARSSL
+POLARSSL_DYNAMIC = polarssl.lib
+!endif
+
+PKCS11_HELPER = @PKCS11_HELPER_DIR@
+!ifdef INCLUDE_PKCS11
+PKCS11_HELPER_DYNAMIC = pkcs11-helper.lib
+!endif
 
 LZO = @LZO_DIR@
 LZO_DYNAMIC = lzo2.lib
 
-INCLUDE_DIRS = -I$(OPENSSL)/include -I$(LZO)/include
+INCLUDE_DIRS = -I$(OPENSSL)/include -I$(POLARSSL)/include -I$(LZO)/include -I$(PKCS11_HELPER)/include
 
-LIBS = $(OPENSSL_DYNAMIC) $(LZO_DYNAMIC) ws2_32.lib crypt32.lib iphlpapi.lib winmm.lib user32.lib gdi32.lib advapi32.lib wininet.lib
+LIBS = $(OPENSSL_DYNAMIC) $(POLARSSL_DYNAMIC) $(PKCS11_HELPER_DYNAMIC) $(LZO_DYNAMIC) ws2_32.lib crypt32.lib iphlpapi.lib winmm.lib user32.lib gdi32.lib advapi32.lib wininet.lib
 
-LIB_DIRS = -LIBPATH:$(OPENSSL)\lib -LIBPATH:$(LZO)\lib
+LIB_DIRS = -LIBPATH:$(OPENSSL)\lib -LIBPATH:$(POLARSSL)\build\library -LIBPATH:$(PKCS11_HELPER)\lib -LIBPATH:$(LZO)
 
 EXE = openvpn.exe
 

win/settings.in +8 -0

index 10c7926..79033dd 100644
@@ -33,8 +33,21 @@
 !define OPENVPN_GUI_DIR "../openvpn-gui"
 !define OPENVPN_GUI     "openvpn-gui-1.0.3.exe"
 
+# 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/undefined due to build system)
+;!define INCLUDE_POLARSSL
+!define INCLUDE_OPENSSL
+

- Changed int32_t to size_t
- Removed some unused variables
- Added missing include files
- changed ordering to ensure variable declarations are before asserts

Signed-off-by Adriaan de Jong <[email protected]...>

---
 crypto.c              |    3 +--
 pkcs11_polarssl.c     |    1 -
 ssl_openssl.c         |    6 +++---
 ssl_polarssl.c        |    2 --
 ssl_verify_openssl.c  |    1 +
 ssl_verify_polarssl.c |    2 +-
 6 files changed, 6 insertions(+), 9 deletions(-)

crypto.c +1 -2

index 375d35a..e628578 100644
@@ -1336,11 +1336,10 @@ prng_uninit (void)
 void
 prng_bytes (uint8_t *output, int len)
 {
-  static int32_t processed = 0;
+  static size_t processed = 0;
 
   if (nonce_md)
     {
-      md_ctx_t ctx;
       const int md_size = md_kt_size (nonce_md);
       while (len > 0)
 	{

pkcs11_polarssl.c +0 -1

index 4f8bf33..0f9daab 100644
@@ -40,7 +40,6 @@ pkcs11_init_tls_session(pkcs11h_certificate_t certificate,
     struct tls_root_ctx * const ssl_ctx)
 {
   int ret = 1;
-  pkcs11_context pkcs11_ctx;
 
   ASSERT (NULL != ssl_ctx);
 

ssl_openssl.c +3 -3

index 1cc2bfb..391968a 100644
@@ -38,6 +38,7 @@
 #include "memdbg.h"
 #include "ssl_backend.h"
 #include "ssl_common.h"
+#include "base64.h"
 
 #ifdef ENABLE_CRYPTOAPI
 #include "cryptoapi.h"

@@ -349,7 +350,6 @@ tls_ctx_load_cryptoapi(struct tls_root_ctx *ctx, const char *cryptoapi_cert)
 static int
 tls_ctx_read_certificate_file(SSL_CTX *ctx, const char *file, X509 **x509)
 {
-  int j;
   BIO *in;
   int ret=0;
   X509 *x=NULL;

@@ -480,10 +480,10 @@ tls_ctx_load_priv_file (struct tls_root_ctx *ctx, const char *priv_key_file
 #endif
     )
 {
-  ASSERT(NULL != ctx);
-
   int status;
 
+  ASSERT(NULL != ctx);
+
 #if ENABLE_INLINE_FILES
   if (!strcmp (priv_key_file, INLINE_FILE_TAG) && priv_key_file_inline)
     {

ssl_polarssl.c +0 -2

index 60d99a8..c50cf0a 100644
@@ -347,8 +347,6 @@ void tls_ctx_load_ca (struct tls_root_ctx *ctx, const char *ca_file,
     const char *ca_path, bool tls_server
     )
 {
-  int status;
-
   if (ca_path)
       msg(M_FATAL, "ERROR: PolarSSL cannot handle the capath directive");
 

ssl_verify_openssl.c +1 -0

index 13c2f4e..e82f6f9 100644
@@ -35,6 +35,7 @@
 #include "ssl_verify_backend.h"
 #include "ssl_openssl.h"
 #include <openssl/x509v3.h>
+#include <openssl/err.h>
 
 int
 verify_callback (int preverify_ok, X509_STORE_CTX * ctx)

ssl_verify_polarssl.c +0 -0

index 7fdca1f..699eb47 100644

Signed-off-by Adriaan de Jong <[email protected]...>

---
 ssl_openssl.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

ssl_openssl.c +0 -0

index 391968a..b95944c 100644
@@ -339,7 +339,7 @@ tls_ctx_load_cryptoapi(struct tls_root_ctx *ctx, const

char *cryptoapi_cert) /* Load Certificate and Private Key */
if (!SSL_CTX_use_CryptoAPI_certificate (ctx->ctx, cryptoapi_cert))
msg (M_SSLERR, "Cannot load certificate \"%s\" from Microsoft
Certificate Store", - options->cryptoapi_cert);

Hi,

The following series of patches enables Windows builds and fixes a few bugs to boot. Most of it I'm quite comfortable with.

The only unfortunate thing in these patches is switching between OpenSSL and PolarSSL. This currently requires changing two flags instead of one, due to the build system. If anyone has any suggestions there, please let me know.

Adriaan

[PATCH 1/8] Moved prng_uninit out of crypto_uninit_lib

[PATCH 2/8] Moved CryptoAPI header include to the ssl_openssl.c

[PATCH 3/8] Fixed missing comma in plugin.h

[PATCH 4/8] Reordered functions to ensure warning-free Windows build

[PATCH 5/8] Added options to switch between OpenSSL and PolarSSL and

[PATCH 6/8] Moved from strsep to strtok, for Windows compatibility

[PATCH 7/8] Minor cleanup to enable warning-free Windows build:

[PATCH 8/8] Fixed a typo when initialising cryptoapi certs