From: Adriaan de Jong <dejong@fox-it.com>
Date: Tue, 5 Jul 2011 08:32:09 +0000 (+0200)
Subject: Removed support for management external keys in PolarSSL
X-Git-Tag: v2.3-alpha1~96
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fa82c550f8160bb8dd107bc5f3d516ba996dd6d;p=thirdparty%2Fopenvpn.git

Removed support for management external keys in PolarSSL

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>
---

diff --git a/ssl_polarssl.c b/ssl_polarssl.c
index 032a35694..2731081e0 100644
--- a/ssl_polarssl.c
+++ b/ssl_polarssl.c
@@ -322,7 +322,7 @@ int
 tls_ctx_use_external_private_key (struct tls_root_ctx *ctx, x509_cert_t *cert)
 {
   msg(M_FATAL, "Use of management external keys not yet supported for PolarSSL.");
-
+  return false;
 }
 
 #endif
diff --git a/syshead.h b/syshead.h
index 0addcd7fc..0e8edf34c 100644
--- a/syshead.h
+++ b/syshead.h
@@ -539,7 +539,7 @@ socket_defined (const socket_descriptor_t sd)
 /*
  * Enable external private key
  */
-#if defined(ENABLE_MANAGEMENT) && defined(USE_SSL)
+#if defined(ENABLE_MANAGEMENT) && defined(USE_SSL) && !defined(USE_POLARSSL)
 #define MANAGMENT_EXTERNAL_KEY
 #endif