diff options
author | Adriaan de Jong <dejong@fox-it.com> | 2011-07-05 10:02:40 +0200 |
---|---|---|
committer | David Sommerseth <davids@redhat.com> | 2011-10-22 16:00:49 +0200 |
commit | 88133cdb961afcfb2de4576b0647f90378a67cc3 (patch) | |
tree | 60274877bc0065bbce69d01b7fc1dc94d5e2f415 | |
parent | c2896b10c5f170d3821a647c1f38f542fdeba9eb (diff) | |
download | openvpn-88133cdb961afcfb2de4576b0647f90378a67cc3.tar.gz openvpn-88133cdb961afcfb2de4576b0647f90378a67cc3.tar.xz openvpn-88133cdb961afcfb2de4576b0647f90378a67cc3.zip |
Added a warning that the PolarSSL library does not support pkcs12 files.
Signed-off-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: James Yonan <james@openvpn.net>
Acked-by: Gert Doering <gert@greenie.muc.de>
Signed-off-by: David Sommerseth <davids@redhat.com>
-rw-r--r-- | openvpn.8 | 1 | ||||
-rw-r--r-- | options.c | 4 | ||||
-rw-r--r-- | ssl_polarssl.c | 1 |
3 files changed, 6 insertions, 0 deletions
@@ -4041,6 +4041,7 @@ This option can be used instead of .B \-\-ca, \-\-cert, and .B \-\-key. +Not available with PolarSSL. .\"********************************************************* .TP .B \-\-verify-hash hash @@ -2265,12 +2265,16 @@ options_postprocess_verify_ce (const struct options *options, const struct conne #endif if (options->pkcs12_file) { +#ifdef USE_POLARSSL + msg(M_USAGE, "Parameter --pkcs12 cannot be used with the PolarSSL version version of OpenVPN."); +#else if (options->ca_path) msg(M_USAGE, "Parameter --capath 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) msg(M_USAGE, "Parameter --key cannot be used when --pkcs12 is also specified."); +#endif } else { diff --git a/ssl_polarssl.c b/ssl_polarssl.c index 7ea20ca..d45156a 100644 --- a/ssl_polarssl.c +++ b/ssl_polarssl.c @@ -220,6 +220,7 @@ tls_ctx_load_pkcs12(struct tls_root_ctx *ctx, const char *pkcs12_file, ) { msg(M_FATAL, "PKCS #12 files not yet supported for PolarSSL."); + return 0; } #ifdef WIN32 |