]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
login-common: Compiler warning fix with OpenSSL v1.0.2+
authorTimo Sirainen <tss@iki.fi>
Wed, 10 Jul 2013 05:47:49 +0000 (08:47 +0300)
committerTimo Sirainen <tss@iki.fi>
Wed, 10 Jul 2013 05:47:49 +0000 (08:47 +0300)
src/login-common/ssl-proxy-openssl.c

index 0b9962d9de169c1f42855c6a4ca6c1de74f9ad72..0a96f0240afaead9e5ae0a3fdfe22bc9ede49fc7 100644 (file)
@@ -1134,11 +1134,11 @@ ssl_proxy_ctx_use_key(SSL_CTX *ctx,
        EVP_PKEY_free(pkey);
 }
 
+#if !defined(OPENSSL_NO_ECDH) && OPENSSL_VERSION_NUMBER >= 0x10000000L && OPENSSL_VERSION_NUMBER < 0x10002000L
 static int
 ssl_proxy_ctx_get_pkey_ec_curve_name(const struct master_service_ssl_settings *set)
 {
        int nid = 0;
-#if !defined(OPENSSL_NO_ECDH) && OPENSSL_VERSION_NUMBER >= 0x10000000L && OPENSSL_VERSION_NUMBER < 0x10002000L
        EVP_PKEY *pkey;
        const char *password;
        EC_KEY *eckey;
@@ -1152,9 +1152,9 @@ ssl_proxy_ctx_get_pkey_ec_curve_name(const struct master_service_ssl_settings *s
            (ecgrp = EC_KEY_get0_group(eckey)) != NULL)
                nid = EC_GROUP_get_curve_name(ecgrp);
        EVP_PKEY_free(pkey);
-#endif
        return nid;
 }
+#endif
 
 static int
 ssl_proxy_ctx_use_certificate_chain(SSL_CTX *ctx, const char *cert)