1 files changed, 57 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index 9230887..15a0e54 100644
--- a/Makefile
+++ b/Makefile
@@ -136,6 +136,10 @@ auto_usera.o: \
 compile auto_usera.c
         ./compile auto_usera.c
 
+base64.o: \
+compile base64.c base64.h stralloc.h substdio.h str.h
+        ./compile base64.c
+
 binm1: \
 binm1.sh conf-qmail
         cat binm1.sh \
@@ -808,7 +812,7 @@ dnsptr dnsip dnsmxip dnsfq hostname ipmeprint qreceipt qsmhook qbiff \
 forward preline condredirect bouncesaying except maildirmake \
 maildir2mbox maildirwatch qail elq pinq idedit install-big install \
 instcheck home home+df proc proc+df binm1 binm1+df binm2 binm2+df \
-binm3 binm3+df
+binm3 binm3+df update_tmprsadh
 
 load: \
 make-load warn-auto.sh systype
@@ -1441,12 +1445,13 @@ qmail-remote: \
 load qmail-remote.o control.o constmap.o timeoutread.o timeoutwrite.o \
 timeoutconn.o tcpto.o now.o dns.o ip.o ipalloc.o ipme.o quote.o \
 ndelay.a case.a sig.a open.a lock.a seek.a getln.a stralloc.a alloc.a \
-substdio.a error.a str.a fs.a auto_qmail.o dns.lib socket.lib
+substdio.a error.a str.a fs.a auto_qmail.o base64.o dns.lib socket.lib
         ./load qmail-remote control.o constmap.o timeoutread.o \
         timeoutwrite.o timeoutconn.o tcpto.o now.o dns.o ip.o \
+        tls.o ssl_timeoutio.o -L/usr/local/ssl/lib -lssl -lcrypto \
         ipalloc.o ipme.o quote.o ndelay.a case.a sig.a open.a \
         lock.a seek.a getln.a stralloc.a alloc.a substdio.a error.a \
-        str.a fs.a auto_qmail.o  `cat dns.lib` `cat socket.lib`
+        str.a fs.a auto_qmail.o base64.o `cat dns.lib` `cat socket.lib`
 
 qmail-remote.0: \
 qmail-remote.8
@@ -1532,16 +1537,17 @@ auto_split.h
         ./compile qmail-showctl.c
 
 qmail-smtpd: \
-load qmail-smtpd.o rcpthosts.o commands.o timeoutread.o \
+load qmail-smtpd.o rcpthosts.o qregex.o commands.o timeoutread.o \
 timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o received.o \
 date822fmt.o now.o qmail.o cdb.a fd.a wait.a datetime.a getln.a \
-open.a sig.a case.a env.a stralloc.a alloc.a substdio.a error.a str.a \
-fs.a auto_qmail.o socket.lib
-        ./load qmail-smtpd rcpthosts.o commands.o timeoutread.o \
+open.a sig.a case.a env.a stralloc.a alloc.a strerr.a substdio.a error.a str.a \
+fs.a auto_qmail.o base64.o socket.lib
+        ./load qmail-smtpd qregex.o rcpthosts.o commands.o timeoutread.o \
         timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o \
+        tls.o ssl_timeoutio.o ndelay.a -L/usr/local/ssl/lib -lssl -lcrypto \
         received.o date822fmt.o now.o qmail.o cdb.a fd.a wait.a \
         datetime.a getln.a open.a sig.a case.a env.a stralloc.a \
-        alloc.a substdio.a error.a str.a fs.a auto_qmail.o  `cat \
+        alloc.a strerr.a substdio.a error.a str.a fs.a auto_qmail.o base64.o  `cat \
         socket.lib`
 
 qmail-smtpd.0: \
@@ -1553,7 +1559,7 @@ compile qmail-smtpd.c sig.h readwrite.h stralloc.h gen_alloc.h \
 substdio.h alloc.h auto_qmail.h control.h received.h constmap.h \
 error.h ipme.h ip.h ipalloc.h ip.h gen_alloc.h ip.h qmail.h \
 substdio.h str.h fmt.h scan.h byte.h case.h env.h now.h datetime.h \
-exit.h rcpthosts.h timeoutread.h timeoutwrite.h commands.h
+exit.h rcpthosts.h timeoutread.h timeoutwrite.h commands.h base64.h
         ./compile qmail-smtpd.c
 
 qmail-start: \
@@ -1681,6 +1687,10 @@ compile rcpthosts.c cdb.h uint32.h byte.h open.h error.h control.h \
 constmap.h stralloc.h gen_alloc.h rcpthosts.h
         ./compile rcpthosts.c
 
+qregex.o: \
+compile qregex.c qregex.h
+        ./compile qregex.c
+
 readsubdir.o: \
 compile readsubdir.c readsubdir.h direntry.h fmt.h scan.h str.h \
 auto_split.h
@@ -1827,7 +1837,8 @@ date822fmt.h date822fmt.c dns.h dns.c trylsock.c tryrsolv.c ip.h ip.c \
 ipalloc.h ipalloc.c select.h1 select.h2 trysysel.c ndelay.h ndelay.c \
 ndelay_off.c direntry.3 direntry.h1 direntry.h2 trydrent.c prot.h \
 prot.c chkshsgr.c warn-shsgr tryshsgr.c ipme.h ipme.c trysalen.c \
-maildir.5 maildir.h maildir.c tcp-environ.5 constmap.h constmap.c
+maildir.5 maildir.h maildir.c tcp-environ.5 constmap.h constmap.c \
+update_tmprsadh
         shar -m `cat FILES` > shar
         chmod 400 shar
 
@@ -2108,6 +2119,19 @@ timeoutwrite.o: \
 compile timeoutwrite.c timeoutwrite.h select.h error.h readwrite.h
         ./compile timeoutwrite.c
 
+qmail-smtpd: tls.o ssl_timeoutio.o ndelay.a
+qmail-remote: tls.o ssl_timeoutio.o
+qmail-smtpd.o: tls.h ssl_timeoutio.h
+qmail-remote.o: tls.h ssl_timeoutio.h
+
+tls.o: \
+compile tls.c exit.h error.h
+        ./compile tls.c
+
+ssl_timeoutio.o: \
+compile ssl_timeoutio.c ssl_timeoutio.h select.h error.h ndelay.h
+        ./compile ssl_timeoutio.c
+
 token822.o: \
 compile token822.c stralloc.h gen_alloc.h alloc.h str.h token822.h \
 gen_alloc.h gen_allocdefs.h
@@ -2139,3 +2163,26 @@ compile wait_nohang.c haswaitp.h
 wait_pid.o: \
 compile wait_pid.c error.h haswaitp.h
         ./compile wait_pid.c
+
+cert cert-req: \
+Makefile-cert
+        @$(MAKE) -sf $< $@
+
+Makefile-cert: \
+conf-qmail conf-users conf-groups Makefile-cert.mk
+        @cat Makefile-cert.mk \
+        | sed s}QMAIL}"`head -1 conf-qmail`"}g \
+        > $@
+
+update_tmprsadh: \
+conf-qmail conf-users conf-groups update_tmprsadh.sh
+        @cat update_tmprsadh.sh\
+        | sed s}UGQMAILD}"`head -2 conf-users|tail -1`:`head -1 conf-groups`"}g \
+        | sed s}QMAIL}"`head -1 conf-qmail`"}g \
+        > $@
+        chmod 755 update_tmprsadh 
+
+tmprsadh: \
+update_tmprsadh
+        echo "Creating new temporary RSA and DH parameters"
+        ./update_tmprsadh