summaryrefslogtreecommitdiffstats
path: root/options.c
diff options
context:
space:
mode:
authorJames Yonan <james@openvpn.net>2010-08-29 05:24:15 +0000
committerJames Yonan <james@openvpn.net>2010-08-29 05:24:15 +0000
commit2e8ff6c1bd1eb96a6551304e16af5e01e86b328f (patch)
tree9d745e5d1dedcc22dea127474f975b1ad2162210 /options.c
parent5f866d914c71f010988fd85d5b178f3b8c3e2987 (diff)
downloadopenvpn-2e8ff6c1bd1eb96a6551304e16af5e01e86b328f.tar.gz
openvpn-2e8ff6c1bd1eb96a6551304e16af5e01e86b328f.tar.xz
openvpn-2e8ff6c1bd1eb96a6551304e16af5e01e86b328f.zip
Allow PKCS12 file content to be included inline in configuration file,
rendered as base64. git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@6412 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'options.c')
-rw-r--r--options.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/options.c b/options.c
index e1de0d9..b1ac26c 100644
--- a/options.c
+++ b/options.c
@@ -5680,6 +5680,12 @@ add_option (struct options *options,
{
VERIFY_PERMISSION (OPT_P_GENERAL);
options->pkcs12_file = p[1];
+#if ENABLE_INLINE_FILES
+ if (streq (p[1], INLINE_FILE_TAG) && p[2])
+ {
+ options->pkcs12_file_inline = p[2];
+ }
+#endif
}
else if (streq (p[0], "askpass"))
{