Browse code

Merge branch 'svn-BETA21' into bugfix2.1

David Sommerseth authored on 2010/11/19 02:47:06
Showing 2 changed files
... ...
@@ -1014,13 +1014,13 @@ verify_callback (int preverify_ok, X509_STORE_CTX * ctx)
1014 1014
   msg (D_HANDSHAKE, "VERIFY OK: depth=%d, %s", ctx->error_depth, subject);
1015 1015
 
1016 1016
   session->verified = true;
1017
-  free (subject);
1017
+  OPENSSL_free (subject);
1018 1018
   argv_reset (&argv);
1019 1019
   return 1;			/* Accept connection */
1020 1020
 
1021 1021
  err:
1022 1022
   ERR_clear_error ();
1023
-  free (subject);
1023
+  OPENSSL_free (subject);
1024 1024
   argv_reset (&argv);
1025 1025
   return 0;                     /* Reject connection */
1026 1026
 }
... ...
@@ -1,5 +1,5 @@
1 1
 dnl define the OpenVPN version
2
-define(PRODUCT_VERSION,[2.1.3b])
2
+define(PRODUCT_VERSION,[2.1.3c])
3 3
 dnl define the TAP version
4 4
 define(PRODUCT_TAP_ID,[tap0901])
5 5
 define(PRODUCT_TAP_WIN32_MIN_MAJOR,[9])