Skip to content

configure: Fix build with old OpenSSL without SSL_clear_options #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

configure: Fix build with old OpenSSL without SSL_clear_options #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions m4/ssl.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,28 @@ AC_DEFUN([DOVECOT_SSL], [
AC_DEFINE(HAVE_OPENSSL,, [Build with OpenSSL support])
have_ssl="yes (OpenSSL)"

# SSL_clear_options introduced in openssl 0.9.8m but may be backported to
# older versions in "enterprise" OS releases; originally implemented as a
# macro but as a function in more recent openssl versions
AC_CACHE_CHECK([whether SSL_clear_options exists],i_cv_have_ssl_clear_options,[
old_LIBS=$LIBS
LIBS="$LIBS -lssl"
AC_TRY_LINK([
#include <openssl/ssl.h>
], [
SSL *ssl;
long options;
SSL_clear_options(ssl, options);
], [
i_cv_have_ssl_clear_options=yes
], [
i_cv_have_ssl_clear_options=no
])
LIBS=$old_LIBS
])
if test $i_cv_have_ssl_clear_options = yes; then
AC_DEFINE(HAVE_SSL_CLEAR_OPTIONS,, [Define if you have SSL_clear_options])
fi
AC_CHECK_LIB(ssl, SSL_get_current_compression, [
AC_DEFINE(HAVE_SSL_COMPRESSION,, [Build with OpenSSL compression])
],, $SSL_LIBS)
Expand Down
2 changes: 2 additions & 0 deletions src/lib-ssl-iostream/iostream-openssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,9 @@ openssl_iostream_set(struct ssl_iostream *ssl_io,
if (set->prefer_server_ciphers)
SSL_set_options(ssl_io->ssl, SSL_OP_CIPHER_SERVER_PREFERENCE);
if (set->protocols != NULL) {
#if defined(HAVE_SSL_CLEAR_OPTIONS)
SSL_clear_options(ssl_io->ssl, OPENSSL_ALL_PROTOCOL_OPTIONS);
#endif
SSL_set_options(ssl_io->ssl,
openssl_get_protocol_options(set->protocols));
}
Expand Down