From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Mon, 28 Nov 2016 11:36:56 +0000 (+0200)
Subject: mail-crypt: Skip undef values if OpenSSL is <1.0.2
X-Git-Tag: 2.2.27~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=187826a29f379fd0cb1e473f1437e0fde63a3f23;p=thirdparty%2Fdovecot%2Fcore.git

mail-crypt: Skip undef values if OpenSSL is <1.0.2

OpenSSL 1.0.1 and earlier generate undef warnings due
to using stack as randomness source in a way that
valgrind does not like, so we disable undef value
checks for mail-crypt-plugin.
---

diff --git a/src/plugins/mail-crypt/Makefile.am b/src/plugins/mail-crypt/Makefile.am
index 60f4ee81b3..706e700bf1 100644
--- a/src/plugins/mail-crypt/Makefile.am
+++ b/src/plugins/mail-crypt/Makefile.am
@@ -13,6 +13,12 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/doveadm \
 	-I$(top_srcdir)/src/plugins/acl
 
+if SSL_VERSION_GE_102
+test_options =
+else !SSL_VERSION_GE_102
+test_options = NOUNDEF=1
+endif !SSL_VERSION_GE_102
+
 doveadm_moduledir = $(moduledir)/doveadm
 
 NOPLUGIN_LDFLAGS =
@@ -105,7 +111,7 @@ noinst_HEADERS = \
 check: check-am check-test
 check-test: all-am
 	for bin in $(test_programs); do \
-	  if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
+	  if ! env $(test_options) $(RUN_TEST) ./$$bin; then exit 1; fi; \
 	done
 
 noinst_PROGRAMS = $(test_programs)