upstream/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2026-05-28 04:03:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'svn-BETA21' into bugfix2.1

Browse source
This commit is contained in:
David Sommerseth 2010-11-18 18:47:06 +01:00
commit e98124dfba
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ssl.c
View file

@ -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 */
}

2
version.m4
View file

@ -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])