Removed TLS support. We don't need it anymore as we stopped talking SMTP

Libcrypto and thelike went away also, as they were needed only for TLS.

diff --git a/configure.in b/configure.in
index 29c0bc9..12c29ca 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -78,15 +78,6 @@ fi],
 AC_DEFINE(LOCALE)
 )
 
-dnl Do you want client-side support for encryption with TLS?
-AC_ARG_WITH(tls, AS_HELP_STRING([--with-tls], [Enable TLS support]))
-if test x"$with_tls" != x -a x"$with_tls" != x"no"; then
-  AC_DEFINE(TLS_SUPPORT, 1, [Support TLS for session encryption.])dnl
-  tls_support=yes
-else
-  tls_support=no
-fi
-
 dnl What should be the default editor?
 AC_ARG_WITH(editor,
   AS_HELP_STRING([--with-editor=EDITOR],[specify the default editor]))
@@ -596,17 +587,6 @@ else
 fi
 
 
-dnl -----------------
-dnl CHECK FOR OPENSSL
-dnl -----------------
-
-AS_IF([test x"$tls_support" = x"yes"],[
-  AC_CHECK_HEADER([openssl/ssl.h], , [AC_MSG_ERROR([openssl/ssl.h not found])])
-  AC_CHECK_LIB([crypto], [BIO_write], ,
-    [AC_MSG_ERROR([OpenSSL crypto library not found])])
-  AC_CHECK_LIB([ssl], [SSL_library_init], ,
-    [AC_MSG_ERROR([OpenSSL library not found])])])
-
 dnl ---------------------
 dnl CHECK TERMCAP LIBRARY
 dnl ---------------------
@@ -923,6 +903,5 @@ backup prefix              : ${backup_prefix}
 file locking type          : ${LOCKTYPE}
 default editor             : ${editorpath}
 default pager              : ${pagerpath}
-email address masquerading : ${masquerade}
-TLS support                : ${tls_support}"
+email address masquerading : ${masquerade}"
 echo ""

diff --git a/man/mh-chart.man b/man/mh-chart.man
index 603e34a..0c413f8 100644 (file)
--- a/man/mh-chart.man
+++ b/man/mh-chart.man
@@ -520,7 +520,6 @@ or
 .RB [ \-width
 .IR columns ]
 .I file
-.RB [ \-tls ]
 .RB [ \-version ]
 .RB [ \-help ]
 
@@ -700,7 +699,6 @@ all/to/cc/me]
 .IR seconds ]
 .RB [ \-verbose " | " \-noverbose ]
 .RB [ \-watch " | " \-nowatch ]
-.RB [ \-tls ]
 .RB [ \-width
 .IR columns ]
 .RB [ file

diff --git a/man/post.man b/man/post.man
index 85edbc4..2f771da 100644 (file)
--- a/man/post.man
+++ b/man/post.man
@@ -181,16 +181,6 @@ switches can be used to override the default mail server (defined by the
 entry in
 .I %etcdir%/mts.conf
 ).
-.PP
-If
-.B nmh
-has been compiled with TLS support, the
-.B \-tls
-switch will require the negotiation of TLS support when connecting to the
-SMTP MTA.  Encrypted data is labelled with `(tls-encrypted)' and
-`(tls-decrypted)' when viewing the SMTP transction with the
-.B \-snoop
-switch.
 
 .SH FILES
 .fc ^ ~

diff --git a/man/send.man b/man/send.man
index e18ed20..6fa3547 100644 (file)
--- a/man/send.man
+++ b/man/send.man
@@ -323,16 +323,6 @@ entry in
 .I %etcdir%/mts.conf
 ).
 .PP
-If
-.B nmh
-has been compiled with TLS support, the
-.B \-tls
-switch will require the negotiation of TLS support when connecting to the
-SMTP MTA.  Encrypted data is labelled with `(tls-encrypted)' and
-`(tls-decrypted)' when viewing the SMTP transction with the
-.B \-snoop
-switch.
-.PP
 The files specified by the profile entry \*(lqAliasfile:\*(rq and any
 additional alias files given by the
 .B \-alias

diff --git a/uip/send.c b/uip/send.c
index a97bab8..c8b77f7 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -13,12 +13,6 @@
 #include <signal.h>
 
 
-#ifndef TLS_SUPPORT
-# define TLSminc(a)  (a)
-#else /* TLS_SUPPORT */
-# define TLSminc(a)   0
-#endif /* TLS_SUPPORT */
-
 static struct swit switches[] = {
 #define        ALIASW                 0
     { "alias aliasfile", 0 },
@@ -100,8 +94,6 @@ static struct swit switches[] = {
     { "attachformat", 7 },
 #define PORTSW               42
     { "port server-port-name/number" , 4 },
-#define TLSSW                43
-    { "tls", TLSminc(-3) },
     { NULL, 0 }
 };
 
@@ -258,7 +250,6 @@ main (int argc, char **argv)
                case SENDSW: 
                case SOMLSW: 
                case SNOOPSW: 
-               case TLSSW:
                    vec[vecp++] = --cp;
                    continue;
 

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index cb48bfd..4a29a64 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -977,12 +977,6 @@ check_draft (char *msgnam)
 }
 
 
-#ifndef TLS_SUPPORT
-# define TLSminc(a)  (a)
-#else /* TLS_SUPPORT */
-# define TLSminc(a)   0
-#endif /* TLS_SUPPORT */
-
 static struct swit  sendswitches[] = {
 #define        ALIASW            0
     { "alias aliasfile", 0 },
@@ -1062,8 +1056,6 @@ static struct swit  sendswitches[] = {
     { "attachformat", 7 },
 #define PORTSW           41
     { "port server-port-name/number", 4 },
-#define TLSSW            42
-    { "tls", TLSminc(-3) },
     { NULL, 0 }
 };
 
@@ -1217,7 +1209,6 @@ sendit (char *sp, char **arg, char *file, int pushed)
                case SSNDSW:
                case SOMLSW:
                case SNOOPSW:
-               case TLSSW:
                    vec[vecp++] = --cp;
                    continue;
 

diff --git a/uip/whom.c b/uip/whom.c
index 1d92ea3..1b1660f 100644 (file)
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -11,12 +11,6 @@
 #include <h/signals.h>
 #include <signal.h>
 
-#ifndef TLS_SUPPORT
-# define TLSminc(a)  (a)
-#else /* TLS_SUPPORT */
-# define TLSminc(a)   0
-#endif /* TLS_SUPPORT */
-
 static struct swit switches[] = {
 #define        ALIASW              0
     { "alias aliasfile", 0 },
@@ -44,8 +38,6 @@ static struct swit switches[] = {
     { "snoop", -5 },
 #define PORTSW            15
     { "port server port name/number", 4 },
-#define TLSSW             16
-    { "tls", TLSminc(-3) },
     { NULL, 0 }
 };