summaryrefslogtreecommitdiffstats
path: root/imap/Makefile.am
diff options
context:
space:
mode:
authorSam Varshavchik2013-11-10 20:07:18 -0500
committerSam Varshavchik2013-11-10 21:55:21 -0500
commit4d91075b1b90f68527304b45bb26637a17e1454d (patch)
treedde479f63ba4470a3e9c4210b79cda13d0aab4c4 /imap/Makefile.am
parent37a74ee0f736237b67330c620de7dc08232dec17 (diff)
downloadcourier-libs-4d91075b1b90f68527304b45bb26637a17e1454d.tar.bz2
Update DH parameter configuration scripts.
* libs/tcpd/libcouriergnutls.c, libs/tcpd/libcouriertls.c: remove the TLS_DHCERTFILE setting, and use TLS_CERTFILE for all functionality. Read DH parameters from TLS_CERTFILE, or from the new TLS_DHPARAMS environment variable. * mkdhparams: New script that generates DH parameters into a standalone file. * Remove TLS_DHCERTFILE setting from imapd-ssl, pop3d-ssl, esmtpd and esmtpd-ssl. Add TLS_DHPARAMS. * Update imapd.cnf.openssl, pop3d.cnf.openssl, esmtpd.cnf.openssl, set default number of bits for RSA keys to 4096.
Diffstat (limited to 'imap/Makefile.am')
-rw-r--r--imap/Makefile.am18
1 files changed, 17 insertions, 1 deletions
diff --git a/imap/Makefile.am b/imap/Makefile.am
index 46a1e41..ef36662 100644
--- a/imap/Makefile.am
+++ b/imap/Makefile.am
@@ -8,22 +8,25 @@ BUILT_SOURCES=README.proxy
DISTCLEANFILES=imapd.pam pop3d.pam imapd.cnf pop3d.cnf
CLEANFILES=imapd.8 imapd.html mkimapdcert.html mkimapdcert.8 \
+ mkdhparams.html mkdhparams.8 \
courierpop3d.html courierpop3d.8 mkpop3dcert.html mkpop3dcert.8
EXTRA_DIST=testsuite testsuite.txt smaptestsuite smaptestsuite.txt \
BUGS BUGS.html README README.html imapd.authpam \
pop3d.authpam system-auth.authpam system-auth2.authpam\
imapd.html.in imapd.8.in \
+ mkdhparams.html.in mkdhparams.8.in \
mkimapdcert.html.in mkimapdcert.8.in \
mkpop3dcert.html.in mkpop3dcert.8.in \
courierpop3d.html.in courierpop3d.8.in \
README.proxy README.proxy.html \
imapd.cnf.gnutls pop3d.cnf.gnutls
-noinst_SCRIPTS=mkimapdcert mkpop3dcert
+noinst_SCRIPTS=mkimapdcert mkpop3dcert mkdhparams
noinst_PROGRAMS=imaplogin imapd pop3login pop3d
noinst_DATA=imapd.8 imapd.html imapd.cnf pop3d.cnf \
+ mkdhparams.html mkdhparams.8 \
mkimapdcert.html mkimapdcert.8 \
mkpop3dcert.html mkpop3dcert.8 \
courierpop3d.html courierpop3d.8
@@ -102,6 +105,12 @@ imapd.html: imapd.html.in
imapd.8: imapd.8.in
./config.status --file=imapd.8
+mkdhparams.html: mkdhparams.html.in
+ ./config.status --file=mkdhparams.html
+
+mkdhparams.8: mkdhparams.8.in
+ ./config.status --file=mkdhparams.8
+
mkimapdcert.html: mkimapdcert.html.in
./config.status --file=mkimapdcert.html
@@ -128,6 +137,13 @@ imapd.8.in: imapd.sgml ../docbook/sgml2man
../docbook/sgml2man imapd.sgml imapd.8.in
mv imapd.8 imapd.8.in
+mkdhparams.html.in: mkdhparams.sgml ../docbook/sgml2html
+ ../docbook/sgml2html mkdhparams.sgml mkdhparams.html.in
+
+mkdhparams.8.in: mkdhparams.sgml ../docbook/sgml2man
+ ../docbook/sgml2man mkdhparams.sgml mkdhparams.8.in
+ mv mkdhparams.8 mkdhparams.8.in
+
mkimapdcert.html.in: mkimapdcert.sgml ../docbook/sgml2html
../docbook/sgml2html mkimapdcert.sgml mkimapdcert.html.in