summaryrefslogtreecommitdiffstats
path: root/options.c
diff options
context:
space:
mode:
authorAdriaan de Jong <dejong@fox-it.com>2011-07-05 11:48:38 +0200
committerDavid Sommerseth <davids@redhat.com>2011-10-22 16:00:49 +0200
commit8bb72fbcba4721a68333f06d8b38a5ad05f6638a (patch)
tree1dca2e795ba58b236b87c74dd906aebcfecccd61 /options.c
parent477127061a22e6e998755c657873aa1b212ea59a (diff)
downloadopenvpn-8bb72fbcba4721a68333f06d8b38a5ad05f6638a.tar.gz
openvpn-8bb72fbcba4721a68333f06d8b38a5ad05f6638a.tar.xz
openvpn-8bb72fbcba4721a68333f06d8b38a5ad05f6638a.zip
Refactored (and disabled for PolarSSL) support for writing external cert files in scripts
Signed-off-by: Adriaan de Jong <dejong@fox-it.com> Acked-by: James Yonan <james@openvpn.net> Signed-off-by: David Sommerseth <davids@redhat.com>
Diffstat (limited to 'options.c')
-rw-r--r--options.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/options.c b/options.c
index 8ee24a0..f780681 100644
--- a/options.c
+++ b/options.c
@@ -6248,6 +6248,7 @@ add_option (struct options *options,
}
#endif
}
+#ifdef USE_POLARSSL
else if (streq (p[0], "pkcs12") && p[1])
{
VERIFY_PERMISSION (OPT_P_GENERAL);
@@ -6259,6 +6260,7 @@ add_option (struct options *options,
}
#endif
}
+#endif /* USE_POLARSSL */
else if (streq (p[0], "askpass"))
{
VERIFY_PERMISSION (OPT_P_GENERAL);
@@ -6320,11 +6322,13 @@ add_option (struct options *options,
warn_multiple_script (options->tls_verify, "tls-verify");
options->tls_verify = string_substitute (p[1], ',', ' ', &options->gc);
}
+#ifndef USE_POLARSSL
else if (streq (p[0], "tls-export-cert") && p[1])
{
VERIFY_PERMISSION (OPT_P_GENERAL);
options->tls_export_cert = p[1];
}
+#endif
else if (streq (p[0], "tls-remote") && p[1])
{
VERIFY_PERMISSION (OPT_P_GENERAL);