Fixed issue where SIGUSR1 restarts would fail if private

key was specified as an inline file.

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@3743 e7ae566f-a301-0410-adde-c780ea21d3b5

diff --git a/crypto.c b/crypto.c
index d813f031d170027b58e9b31d6fc2b887156bbae5..c9d6cdfdca54b20048bc20073e55a071abd0ddcd 100644 (file)
--- a/crypto.c
+++ b/crypto.c
@@ -1158,8 +1158,11 @@ read_key_file (struct key2 *key2, const char *file, const unsigned int flags)
             error_filename, count, onekeylen, keylen);
     }
 
-  /* zero file read buffer */
-  buf_clear (&in);
+  /* zero file read buffer if not an inline file */
+#if ENABLE_INLINE_FILES
+  if (!(flags & RKF_INLINE))
+#endif
+    buf_clear (&in);
 
   if (key2->n)
     warn_if_group_others_accessible (error_filename);

diff --git a/init.c b/init.c
index 903fda46a9aaa602e93cedfe9e94dd6d4390b704..959cec2fa9c7fc9b54eb14657de020b6222ae6d9 100644 (file)
--- a/init.c
+++ b/init.c
@@ -1680,7 +1680,7 @@ do_init_crypto_tls_c1 (struct context *c)
                                 flags);
        }
 
-#if ENABLE_INLINE_FILES
+#if 0 /* was: #if ENABLE_INLINE_FILES --  Note that enabling this code will break restarts */
       if (options->priv_key_file_inline)
        {
          string_clear (c->options.priv_key_file_inline);

diff --git a/version.m4 b/version.m4
index b3984bec3dd4cd6795d33375bd317b1eea54360e..132e6cde3c3b0a4f2351df48d58574439408b8c8 100644 (file)
--- a/version.m4
+++ b/version.m4
@@ -1,5 +1,5 @@
 dnl define the OpenVPN version
-define(PRODUCT_VERSION,[2.1_rc15b])
+define(PRODUCT_VERSION,[2.1_rc15c])
 dnl define the TAP version
 define(PRODUCT_TAP_ID,[tap0901])
 define(PRODUCT_TAP_WIN32_MIN_MAJOR,[9])