From e572cb639866063956202b0eefa18615e257cf76 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Mon, 26 May 2008 12:04:35 +0300 Subject: [PATCH] Do not define tls_engine_get_cert() if OpenSSL engine is disabled --- src/crypto/tls_openssl.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c index 7e565b4ab..e83bf9162 100644 --- a/src/crypto/tls_openssl.c +++ b/src/crypto/tls_openssl.c @@ -1512,11 +1512,11 @@ static int tls_read_pkcs12_blob(SSL_CTX *ssl_ctx, SSL *ssl, } +#ifndef OPENSSL_NO_ENGINE static int tls_engine_get_cert(struct tls_connection *conn, const char *cert_id, X509 **cert) { -#ifndef OPENSSL_NO_ENGINE /* this runs after the private key is loaded so no PIN is required */ struct { const char *cert_id; @@ -1539,10 +1539,8 @@ static int tls_engine_get_cert(struct tls_connection *conn, } *cert = params.cert; return 0; -#else /* OPENSSL_NO_ENGINE */ - return -1; -#endif /* OPENSSL_NO_ENGINE */ } +#endif /* OPENSSL_NO_ENGINE */ static int tls_connection_engine_client_cert(struct tls_connection *conn,