diff options
author | David Sommerseth <dazo@users.sourceforge.net> | 2010-11-18 18:47:06 +0100 |
---|---|---|
committer | David Sommerseth <dazo@users.sourceforge.net> | 2010-11-18 18:47:06 +0100 |
commit | e98124dfbabfa78e9bf6e841ffcc8e04868df331 (patch) | |
tree | b1e9bad1d16b04c2c3ed37710af14d91b0fad3e0 | |
parent | 423d68b0ede7f10c02fa753cba8d60d2218d2dc7 (diff) | |
parent | 2d12eb12cf2a49adbc2e89e20990415947519900 (diff) | |
download | openvpn-e98124dfbabfa78e9bf6e841ffcc8e04868df331.tar.gz openvpn-e98124dfbabfa78e9bf6e841ffcc8e04868df331.tar.xz openvpn-e98124dfbabfa78e9bf6e841ffcc8e04868df331.zip |
Merge branch 'svn-BETA21' into bugfix2.1
-rw-r--r-- | ssl.c | 4 | ||||
-rw-r--r-- | version.m4 | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -1014,13 +1014,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 */ } @@ -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]) |