Only declare 'engine' if it is used

Move the declaration of 'engine' within the appropriate #if/#endif
block.  Remove the UNUSED(engine) from the #else block.

(cherry picked from commit 8b11061b91f01b2e6c993faed18efb976a5af842)

diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c
index 1f2a2e0b760626b5a9b4c648c141c0f36439a623..09412c58b56b60b8493a2e40950400351d3ca13d 100644 (file)
--- a/lib/dns/opensslrsa_link.c
+++ b/lib/dns/opensslrsa_link.c
@@ -895,9 +895,10 @@ opensslrsa_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) {
 #if !defined(OPENSSL_NO_ENGINE)
        ENGINE *ep = NULL;
        const BIGNUM *ex = NULL;
+       const char *engine = NULL;
 #endif /* if !defined(OPENSSL_NO_ENGINE) */
        isc_mem_t *mctx = key->mctx;
-       const char *engine = NULL, *label = NULL;
+       const char *label = NULL;
        EVP_PKEY *pkey = NULL;
        BIGNUM *n = NULL, *e = NULL, *d = NULL;
        BIGNUM *p = NULL, *q = NULL;
@@ -930,9 +931,11 @@ opensslrsa_parse(dst_key_t *key, isc_lex_t *lexer, dst_key_t *pub) {
 
        for (i = 0; i < priv.nelements; i++) {
                switch (priv.elements[i].tag) {
+#if !defined(OPENSSL_NO_ENGINE) && OPENSSL_API_LEVEL < 30000
                case TAG_RSA_ENGINE:
                        engine = (char *)priv.elements[i].data;
                        break;
+#endif
                case TAG_RSA_LABEL:
                        label = (char *)priv.elements[i].data;
                        break;