Commit 8a1d5acc authored by Brendan Cully's avatar Brendan Cully

Put moribund NSS support out to pasture.

parent 160b82f6
......@@ -586,31 +586,6 @@ AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl[=PFX]], [Compile in SSL support for
fi
])
AM_CONDITIONAL(USE_SSL, test x$need_ssl = xyes)
dnl SSL support via NSS
AC_ARG_WITH(nss, AC_HELP_STRING([--with-nss[=PFX]], [Compile in SSL support for POP/IMAP via NSS]),
[ if test "$with_nss" != no
then
if test "$need_socket" != "yes"; then
AC_MSG_ERROR([SSL support is only useful with POP or IMAP support])
fi
if test "$with_nss" != "yes"
then
LDFLAGS="$LDFLAGS -L$withval/lib"
CPPFLAGS="$CPPFLAGS -I$withval/include -I$withval/public/security"
fi
AC_DEFINE(USE_NSS,1,[ Define if you want support for SSL via the NSS library. ])
MUTTLIBS="$MUTTLIBS -lssl -lnss -lcertdb -lcerthi -lcryptohi"
MUTTLIBS="$MUTTLIBS -lpk11wrap -lsoftoken -lsecutil -ldbm -lplds4 -lplc4 -lfreebl"
MUTTLIBS="$MUTTLIBS -lnspr4"
MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_ssl_nss.o"
need_ssl=yes
fi
])
AC_ARG_WITH([gnutls], AC_HELP_STRING([--with-gnutls[=PFX]], [Enable SSL support using gnutls]),
[gnutls_prefix="$withval"], [gnutls_prefix="no"])
......@@ -632,6 +607,7 @@ then
AC_MSG_ERROR([could not find libgnutls])
])
fi
AM_CONDITIONAL(USE_SSL, test x$need_ssl = xyes)
AC_ARG_WITH(sasl, AC_HELP_STRING([--with-sasl[=PFX]], [Use Cyrus SASL library for POP/IMAP authentication]),
[
......
......@@ -110,14 +110,14 @@ WHERE char *Signature;
WHERE char *SimpleSearch;
WHERE char *Spoolfile;
WHERE char *SpamSep;
#if defined(USE_SSL) || defined(USE_NSS) || defined(USE_GNUTLS)
#if defined(USE_SSL) || defined(USE_GNUTLS)
WHERE char *SslCertFile INITVAL (NULL);
#endif
#ifdef USE_SSL
WHERE char *SslClientCert INITVAL (NULL);
WHERE LIST *SslSessionCerts INITVAL (NULL);
#endif
#if defined(USE_SSL) || defined(USE_NSS)
#if defined(USE_SSL)
WHERE char *SslEntropyFile INITVAL (NULL);
#endif
#ifdef USE_GNUTLS
......
......@@ -31,7 +31,7 @@
#include "mutt_crypt.h"
#include "mutt_idna.h"
#if defined(USE_SSL) || defined(USE_NSS) || defined(USE_GNUTLS)
#if defined(USE_SSL) || defined(USE_GNUTLS)
#include "mutt_ssl.h"
#endif
......
......@@ -1878,7 +1878,7 @@ struct option_t MuttVars[] = {
** (S/MIME only)
*/
#if defined(USE_SSL)||defined(USE_NSS)||defined(USE_GNUTLS)
#if defined(USE_SSL) || defined(USE_GNUTLS)
#ifdef USE_SSL
{ "ssl_client_cert", DT_PATH, R_NONE, UL &SslClientCert, 0 },
/*
......
......@@ -376,7 +376,7 @@ enum
OPTIMAPFORCESSL,
# endif
#endif
#if defined(USE_SSL) || defined(USE_NSS) || defined(USE_GNUTLS)
#if defined(USE_SSL) || defined(USE_GNUTLS)
# ifndef USE_GNUTLS
OPTSSLV2,
# endif
......
......@@ -243,8 +243,7 @@ dprint(1,(debugfile, "local ip: %s, remote ip:%s\n", iplocalport, ipremoteport))
/*** set sasl IP properties, necessary for use with krb4 ***/
/* Do we need to fail if this fails? I would assume having these unset
* would just disable KRB4. Who wrote this code? I'm not sure how this
* interacts with the NSS code either, since that mucks with the fd. */
* would just disable KRB4. Who wrote this code? */
#ifndef USE_SASL2 /* with SASLv2 this all happens in sasl_client_new */
{
struct sockaddr_in local, remote;
......@@ -294,10 +293,6 @@ dprint(1,(debugfile, "local ip: %s, remote ip:%s\n", iplocalport, ipremoteport))
return -1;
}
/* we currently don't have an SSF finder for NSS (I don't know the API).
* If someone does it'd probably be trivial to write mutt_nss_get_ssf().
* I have a feeling more SSL code could be shared between those two files,
* but I haven't looked into it yet, since I still don't know the APIs. */
#if defined(USE_SSL) || defined(USE_GNUTLS)
if (conn->ssf)
{
......
......@@ -26,7 +26,7 @@
#include "globals.h"
#include "mutt_socket.h"
#include "mutt_tunnel.h"
#if defined(USE_SSL) || defined(USE_GNUTLS) || defined(USE_NSS)
#if defined(USE_SSL) || defined(USE_GNUTLS)
# include "mutt_ssl.h"
#endif
......@@ -259,8 +259,6 @@ CONNECTION* mutt_conn_find (const CONNECTION* start, const ACCOUNT* account)
{
#ifdef USE_SSL
ssl_socket_setup (conn);
#elif USE_NSS
mutt_nss_socket_setup (conn);
#elif USE_GNUTLS
if (mutt_gnutls_socket_setup (conn) < 0)
{
......
......@@ -31,7 +31,4 @@ int mutt_gnutls_starttls (CONNECTION* conn);
extern int mutt_gnutls_socket_setup (CONNECTION *conn);
#endif
#ifdef USE_NSS
int mutt_nss_socket_setup (CONNECTION* conn);
#endif
#endif /* _MUTT_SSL_H_ */
This diff is collapsed.
......@@ -274,7 +274,7 @@ int pop_open_connection (POP_DATA *pop_data)
return -2;
}
#if (defined(USE_SSL) || defined(USE_GNUTLS)) && !defined(USE_NSS)
#if defined(USE_SSL) || defined(USE_GNUTLS)
/* Attempt STLS if available and desired. */
if (pop_data->cmd_stls && !pop_data->conn->ssf)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment