Mercurial > dovecot > core-2.2
changeset 16589:ac0dd2fbdbf0
login-common: Compiler warning fix with OpenSSL v1.0.2+
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Wed, 10 Jul 2013 08:47:49 +0300 |
| parents | f296a05246fb |
| children | dc99912e5047 |
| files | src/login-common/ssl-proxy-openssl.c |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/login-common/ssl-proxy-openssl.c Wed Jul 10 08:42:09 2013 +0300 +++ b/src/login-common/ssl-proxy-openssl.c Wed Jul 10 08:47:49 2013 +0300 @@ -1134,11 +1134,11 @@ 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 @@ (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)