From b2dee7d568d4f31e2c2c8aba5de5ac02147c6b6b Mon Sep 17 00:00:00 2001
From: James Yonan <james@openvpn.net>
Date: Tue, 16 Nov 2010 08:36:18 +0000
Subject: In verify_callback, the subject var should be freed by OPENSSL_free,
 not free, since it is allocated by OpenSSL.

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@6655 e7ae566f-a301-0410-adde-c780ea21d3b5
---
 ssl.c      | 4 ++--
 version.m4 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ssl.c b/ssl.c
index dffe882..0f93cef 100644
--- a/ssl.c
+++ b/ssl.c
@@ -993,13 +993,13 @@ verify_callback (int preverify_ok, X509_STORE_CTX * ctx)
   msg (D_HANDSHAKE, "VERIFY OK: depth=%d, %s", ctx->error_depth, subject);
 
   session->verified = true;
-  free (subject);
+  OPENSSL_free (subject);
   argv_reset (&argv);
   return 1;			/* Accept connection */
 
  err:
   ERR_clear_error ();
-  free (subject);
+  OPENSSL_free (subject);
   argv_reset (&argv);
   return 0;                     /* Reject connection */
 }
diff --git a/version.m4 b/version.m4
index c04c6cf..9af265e 100644
--- a/version.m4
+++ b/version.m4
@@ -1,5 +1,5 @@
 dnl define the OpenVPN version
-define(PRODUCT_VERSION,[2.1.3b])
+define(PRODUCT_VERSION,[2.1.3c])
 dnl define the TAP version
 define(PRODUCT_TAP_ID,[tap0901])
 define(PRODUCT_TAP_WIN32_MIN_MAJOR,[9])
-- 
cgit 


From 2d12eb12cf2a49adbc2e89e20990415947519900 Mon Sep 17 00:00:00 2001
From: James Yonan <james@openvpn.net>
Date: Tue, 16 Nov 2010 09:10:39 +0000
Subject: Fixes to prevent compile breakage when --disable-crypto is used.

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@6656 e7ae566f-a301-0410-adde-c780ea21d3b5
---
 base64.c  | 6 +-----
 options.c | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/base64.c b/base64.c
index 2cc3944..3449ae5 100644
--- a/base64.c
+++ b/base64.c
@@ -80,8 +80,6 @@ base64_encode(const void *data, int size, char **str)
     return strlen(s);
 }
 
-#if NTLM
-
 static int 
 pos(char c)
 {
@@ -137,8 +135,6 @@ base64_decode(const char *str, void *data)
     return q - (unsigned char *) data;
 }
 
-#endif /* NTLM, PKCS#11 */
-
 #else
 static void dummy(void) {}
-#endif
+#endif /* ENABLE_HTTP_PROXY, ENABLE_PKCS11, ENABLE_CLIENT_CR */
diff --git a/options.c b/options.c
index 5f1efc5..b95ceb5 100644
--- a/options.c
+++ b/options.c
@@ -45,6 +45,7 @@
 #include "pool.h"
 #include "helper.h"
 #include "manage.h"
+#include "forward.h"
 
 #include "memdbg.h"
 
-- 
cgit