annotate src/lib-dcrypt/Makefile.am @ 22310:a28f5bfb15fc

fts: Do not attempt to deinitialize backend if it's not set If FTS backend initialization fails or does not happen, flist->backend might end up being NULL, and attempt to deinitialize NULL won't end well.
author Aki Tuomi <aki.tuomi@dovecot.fi>
date Wed, 17 May 2017 12:26:42 +0300
parents 8e72ed38d967
children be9f846908b4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
20215
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
1 noinst_LTLIBRARIES = libdcrypt.la
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
2 pkglib_LTLIBRARIES =
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
3
20757
d06029ae9816 lib-dcrypt: Set NOPLUGIN_LDFLAGS to empty
Aki Tuomi <aki.tuomi@dovecot.fi>
parents: 20756
diff changeset
4 NOPLUGIN_LDFLAGS=
d06029ae9816 lib-dcrypt: Set NOPLUGIN_LDFLAGS to empty
Aki Tuomi <aki.tuomi@dovecot.fi>
parents: 20756
diff changeset
5
20215
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
6 AM_CPPFLAGS = \
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
7 -I$(top_srcdir)/src/lib \
20374
4b52d1ddcb3d lib-dcrypt, lib-ssl-iostream: Share OpenSSL init/deinit code.
Timo Sirainen <timo.sirainen@dovecot.fi>
parents: 20336
diff changeset
8 -I$(top_srcdir)/src/lib-test \
21232
7bb1cb2102d4 lib-dcrypt: Use module_dir setting
Aki Tuomi <aki.tuomi@dovecot.fi>
parents: 20757
diff changeset
9 -I$(top_srcdir)/src/lib-ssl-iostream \
7bb1cb2102d4 lib-dcrypt: Use module_dir setting
Aki Tuomi <aki.tuomi@dovecot.fi>
parents: 20757
diff changeset
10 -DDCRYPT_MODULE_DIR=\"$(pkglibdir)\"
20215
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
11
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
12 libdcrypt_la_SOURCES = \
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
13 dcrypt.c \
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
14 istream-decrypt.c \
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
15 ostream-encrypt.c
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
16
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
17 libdcrypt_la_CFLAGS = $(AM_CPPFLAGS) \
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
18 -DDCRYPT_MODULE_DIR=\"$(pkglibdir)\"
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
19
20496
bb728a4cbbde dcrypt: Fix linkage into libdovecot.so
Aki Tuomi <aki.tuomi@dovecot.fi>
parents: 20414
diff changeset
20 libdcrypt_la_LDFLAGS = -export-dynamic
bb728a4cbbde dcrypt: Fix linkage into libdovecot.so
Aki Tuomi <aki.tuomi@dovecot.fi>
parents: 20414
diff changeset
21
20623
d961f2a542d7 configure: Fix dcrypt build
Aki Tuomi <aki.tuomi@dovecot.fi>
parents: 20596
diff changeset
22 if BUILD_DCRYPT_OPENSSL
20215
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
23 pkglib_LTLIBRARIES += libdcrypt_openssl.la
20756
b95de03bf502 lib-dcrypt: Makefile.am fix
Aki Tuomi <aki.tuomi@dovecot.fi>
parents: 20630
diff changeset
24 libdcrypt_openssl_la_SOURCES = dcrypt-openssl.c
21487
8e72ed38d967 lib-ssl-iostream: Remove libdovecot_openssl_common.la
Timo Sirainen <timo.sirainen@dovecot.fi>
parents: 21485
diff changeset
25 libdcrypt_openssl_la_LDFLAGS = -module -avoid-version ../lib-ssl-iostream/libssl_iostream_openssl.la
20630
b1831491a9d7 OpenSSL: link against OpenSSL libs explicitly
Aki Tuomi <aki.tuomi@dovecot.fi>
parents: 20623
diff changeset
26 libdcrypt_openssl_la_LIBADD = $(SSL_LIBS)
21487
8e72ed38d967 lib-ssl-iostream: Remove libdovecot_openssl_common.la
Timo Sirainen <timo.sirainen@dovecot.fi>
parents: 21485
diff changeset
27 libdcrypt_openssl_la_DEPENDENCIES = ../lib-ssl-iostream/libssl_iostream_openssl.la
20215
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
28 libdcrypt_openssl_la_CFLAGS = $(AM_CPPFLAGS) \
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
29 $(SSL_CFLAGS)
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
30 endif
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
31
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
32 headers = \
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
33 dcrypt.h \
20596
9a2ac2a69648 lib-dcrypt: add dcrypt-iostream.h
Martti Rannanjärvi <martti.rannanjarvi@dovecot.fi>
parents: 20496
diff changeset
34 dcrypt-iostream.h \
20215
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
35 dcrypt-private.h \
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
36 ostream-encrypt.h \
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
37 istream-decrypt.h
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
38
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
39 pkginc_libdir=$(pkgincludedir)
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
40 pkginc_lib_HEADERS = $(headers)
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
41
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
42 EXTRA_DIST = \
20225
d7f5154677c2 lib-dcrypt: Use base64 encoded test samples
Aki Tuomi <aki.tuomi@dovecot.fi>
parents: 20222
diff changeset
43 sample-v1.asc \
20414
53420df74e2f lib-dcrypt: Added sample-v1_short.asc to EXTRA_DIST
Timo Sirainen <timo.sirainen@dovecot.fi>
parents: 20375
diff changeset
44 sample-v1_short.asc \
20225
d7f5154677c2 lib-dcrypt: Use base64 encoded test samples
Aki Tuomi <aki.tuomi@dovecot.fi>
parents: 20222
diff changeset
45 sample-v2.asc
20215
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
46
20311
f12074f591ec lib-dcrypt: Fix various problems
Aki Tuomi <aki.tuomi@dovecot.fi>
parents: 20304
diff changeset
47 test_programs = test-crypto test-stream
f12074f591ec lib-dcrypt: Fix various problems
Aki Tuomi <aki.tuomi@dovecot.fi>
parents: 20304
diff changeset
48 noinst_PROGRAMS = $(test_programs)
20215
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
49
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
50 check: check-am check-test
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
51
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
52 check-test: all-am
20311
f12074f591ec lib-dcrypt: Fix various problems
Aki Tuomi <aki.tuomi@dovecot.fi>
parents: 20304
diff changeset
53 for bin in $(test_programs); do \
20215
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
54 if ! $(RUN_TEST) ./$$bin; then exit 1; fi; \
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
55 done
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
56
20375
bbb6f93e87f0 lib-dcrypt: Added library dependencies to unit tests
Timo Sirainen <timo.sirainen@dovecot.fi>
parents: 20374
diff changeset
57 LIBDOVECOT_TEST_DEPS = \
21485
4b800f12d757 lib-dcrypt: Link unit tests with libssl_iostream.la
Timo Sirainen <timo.sirainen@dovecot.fi>
parents: 21484
diff changeset
58 ../lib-ssl-iostream/libssl_iostream.la \
20215
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
59 ../lib-test/libtest.la \
20375
bbb6f93e87f0 lib-dcrypt: Added library dependencies to unit tests
Timo Sirainen <timo.sirainen@dovecot.fi>
parents: 20374
diff changeset
60 ../lib/liblib.la
bbb6f93e87f0 lib-dcrypt: Added library dependencies to unit tests
Timo Sirainen <timo.sirainen@dovecot.fi>
parents: 20374
diff changeset
61 LIBDOVECOT_TEST = \
bbb6f93e87f0 lib-dcrypt: Added library dependencies to unit tests
Timo Sirainen <timo.sirainen@dovecot.fi>
parents: 20374
diff changeset
62 $(LIBDOVECOT_TEST_DEPS) \
20215
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
63 $(MODULE_LIBS)
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
64
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
65 test_crypto_LDADD = $(LIBDOVECOT_TEST)
20375
bbb6f93e87f0 lib-dcrypt: Added library dependencies to unit tests
Timo Sirainen <timo.sirainen@dovecot.fi>
parents: 20374
diff changeset
66 test_crypto_DEPENDENCIES = $(LIBDOVECOT_TEST_DEPS)
21232
7bb1cb2102d4 lib-dcrypt: Use module_dir setting
Aki Tuomi <aki.tuomi@dovecot.fi>
parents: 20757
diff changeset
67 test_crypto_CFLAGS = $(AM_CPPFLAGS) -DDCRYPT_SRC_DIR=\"$(top_srcdir)/src/lib-dcrypt\"
20215
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
68 test_crypto_SOURCES = $(libdcrypt_la_SOURCES) test-crypto.c
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
69
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
70 test_stream_LDADD = $(LIBDOVECOT_TEST)
20375
bbb6f93e87f0 lib-dcrypt: Added library dependencies to unit tests
Timo Sirainen <timo.sirainen@dovecot.fi>
parents: 20374
diff changeset
71 test_stream_DEPENDENCIES = $(LIBDOVECOT_TEST_DEPS)
21232
7bb1cb2102d4 lib-dcrypt: Use module_dir setting
Aki Tuomi <aki.tuomi@dovecot.fi>
parents: 20757
diff changeset
72 test_stream_CFLAGS = $(AM_CPPFLAGS) -DDCRYPT_SRC_DIR=\"$(top_srcdir)/src/lib-dcrypt\"
20215
389c5094c2a8 lib-dcrypt: Initial implementation
Aki Tuomi <aki.tuomi@dovecot.fi>
parents:
diff changeset
73 test_stream_SOURCES = $(libdcrypt_la_SOURCES) test-stream.c