aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2009-11-15 12:58:50 +0000
committerYang Tse <yangsita@gmail.com>2009-11-15 12:58:50 +0000
commit3b8d7fddf7c3ada9d63acde216731c695f726c27 (patch)
treefa71550a66ae28315bdeccf10b55a6435c396243
parent0e80f0e4c49116f0291873a73e8ca2c7cbbeb216 (diff)
Client certificate ENG file type requires OpenSSL 0.9.7 or newer
-rw-r--r--lib/ssluse.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/ssluse.c b/lib/ssluse.c
index 6cf260573..ff043c651 100644
--- a/lib/ssluse.c
+++ b/lib/ssluse.c
@@ -364,7 +364,7 @@ int cert_stuff(struct connectdata *conn,
}
break;
case SSL_FILETYPE_ENGINE:
-#ifdef HAVE_OPENSSL_ENGINE_H
+#if defined(HAVE_OPENSSL_ENGINE_H) && defined(ENGINE_CTRL_GET_CMD_FROM_NAME)
{
if(data->state.engine) {
const char *cmd_name = "LOAD_CERT_CTRL";
@@ -376,14 +376,13 @@ int cert_stuff(struct connectdata *conn,
params.cert_id = cert_file;
params.cert = NULL;
-#ifdef ENGINE_CTRL_GET_CMD_FROM_NAME
/* Does the engine supports LOAD_CERT_CTRL ? */
if (!ENGINE_ctrl(data->state.engine, ENGINE_CTRL_GET_CMD_FROM_NAME,
0, (void *)cmd_name, NULL)) {
failf(data, "ssl engine does not support loading certificates");
return 0;
}
-#endif
+
/* Load the certificate from the engine */
if (!ENGINE_ctrl_cmd(data->state.engine, cmd_name,
0, &params, NULL, 1)) {