dovecot-2.0: Compile fix for some OpenSSL version.
dovecot at dovecot.org
dovecot at dovecot.org
Fri Aug 13 16:00:51 EEST 2010
details: http://hg.dovecot.org/dovecot-2.0/rev/53147e8bdaf9
changeset: 11995:53147e8bdaf9
user: Timo Sirainen <tss at iki.fi>
date: Fri Aug 13 14:00:46 2010 +0100
description:
Compile fix for some OpenSSL version.
diffstat:
configure.in | 3 +++
src/login-common/ssl-proxy-openssl.c | 8 ++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diffs (45 lines):
diff -r a56e9deffa54 -r 53147e8bdaf9 configure.in
--- a/configure.in Thu Aug 12 18:50:12 2010 +0100
+++ b/configure.in Fri Aug 13 14:00:46 2010 +0100
@@ -1696,6 +1696,9 @@
AC_CHECK_LIB(ssl, SSL_get_current_compression, [
AC_DEFINE(HAVE_SSL_COMPRESSION,, Build with OpenSSL compression)
],, $SSL_LIBS)
+ AC_CHECK_LIB(ssl, SSL_get_servername, [
+ AC_DEFINE(HAVE_SSL_GET_SERVERNAME,, Build with TLS hostname support)
+ ],, $SSL_LIBS)
fi
fi
diff -r a56e9deffa54 -r 53147e8bdaf9 src/login-common/ssl-proxy-openssl.c
--- a/src/login-common/ssl-proxy-openssl.c Thu Aug 12 18:50:12 2010 +0100
+++ b/src/login-common/ssl-proxy-openssl.c Fri Aug 13 14:00:46 2010 +0100
@@ -31,6 +31,10 @@
#define SSL_PARAMETERS_PATH "ssl-params"
+#ifndef SSL_CTRL_SET_TLSEXT_HOSTNAME /* FIXME: this may be unnecessary.. */
+# undef HAVE_SSL_GET_SERVERNAME
+#endif
+
enum ssl_io_action {
SSL_ADD_INPUT,
SSL_REMOVE_INPUT,
@@ -1062,7 +1066,7 @@
return ret;
}
-#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
+#ifdef HAVE_SSL_GET_SERVERNAME
static void ssl_servername_callback(SSL *ssl, int *al ATTR_UNUSED,
void *context ATTR_UNUSED)
{
@@ -1116,7 +1120,7 @@
ssl_proxy_get_use_certificate_error(ctx->cert));
}
-#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
+#ifdef HAVE_SSL_GET_SERVERNAME
if (SSL_CTX_set_tlsext_servername_callback(ctx->ctx,
ssl_servername_callback) != 1) {
if (set->verbose_ssl)
More information about the dovecot-cvs
mailing list