aboutsummaryrefslogtreecommitdiff
path: root/options.c
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2005-10-15 05:07:29 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2005-10-15 05:07:29 +0000
commite83b8190d46352f8a625491b10af19c8b0ac2def (patch)
tree16df725c18e5d8de8bf50155a47dc565661dc6a3 /options.c
parentadded *.rej to .svnignore (diff)
downloadopenvpn-e83b8190d46352f8a625491b10af19c8b0ac2def.tar.xz
Enable the use of --ca together with --pkcs12. If --ca is
used at the same time as --pkcs12, the CA certificate is loaded from the file specified by --ca regardless if the pkcs12 file contains a CA cert or not (Mathias Sundman). Pre-2.1-beta3 git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@612 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to '')
-rw-r--r--options.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/options.c b/options.c
index c7e788f..fa911b6 100644
--- a/options.c
+++ b/options.c
@@ -405,7 +405,7 @@ static const char usage_message[] =
" by a Certificate Authority in --ca file.\n"
"--key file : Local private key in .pem format.\n"
"--pkcs12 file : PKCS#12 file containing local private key, local certificate\n"
- " and root CA certificate.\n"
+ " and optionally the root CA certificate.\n"
#ifdef ENABLE_PKCS11
"--pkcs11-providers provider ... : PKCS#11 provider to load.\n"
"--pkcs11-sign-mode mode ... : PKCS#11 signature method.\n"
@@ -1683,8 +1683,6 @@ options_postprocess (struct options *options, bool first_time)
#endif
if (options->pkcs12_file)
{
- if (options->ca_file)
- msg(M_USAGE, "Parameter --ca cannot be used when --pkcs12 is also specified.");
if (options->cert_file)
msg(M_USAGE, "Parameter --cert cannot be used when --pkcs12 is also specified.");
if (options->priv_key_file)