aboutsummaryrefslogtreecommitdiff
path: root/options.h
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2005-12-08 18:29:38 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2005-12-08 18:29:38 +0000
commitc959fc742eb10c516261765718a761536b0b8f4a (patch)
tree6cc92545c1c6df6338ad6ab07b6619e094e36f93 /options.h
parentFixed some gcc 4 warnings in misc.c. (diff)
downloadopenvpn-c959fc742eb10c516261765718a761536b0b8f4a.tar.xz
Inline file capability now works for
--secret and --tls-auth. For example: <secret> [ascii key data] </secret> git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@844 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'options.h')
-rw-r--r--options.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/options.h b/options.h
index 3c3c202..21484b7 100644
--- a/options.h
+++ b/options.h
@@ -82,10 +82,6 @@ struct options_pre_pull
#endif
-#if ENABLE_INLINE_FILES
-#define INLINE_FILE_TAG "[[INLINE]]"
-#endif
-
/* Command line options */
struct options
{
@@ -356,6 +352,9 @@ struct options
#ifdef USE_CRYPTO
/* Cipher parms */
const char *shared_secret_file;
+#if ENABLE_INLINE_FILES
+ const char *shared_secret_file_inline;
+#endif
int key_direction;
bool ciphername_defined;
const char *ciphername;
@@ -433,6 +432,9 @@ struct options
/* Special authentication MAC for TLS control channel */
const char *tls_auth_file; /* shared secret */
+#if ENABLE_INLINE_FILES
+ const char *tls_auth_file_inline;
+#endif
/* Allow only one session */
bool single_session;