summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Yonan <james@openvpn.net>2010-11-16 08:36:18 +0000
committerJames Yonan <james@openvpn.net>2010-11-16 08:36:18 +0000
commitb2dee7d568d4f31e2c2c8aba5de5ac02147c6b6b (patch)
treea2729a39d09e08d65dfd65cbdd8c541edd98a4eb
parent20a4c12783144d798c6b7446bae8920fdfea7adc (diff)
downloadopenvpn-b2dee7d568d4f31e2c2c8aba5de5ac02147c6b6b.tar.gz
openvpn-b2dee7d568d4f31e2c2c8aba5de5ac02147c6b6b.tar.xz
openvpn-b2dee7d568d4f31e2c2c8aba5de5ac02147c6b6b.zip
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
-rw-r--r--ssl.c4
-rw-r--r--version.m42
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])