2008-10-11 [colin] 3.6.1cvs4

	* src/account.c
	* src/imap.c
	* src/inc.c
	* src/main.c
	* src/mainwindow.c
	* src/news.c
	* src/pop.c
	* src/pop.h
	* src/prefs_account.c
	* src/send_message.c
	* src/send_message.h
	* src/ssl_manager.c
	* src/ssl_manager.h
	* src/wizard.c
	* src/common/claws.c
	* src/common/defs.h
	* src/common/session.c
	* src/common/session.h
	* src/common/smtp.c
	* src/common/smtp.h
	* src/common/socket.c
	* src/common/socket.h
	* src/common/ssl.c
	* src/common/ssl.h
	* src/common/ssl_certificate.c
	* src/common/ssl_certificate.h
	* src/gtk/about.c
	* src/gtk/sslcertwindow.c
	* src/gtk/sslcertwindow.h
		Remove OpenSSL code

diff --git a/ChangeLog b/ChangeLog
index 2cec922a2fbc1346c3a74c1776145bbdad99e026..8273f0d8dc11b26c9053795b92477be728d5a56b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,36 @@
+2008-10-11 [colin]     3.6.1cvs4
+
+       * src/account.c
+       * src/imap.c
+       * src/inc.c
+       * src/main.c
+       * src/mainwindow.c
+       * src/news.c
+       * src/pop.c
+       * src/pop.h
+       * src/prefs_account.c
+       * src/send_message.c
+       * src/send_message.h
+       * src/ssl_manager.c
+       * src/ssl_manager.h
+       * src/wizard.c
+       * src/common/claws.c
+       * src/common/defs.h
+       * src/common/session.c
+       * src/common/session.h
+       * src/common/smtp.c
+       * src/common/smtp.h
+       * src/common/socket.c
+       * src/common/socket.h
+       * src/common/ssl.c
+       * src/common/ssl.h
+       * src/common/ssl_certificate.c
+       * src/common/ssl_certificate.h
+       * src/gtk/about.c
+       * src/gtk/sslcertwindow.c
+       * src/gtk/sslcertwindow.h
+               Remove OpenSSL code
+

 2008-10-11 [colin]     3.6.1cvs3
 
        * src/common/ssl_certificate.c
 2008-10-11 [colin]     3.6.1cvs3
 
        * src/common/ssl_certificate.c

diff --git a/PATCHSETS b/PATCHSETS
index f02c771920f62eef61ae6c56944130f623945751..b8d152845174eeb7352daabd93094d952394821e 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3585,3 +3585,4 @@
 ( cvs diff -u -r 1.4.2.30 -r 1.4.2.31 src/common/ssl_certificate.c;  cvs diff -u -r 1.9.2.24 -r 1.9.2.25 src/gtk/sslcertwindow.c;  ) > 3.6.1cvs1.patchset
 ( cvs diff -u -r 1.2.2.10 -r 1.2.2.11 src/common/ssl.h;  cvs diff -u -r 1.4.2.31 -r 1.4.2.32 src/common/ssl_certificate.c;  cvs diff -u -r 1.9.2.25 -r 1.9.2.26 src/gtk/sslcertwindow.c;  ) > 3.6.1cvs2.patchset
 ( cvs diff -u -r 1.4.2.32 -r 1.4.2.33 src/common/ssl_certificate.c;  ) > 3.6.1cvs3.patchset
 ( cvs diff -u -r 1.4.2.30 -r 1.4.2.31 src/common/ssl_certificate.c;  cvs diff -u -r 1.9.2.24 -r 1.9.2.25 src/gtk/sslcertwindow.c;  ) > 3.6.1cvs1.patchset
 ( cvs diff -u -r 1.2.2.10 -r 1.2.2.11 src/common/ssl.h;  cvs diff -u -r 1.4.2.31 -r 1.4.2.32 src/common/ssl_certificate.c;  cvs diff -u -r 1.9.2.25 -r 1.9.2.26 src/gtk/sslcertwindow.c;  ) > 3.6.1cvs2.patchset
 ( cvs diff -u -r 1.4.2.32 -r 1.4.2.33 src/common/ssl_certificate.c;  ) > 3.6.1cvs3.patchset

+( cvs diff -u -r 1.61.2.89 -r 1.61.2.90 src/account.c;  cvs diff -u -r 1.179.2.235 -r 1.179.2.236 src/imap.c;  cvs diff -u -r 1.149.2.96 -r 1.149.2.97 src/inc.c;  cvs diff -u -r 1.115.2.213 -r 1.115.2.214 src/main.c;  cvs diff -u -r 1.274.2.284 -r 1.274.2.285 src/mainwindow.c;  cvs diff -u -r 1.101.2.56 -r 1.101.2.57 src/news.c;  cvs diff -u -r 1.56.2.63 -r 1.56.2.64 src/pop.c;  cvs diff -u -r 1.17.2.21 -r 1.17.2.22 src/pop.h;  cvs diff -u -r 1.105.2.146 -r 1.105.2.147 src/prefs_account.c;  cvs diff -u -r 1.17.2.51 -r 1.17.2.52 src/send_message.c;  cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/send_message.h;  cvs diff -u -r 1.3.2.31 -r 1.3.2.32 src/ssl_manager.c;  cvs diff -u -r 1.2.2.8 -r 1.2.2.9 src/ssl_manager.h;  cvs diff -u -r 1.1.2.76 -r 1.1.2.77 src/wizard.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/common/claws.c;  cvs diff -u -r 1.9.2.45 -r 1.9.2.46 src/common/defs.h;  cvs diff -u -r 1.23.2.20 -r 1.23.2.21 src/common/session.c;  cvs diff -u -r 1.8.2.13 -r 1.8.2.14 src/common/session.h;  cvs diff -u -r 1.11.2.25 -r 1.11.2.26 src/common/smtp.c;  cvs diff -u -r 1.6.2.14 -r 1.6.2.15 src/common/smtp.h;  cvs diff -u -r 1.13.2.39 -r 1.13.2.40 src/common/socket.c;  cvs diff -u -r 1.13.2.20 -r 1.13.2.21 src/common/socket.h;  cvs diff -u -r 1.9.2.34 -r 1.9.2.35 src/common/ssl.c;  cvs diff -u -r 1.2.2.11 -r 1.2.2.12 src/common/ssl.h;  cvs diff -u -r 1.4.2.33 -r 1.4.2.34 src/common/ssl_certificate.c;  cvs diff -u -r 1.1.4.12 -r 1.1.4.13 src/common/ssl_certificate.h;  cvs diff -u -r 1.4.2.70 -r 1.4.2.71 src/gtk/about.c;  cvs diff -u -r 1.9.2.26 -r 1.9.2.27 src/gtk/sslcertwindow.c;  cvs diff -u -r 1.6.2.9 -r 1.6.2.10 src/gtk/sslcertwindow.h;  ) > 3.6.1cvs4.patchset

diff --git a/configure.ac b/configure.ac
index 71e5ebcdb3fcf0d42b3bd19369e13ceac22f23ee..cc38cb299314579e5ce9c14693bd5a822d45a850 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=3
+EXTRA_VERSION=4

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/account.c b/src/account.c
index 99e7fe60244c28db1be6b5818a0a8b5e560ae621..4675a51f6310bed92ba91c22d71655f0a8169925 100644 (file)
--- a/src/account.c
+++ b/src/account.c
@@ -1260,7 +1260,7 @@ static void account_list_view_add(PrefsAccount *ac_prefs)
        gboolean getall;
 
        name = ac_prefs->account_name;
        gboolean getall;
 
        name = ac_prefs->account_name;

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        protocol = ac_prefs->protocol == A_POP3 ?
                  (ac_prefs->ssl_pop == SSL_TUNNEL ?
                   "POP3 (SSL)" :
        protocol = ac_prefs->protocol == A_POP3 ?
                  (ac_prefs->ssl_pop == SSL_TUNNEL ?
                   "POP3 (SSL)" :

diff --git a/src/common/claws.c b/src/common/claws.c
index 281e65a0169be3c6fde449735fdf9da8d8be849f..cb0723cafd8f82a89f796d719d41062a2cdc1295 100644 (file)
--- a/src/common/claws.c
+++ b/src/common/claws.c
@@ -115,7 +115,7 @@ gboolean claws_init(int *argc, char ***argv)
 
        srand((gint) time(NULL));
 
 
        srand((gint) time(NULL));
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        ssl_init();
 #endif
 
        ssl_init();
 #endif
 


@@ -127,7 +127,7 @@ gboolean claws_init(int *argc, char ***argv)
 void claws_done(void)
 {
 
 void claws_done(void)
 {
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        ssl_done();
 #endif
 }
        ssl_done();
 #endif
 }

diff --git a/src/common/defs.h b/src/common/defs.h
index d512d77ee9c059144aec2919ccdfa890ddb652bb..c8f891de86f4099bb3bb6e8adafffe59ca6106b9 100644 (file)
--- a/src/common/defs.h
+++ b/src/common/defs.h
@@ -91,7 +91,6 @@
 #define USERS_ML_ADDR          "claws-mail-users@dotsrc.org"
 #define GPL_URI                        "http://www.gnu.org/licenses/gpl.html"
 #define DONATE_URI             "http://www.claws-mail.org/sponsors.php"
 #define USERS_ML_ADDR          "claws-mail-users@dotsrc.org"
 #define GPL_URI                        "http://www.gnu.org/licenses/gpl.html"
 #define DONATE_URI             "http://www.claws-mail.org/sponsors.php"

-#define OPENSSL_URI            "http://www.openssl.org/"

 #define RELEASE_NOTES_FILE     "RELEASE_NOTES"
 #define THEMEINFO_FILE         ".claws_themeinfo"
 #define FOLDER_LIST            "folderlist.xml"
 #define RELEASE_NOTES_FILE     "RELEASE_NOTES"
 #define THEMEINFO_FILE         ".claws_themeinfo"
 #define FOLDER_LIST            "folderlist.xml"

diff --git a/src/common/session.c b/src/common/session.c
index cae294a84666f93f2d69146f3bb8e25794dc9af6..493caee18abfdbae7b18909bf9b79d909bef442f 100644 (file)
--- a/src/common/session.c
+++ b/src/common/session.c
@@ -66,7 +66,7 @@ void session_init(Session *session, const void *prefs_account, gboolean is_smtp)
        session->sock = NULL;
        session->server = NULL;
        session->port = 0;
        session->sock = NULL;
        session->server = NULL;
        session->port = 0;

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        session->ssl_type = SSL_NONE;
 #endif
        session->nonblocking = TRUE;
        session->ssl_type = SSL_NONE;
 #endif
        session->nonblocking = TRUE;


@@ -162,7 +162,7 @@ static gint session_connect_cb(SockInfo *sock, gpointer data)
        session->sock = sock;
        sock->account = session->account;
        sock->is_smtp = session->is_smtp;
        session->sock = sock;
        sock->account = session->account;
        sock->is_smtp = session->is_smtp;

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        if (session->ssl_type == SSL_TUNNEL) {
                sock_set_nonblocking_mode(sock, FALSE);
                if (!ssl_init_socket(sock)) {
        if (session->ssl_type == SSL_TUNNEL) {
                sock_set_nonblocking_mode(sock, FALSE);
                if (!ssl_init_socket(sock)) {


@@ -345,7 +345,7 @@ static gint session_close(Session *session)
        return 0;
 }
 
        return 0;
 }
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 gint session_start_tls(Session *session)
 {
        gboolean nb_mode;
 gint session_start_tls(Session *session)
 {
        gboolean nb_mode;

diff --git a/src/common/session.h b/src/common/session.h
index 7f0b957a42f2ad82260dea7bc9b635e09bf468e4..772493d8330e521edb8b1e9420b65968fd1b2ad8 100644 (file)
--- a/src/common/session.h
+++ b/src/common/session.h
@@ -92,7 +92,7 @@ struct _Session
        gchar *server;
        gushort port;
 
        gchar *server;
        gushort port;
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        SSLType ssl_type;
 #endif
 
        SSLType ssl_type;
 #endif
 


@@ -192,7 +192,7 @@ void session_set_send_data_notify   (Session        *session,
                                         SendDataNotify  notify_func,
                                         gpointer        data);
 
                                         SendDataNotify  notify_func,
                                         gpointer        data);
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 gint session_start_tls (Session        *session);
 #endif
 
 gint session_start_tls (Session        *session);
 #endif
 

diff --git a/src/common/smtp.c b/src/common/smtp.c
index 9877e515fb754d0b7907bf0b3fe1e9d944fe66a7..764a26b71584763ac38d3d8204b34af4945f3e19 100644 (file)
--- a/src/common/smtp.c
+++ b/src/common/smtp.c
@@ -40,7 +40,7 @@
 static void smtp_session_destroy(Session *session);
 
 static gint smtp_auth(SMTPSession *session);
 static void smtp_session_destroy(Session *session);
 
 static gint smtp_auth(SMTPSession *session);

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 static gint smtp_starttls(SMTPSession *session);
 #endif
 static gint smtp_auth_cram_md5(SMTPSession *session);
 static gint smtp_starttls(SMTPSession *session);
 #endif
 static gint smtp_auth_cram_md5(SMTPSession *session);


@@ -80,7 +80,7 @@ Session *smtp_session_new(void *prefs_account)
 
        session->state                     = SMTP_READY;
 
 
        session->state                     = SMTP_READY;
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        session->tls_init_done             = FALSE;
 #endif
 
        session->tls_init_done             = FALSE;
 #endif
 


@@ -330,7 +330,7 @@ static gint smtp_ehlo_recv(SMTPSession *session, const gchar *msg)
        return SM_ERROR;
 }
 
        return SM_ERROR;
 }
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 static gint smtp_starttls(SMTPSession *session)
 {
        session->state = SMTP_STARTTLS;
 static gint smtp_starttls(SMTPSession *session)
 {
        session->state = SMTP_STARTTLS;


@@ -580,7 +580,7 @@ static gint smtp_session_recv_msg(Session *session, const gchar *msg)
                if (strstr(msg, "ESMTP"))
                        smtp_session->is_esmtp = TRUE;
        case SMTP_CONNECTED:
                if (strstr(msg, "ESMTP"))
                        smtp_session->is_esmtp = TRUE;
        case SMTP_CONNECTED:

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

                if (smtp_session->user || session->ssl_type != SSL_NONE ||
                    smtp_session->is_esmtp)
 #else
                if (smtp_session->user || session->ssl_type != SSL_NONE ||
                    smtp_session->is_esmtp)
 #else


@@ -608,7 +608,7 @@ static gint smtp_session_recv_msg(Session *session, const gchar *msg)
                        smtp_session->error_val = SM_ERROR;
                        return -1;
                }
                        smtp_session->error_val = SM_ERROR;
                        return -1;
                }

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

                if (session->ssl_type == SSL_STARTTLS &&
                    smtp_session->tls_init_done == FALSE) {
                        ret = smtp_starttls(smtp_session);
                if (session->ssl_type == SSL_STARTTLS &&
                    smtp_session->tls_init_done == FALSE) {
                        ret = smtp_starttls(smtp_session);


@@ -617,7 +617,7 @@ static gint smtp_session_recv_msg(Session *session, const gchar *msg)
 #endif
                if (smtp_session->user) {
                        if (smtp_auth(smtp_session) != SM_OK) {
 #endif
                if (smtp_session->user) {
                        if (smtp_auth(smtp_session) != SM_OK) {

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

                                if (session->ssl_type == SSL_NONE
                                &&  smtp_session->tls_init_done == FALSE
                                &&  (smtp_session->avail_auth_type & SMTPAUTH_TLS_AVAILABLE))
                                if (session->ssl_type == SSL_NONE
                                &&  smtp_session->tls_init_done == FALSE
                                &&  (smtp_session->avail_auth_type & SMTPAUTH_TLS_AVAILABLE))


@@ -630,7 +630,7 @@ static gint smtp_session_recv_msg(Session *session, const gchar *msg)
                        ret = smtp_from(smtp_session);
                break;
        case SMTP_STARTTLS:
                        ret = smtp_from(smtp_session);
                break;
        case SMTP_STARTTLS:

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

                if (session_start_tls(session) < 0) {
                        log_warning(LOG_PROTOCOL, _("couldn't start TLS session\n"));
                        smtp_session->state = SMTP_ERROR;
                if (session_start_tls(session) < 0) {
                        log_warning(LOG_PROTOCOL, _("couldn't start TLS session\n"));
                        smtp_session->state = SMTP_ERROR;

diff --git a/src/common/smtp.h b/src/common/smtp.h
index b2b9cc731b2b18e5a1c01fa3de92c1c422b01dd8..ff7155ba1e5562bbccdf10f1f46cdeedad619905 100644 (file)
--- a/src/common/smtp.h
+++ b/src/common/smtp.h
@@ -90,7 +90,7 @@ struct _SMTPSession
 
        SMTPState state;
 
 
        SMTPState state;
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        gboolean tls_init_done;
 #endif
 
        gboolean tls_init_done;
 #endif
 

diff --git a/src/common/socket.c b/src/common/socket.c
index c893fbf377d10fdb72a615b484b82c007c1903b1..af7e7945007b1dbdf638f863670c20ab8430b527 100644 (file)
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -62,7 +62,7 @@
 #include "socket.h"
 #include "utils.h"
 #include "log.h"
 #include "socket.h"
 #include "utils.h"
 #include "log.h"

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 #  include "ssl.h"
 #endif
 
 #  include "ssl.h"
 #endif
 


@@ -395,24 +395,6 @@ static gboolean sock_check(GSource *source)
        if (!sock || !sock->sock)
                return FALSE;
 
        if (!sock || !sock->sock)
                return FALSE;
 

-#if USE_OPENSSL
-       if (sock->ssl) {
-               if (condition & G_IO_IN) {
-                       if (SSL_pending(sock->ssl) > 0)
-                               return TRUE;
-                       if (SSL_want_write(sock->ssl))
-                               condition |= G_IO_OUT;
-               }
-
-               if (condition & G_IO_OUT) {
-                       if (SSL_want_read(sock->ssl))
-                               condition |= G_IO_IN;
-               }
-       }
-#elif USE_GNUTLS
-/* ?? */
-#endif
-

        FD_ZERO(&fds);
        FD_SET(sock->sock, &fds);
 
        FD_ZERO(&fds);
        FD_SET(sock->sock, &fds);
 


@@ -456,7 +438,7 @@ guint sock_add_watch(SockInfo *sock, GIOCondition condition, SockFunc func,
        sock->condition = condition;
        sock->data = data;
 
        sock->condition = condition;
        sock->data = data;
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        if (sock->ssl)
        {
                GSource *source = g_source_new(&sock_watch_funcs,
        if (sock->ssl)
        {
                GSource *source = g_source_new(&sock_watch_funcs,


@@ -1306,35 +1288,7 @@ static gint fd_read(gint fd, gchar *buf, gint len)
        return read(fd, buf, len);
 }
 
        return read(fd, buf, len);
 }
 

-#if USE_OPENSSL
-static gint ssl_read(SSL *ssl, gchar *buf, gint len)
-{
-       gint err, ret;
-
-       if (SSL_pending(ssl) == 0) {
-               if (fd_check_io(SSL_get_rfd(ssl), G_IO_IN) < 0)
-                       return -1;
-       }
-
-       ret = SSL_read(ssl, buf, len);
-
-       switch ((err = SSL_get_error(ssl, ret))) {
-       case SSL_ERROR_NONE:
-               return ret;
-       case SSL_ERROR_WANT_READ:
-       case SSL_ERROR_WANT_WRITE:
-               errno = EAGAIN;
-               return -1;
-       case SSL_ERROR_ZERO_RETURN:
-               return 0;
-       default:
-               g_warning("SSL_read() returned error %d, ret = %d\n", err, ret);
-               if (ret == 0)
-                       return 0;
-               return -1;
-       }
-}
-#elif USE_GNUTLS
+#if USE_GNUTLS

 static gint ssl_read(gnutls_session ssl, gchar *buf, gint len)
 {
        gint r;
 static gint ssl_read(gnutls_session ssl, gchar *buf, gint len)
 {
        gint r;


@@ -1373,7 +1327,7 @@ gint sock_read(SockInfo *sock, gchar *buf, gint len)
 
        g_return_val_if_fail(sock != NULL, -1);
 
 
        g_return_val_if_fail(sock != NULL, -1);
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        if (sock->ssl)
                ret = ssl_read(sock->ssl, buf, len);
        else
        if (sock->ssl)
                ret = ssl_read(sock->ssl, buf, len);
        else


@@ -1395,25 +1349,7 @@ gint fd_write(gint fd, const gchar *buf, gint len)
        return write(fd, buf, len);
 }
 
        return write(fd, buf, len);
 }
 

-#if USE_OPENSSL
-static gint ssl_write(SSL *ssl, const gchar *buf, gint len)
-{
-       gint ret;
-
-       ret = SSL_write(ssl, buf, len);
-
-       switch (SSL_get_error(ssl, ret)) {
-       case SSL_ERROR_NONE:
-               return ret;
-       case SSL_ERROR_WANT_READ:
-       case SSL_ERROR_WANT_WRITE:
-               errno = EAGAIN;
-               return -1;
-       default:
-               return -1;
-       }
-}
-#elif USE_GNUTLS
+#if USE_GNUTLS

 static gint ssl_write(gnutls_session ssl, const gchar *buf, gint len)
 {
        gint ret;
 static gint ssl_write(gnutls_session ssl, const gchar *buf, gint len)
 {
        gint ret;


@@ -1443,7 +1379,7 @@ gint sock_write(SockInfo *sock, const gchar *buf, gint len)
 
        g_return_val_if_fail(sock != NULL, -1);
 
 
        g_return_val_if_fail(sock != NULL, -1);
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        if (sock->ssl)
                ret = ssl_write(sock->ssl, buf, len);
        else
        if (sock->ssl)
                ret = ssl_write(sock->ssl, buf, len);
        else


@@ -1482,12 +1418,8 @@ gint fd_write_all(gint fd, const gchar *buf, gint len)
        return wrlen;
 }
 
        return wrlen;
 }
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
-#if USE_OPENSSL
-static gint ssl_write_all(SSL *ssl, const gchar *buf, gint len)
-#else
+#ifdef USE_GNUTLS

 static gint ssl_write_all(gnutls_session ssl, const gchar *buf, gint len)
 static gint ssl_write_all(gnutls_session ssl, const gchar *buf, gint len)

-#endif

 {
        gint n, wrlen = 0;
 
 {
        gint n, wrlen = 0;
 


@@ -1510,7 +1442,7 @@ gint sock_write_all(SockInfo *sock, const gchar *buf, gint len)
 
        g_return_val_if_fail(sock != NULL, -1);
 
 
        g_return_val_if_fail(sock != NULL, -1);
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        if (sock->ssl)
                ret = ssl_write_all(sock->ssl, buf, len);
        else
        if (sock->ssl)
                ret = ssl_write_all(sock->ssl, buf, len);
        else


@@ -1587,7 +1519,7 @@ gint sock_close(SockInfo *sock)
        if (sock->sock_ch)
                g_io_channel_unref(sock->sock_ch);
 
        if (sock->sock_ch)
                g_io_channel_unref(sock->sock_ch);
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        if (sock->ssl)
                ssl_done_socket(sock);
        if (sock->g_source != 0)
        if (sock->ssl)
                ssl_done_socket(sock);
        if (sock->g_source != 0)

diff --git a/src/common/socket.h b/src/common/socket.h
index 8182eb55883bde9001d38ce64515e073e8365201..e681f1bfe2063650508d0ca3989e6ffb5558eee5 100644 (file)
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -35,7 +35,7 @@
 
 typedef struct _SockInfo       SockInfo;
 
 
 typedef struct _SockInfo       SockInfo;
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 #  include "ssl.h"
 #endif
 
 #  include "ssl.h"
 #endif
 


@@ -58,9 +58,7 @@ typedef gboolean (*SockFunc)          (SockInfo       *sock,
 struct _SockInfo
 {
        gint sock;
 struct _SockInfo
 {
        gint sock;

-#if USE_OPENSSL
-       SSL *ssl;
-#elif USE_GNUTLS
+#if USE_GNUTLS

        gnutls_session ssl;
        gnutls_certificate_credentials_t xcred;
        gnutls_x509_crt client_crt;
        gnutls_session ssl;
        gnutls_certificate_credentials_t xcred;
        gnutls_x509_crt client_crt;

diff --git a/src/common/ssl.c b/src/common/ssl.c
index 4bce5808bd32065223cd49a253db5591ad518ca6..e87a532fbee3faf7e843d8de1119ef979cf5a86b 100644 (file)
--- a/src/common/ssl.c
+++ b/src/common/ssl.c
@@ -21,7 +21,7 @@
 #  include "config.h"
 #endif
 
 #  include "config.h"
 #endif
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 #include "defs.h"
 
 #include <glib.h>
 #include "defs.h"
 
 #include <glib.h>


@@ -43,55 +43,11 @@
 
 #ifdef USE_PTHREAD
 typedef struct _thread_data {
 
 #ifdef USE_PTHREAD
 typedef struct _thread_data {

-#ifdef USE_OPENSSL
-       SSL *ssl;
-#else

        gnutls_session ssl;
        gnutls_session ssl;

-#endif

        gboolean done;
 } thread_data;
 #endif
 
        gboolean done;
 } thread_data;
 #endif
 

-
-#ifdef USE_OPENSSL
-static SSL_CTX *ssl_ctx;
-#endif
-
-#ifdef USE_OPENSSL
-static int openssl_client_cert_cb(SSL *ssl, X509 **x509, EVP_PKEY **pkey)
-{
-       SSLClientCertHookData hookdata;
-       SockInfo *sockinfo = (SockInfo *)SSL_CTX_get_app_data(ssl->ctx);
-       
-       if (x509 == NULL || pkey == NULL) {
-               return 0;
-       }
-
-       if (sockinfo == NULL)
-               return 0;
-
-       hookdata.account = sockinfo->account;
-       hookdata.cert_path = NULL;
-       hookdata.password = NULL;
-       hookdata.is_smtp = sockinfo->is_smtp;
-       hooks_invoke(SSLCERT_GET_CLIENT_CERT_HOOKLIST, &hookdata);      
-
-       if (hookdata.cert_path == NULL)
-               return 0;
-
-       *x509 = ssl_certificate_get_x509_from_pem_file(hookdata.cert_path);
-       *pkey = ssl_certificate_get_pkey_from_pem_file(hookdata.cert_path);
-       if (!(*x509 && *pkey)) {
-               /* try pkcs12 format */
-               ssl_certificate_get_x509_and_pkey_from_p12_file(hookdata.cert_path, hookdata.password, x509, pkey);
-       }
-       if (*x509 && *pkey)
-               return 1;
-       else
-               return 0;
-}
-#endif
-#ifdef USE_GNUTLS

 static int gnutls_client_cert_cb(gnutls_session session,
                                const gnutls_datum *req_ca_rdn, int nreqs,
                                const gnutls_pk_algorithm *sign_algos,
 static int gnutls_client_cert_cb(gnutls_session session,
                                const gnutls_datum *req_ca_rdn, int nreqs,
                                const gnutls_pk_algorithm *sign_algos,


@@ -134,14 +90,6 @@ static int gnutls_client_cert_cb(gnutls_session session,
        }
        return 0;
 }
        }
        return 0;
 }

-#endif
-
-#ifdef USE_OPENSSL
-SSL_CTX *ssl_get_ctx(void)
-{
-       return ssl_ctx;
-}
-#endif

 
 const gchar *claws_ssl_get_cert_file(void)
 {
 
 const gchar *claws_ssl_get_cert_file(void)
 {


@@ -200,60 +148,15 @@ const gchar *claws_ssl_get_cert_dir(void)
 
 void ssl_init(void)
 {
 
 void ssl_init(void)
 {

-#ifdef USE_OPENSSL
-       SSL_METHOD *meth;
-
-       /* Global system initialization*/
-       SSL_library_init();
-       SSL_load_error_strings();
-       OpenSSL_add_all_algorithms();
-       OpenSSL_add_all_ciphers();
-       OpenSSL_add_all_digests();
-
-#ifdef HAVE_LIBETPAN
-       mailstream_openssl_init_not_required();
-#endif 
-
-       /* Create our context*/
-       meth = SSLv23_client_method();
-       ssl_ctx = SSL_CTX_new(meth);
-
-       
-       SSL_CTX_set_client_cert_cb(ssl_ctx, openssl_client_cert_cb);
-
-       /* Set default certificate paths */
-       if (claws_ssl_get_cert_file() || claws_ssl_get_cert_dir()) {
-               int r = SSL_CTX_load_verify_locations(ssl_ctx, claws_ssl_get_cert_file(), claws_ssl_get_cert_dir());
-               if (r != 1) {
-                       g_warning("can't set cert file %s dir %s: %s\n",
-                                       claws_ssl_get_cert_file(), claws_ssl_get_cert_dir(), ERR_error_string(ERR_get_error(), NULL));
-                       SSL_CTX_set_default_verify_paths(ssl_ctx);
-               }
-       } else {
-               g_warning("cant");
-               SSL_CTX_set_default_verify_paths(ssl_ctx);
-       }
-#if (OPENSSL_VERSION_NUMBER < 0x0090600fL)
-       SSL_CTX_set_verify_depth(ssl_ctx,1);
-#endif
-#else

 #ifdef HAVE_LIBETPAN
        mailstream_gnutls_init_not_required();
 #endif 
        gnutls_global_init();
 #ifdef HAVE_LIBETPAN
        mailstream_gnutls_init_not_required();
 #endif 
        gnutls_global_init();

-#endif

 }
 
 void ssl_done(void)
 {
 }
 
 void ssl_done(void)
 {

-#if USE_OPENSSL
-       if (!ssl_ctx)
-               return;
-       
-       SSL_CTX_free(ssl_ctx);
-#else

        gnutls_global_deinit();
        gnutls_global_deinit();

-#endif

 }
 
 #ifdef USE_PTHREAD
 }
 
 #ifdef USE_PTHREAD


@@ -265,27 +168,18 @@ static void *SSL_connect_thread(void *data)
        pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
        pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
 
        pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
        pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
 

-#ifdef USE_OPENSSL
-       result = SSL_connect(td->ssl);
-#else

        do {
                result = gnutls_handshake(td->ssl);
        } while (result == GNUTLS_E_AGAIN || result == GNUTLS_E_INTERRUPTED);
        do {
                result = gnutls_handshake(td->ssl);
        } while (result == GNUTLS_E_AGAIN || result == GNUTLS_E_INTERRUPTED);

-#endif
+

        td->done = TRUE; /* let the caller thread join() */
        return GINT_TO_POINTER(result);
 }
 #endif
 
        td->done = TRUE; /* let the caller thread join() */
        return GINT_TO_POINTER(result);
 }
 #endif
 

-#ifdef USE_OPENSSL
-static gint SSL_connect_nb(SSL *ssl)
-#else

 static gint SSL_connect_nb(gnutls_session ssl)
 static gint SSL_connect_nb(gnutls_session ssl)

-#endif

 {
 {

-#ifdef USE_GNUTLS

        int result;
        int result;

-#endif

 #ifdef USE_PTHREAD
        thread_data *td = g_new0(thread_data, 1);
        pthread_t pt;
 #ifdef USE_PTHREAD
        thread_data *td = g_new0(thread_data, 1);
        pthread_t pt;


@@ -303,14 +197,10 @@ static gint SSL_connect_nb(gnutls_session ssl)
        if (pthread_attr_init(&pta) != 0 ||
            pthread_attr_setdetachstate(&pta, PTHREAD_CREATE_JOINABLE) != 0 ||
            pthread_create(&pt, &pta, SSL_connect_thread, td) != 0) {
        if (pthread_attr_init(&pta) != 0 ||
            pthread_attr_setdetachstate(&pta, PTHREAD_CREATE_JOINABLE) != 0 ||
            pthread_create(&pt, &pta, SSL_connect_thread, td) != 0) {

-#ifdef USE_OPENSSL
-               return SSL_connect(ssl);
-#else

                do {
                        result = gnutls_handshake(td->ssl);
                } while (result == GNUTLS_E_AGAIN || result == GNUTLS_E_INTERRUPTED);
                return result;
                do {
                        result = gnutls_handshake(td->ssl);
                } while (result == GNUTLS_E_AGAIN || result == GNUTLS_E_INTERRUPTED);
                return result;

-#endif

        }
        debug_print("waiting for SSL_connect thread...\n");
        while(!td->done) {
        }
        debug_print("waiting for SSL_connect thread...\n");
        while(!td->done) {


@@ -335,14 +225,10 @@ static gint SSL_connect_nb(gnutls_session ssl)
        
        return GPOINTER_TO_INT(res);
 #else /* USE_PTHREAD */
        
        return GPOINTER_TO_INT(res);
 #else /* USE_PTHREAD */

-#ifdef USE_OPENSSL
-       return SSL_connect(ssl);
-#else

        do {
                result = gnutls_handshake(ssl);
        } while (result == GNUTLS_E_AGAIN || result == GNUTLS_E_INTERRUPTED);
 #endif
        do {
                result = gnutls_handshake(ssl);
        } while (result == GNUTLS_E_AGAIN || result == GNUTLS_E_INTERRUPTED);
 #endif

-#endif

 }
 
 gboolean ssl_init_socket(SockInfo *sockinfo)
 }
 
 gboolean ssl_init_socket(SockInfo *sockinfo)


@@ -352,61 +238,6 @@ gboolean ssl_init_socket(SockInfo *sockinfo)
 
 gboolean ssl_init_socket_with_method(SockInfo *sockinfo, SSLMethod method)
 {
 
 gboolean ssl_init_socket_with_method(SockInfo *sockinfo, SSLMethod method)
 {

-#ifdef USE_OPENSSL
-       X509 *server_cert;
-       SSL *ssl;
-
-       ssl = SSL_new(ssl_ctx);
-       if (ssl == NULL) {
-               g_warning(_("Error creating ssl context\n"));
-               return FALSE;
-       }
-
-       switch (method) {
-       case SSL_METHOD_SSLv23:
-               debug_print("Setting SSLv23 client method\n");
-               SSL_set_ssl_method(ssl, SSLv23_client_method());
-               break;
-       case SSL_METHOD_TLSv1:
-               debug_print("Setting TLSv1 client method\n");
-               SSL_set_ssl_method(ssl, TLSv1_client_method());
-               break;
-       default:
-               break;
-       }
-
-       SSL_CTX_set_app_data(ssl_ctx, sockinfo);
-       SSL_set_fd(ssl, sockinfo->sock);
-       if (SSL_connect_nb(ssl) == -1) {
-               g_warning(_("SSL connect failed (%s)\n"),
-                           ERR_error_string(ERR_get_error(), NULL));
-               SSL_free(ssl);
-               return FALSE;
-       }
-
-       /* Get the cipher */
-
-       debug_print("SSL connection using %s\n", SSL_get_cipher(ssl));
-
-       /* Get server's certificate (note: beware of dynamic allocation) */
-       if ((server_cert = SSL_get_peer_certificate(ssl)) == NULL) {
-               debug_print("server_cert is NULL ! this _should_not_ happen !\n");
-               SSL_free(ssl);
-               return FALSE;
-       }
-
-
-       if (!ssl_certificate_check(server_cert, sockinfo->canonical_name, sockinfo->hostname, sockinfo->port)) {
-               X509_free(server_cert);
-               SSL_free(ssl);
-               return FALSE;
-       }
-
-
-       X509_free(server_cert);
-       sockinfo->ssl = ssl;
-       
-#else

        gnutls_session session;
        int r;
        const int cipher_prio[] = { GNUTLS_CIPHER_AES_128_CBC,
        gnutls_session session;
        int r;
        const int cipher_prio[] = { GNUTLS_CIPHER_AES_128_CBC,


@@ -491,16 +322,12 @@ gboolean ssl_init_socket_with_method(SockInfo *sockinfo, SSLMethod method)
 
        sockinfo->ssl = session;
        sockinfo->xcred = xcred;
 
        sockinfo->ssl = session;
        sockinfo->xcred = xcred;

-#endif

        return TRUE;
 }
 
 void ssl_done_socket(SockInfo *sockinfo)
 {
        if (sockinfo && sockinfo->ssl) {
        return TRUE;
 }
 
 void ssl_done_socket(SockInfo *sockinfo)
 {
        if (sockinfo && sockinfo->ssl) {

-#ifdef USE_OPENSSL
-               SSL_free(sockinfo->ssl);
-#else

                gnutls_certificate_free_credentials(sockinfo->xcred);
                gnutls_deinit(sockinfo->ssl);
                if (sockinfo->client_crt)
                gnutls_certificate_free_credentials(sockinfo->xcred);
                gnutls_deinit(sockinfo->ssl);
                if (sockinfo->client_crt)


@@ -509,9 +336,8 @@ void ssl_done_socket(SockInfo *sockinfo)
                        gnutls_x509_privkey_deinit(sockinfo->client_key);
                sockinfo->client_key = NULL;
                sockinfo->client_crt = NULL;
                        gnutls_x509_privkey_deinit(sockinfo->client_key);
                sockinfo->client_key = NULL;
                sockinfo->client_crt = NULL;

-#endif

                sockinfo->ssl = NULL;
        }
 }
 
                sockinfo->ssl = NULL;
        }
 }
 

-#endif /* USE_OPENSSL */
+#endif /* USE_GNUTLS */

diff --git a/src/common/ssl.h b/src/common/ssl.h
index 14d6459f247aefefa2091682cd3656370b90d954..787203cbcd5ffad04221c22d2f6be442303fdb7d 100644 (file)
--- a/src/common/ssl.h
+++ b/src/common/ssl.h
@@ -30,21 +30,11 @@ typedef enum {
        SSL_STARTTLS
 } SSLType;
 
        SSL_STARTTLS
 } SSLType;
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 #include <glib.h>
 
 #include <glib.h>
 

-#if USE_OPENSSL
-#include <openssl/crypto.h>
-#include <openssl/x509.h>
-#include <openssl/pem.h>
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/pkcs12.h>
-#else

 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>

-#endif

 #include "socket.h"
 
 typedef enum {
 #include "socket.h"
 
 typedef enum {


@@ -68,11 +58,7 @@ struct _SSLClientCertHookData
        gboolean is_smtp;
 };
 
        gboolean is_smtp;
 };
 

-#ifdef USE_OPENSSL
-SSL_CTX *ssl_get_ctx(void);
-#endif
-               

 const gchar *claws_ssl_get_cert_file(void);
 const gchar *claws_ssl_get_cert_file(void);

-#endif /* USE_OPENSSL */
+#endif /* USE_GNUTLS */

 
 #endif /* __SSL_H__ */
 
 #endif /* __SSL_H__ */

diff --git a/src/common/ssl_certificate.c b/src/common/ssl_certificate.c
index 009cc33e84898f21d7e8a08a452b0f3dedd09461..a8070cbc42742ece25a402761018c243721ff939 100644 (file)
--- a/src/common/ssl_certificate.c
+++ b/src/common/ssl_certificate.c
@@ -22,17 +22,13 @@
 #  include "config.h"
 #endif
 
 #  include "config.h"
 #endif
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
-#if USE_OPENSSL
-#include <openssl/ssl.h>
-#else
+#ifdef USE_GNUTLS

 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
 #include <gnutls/pkcs12.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <string.h>
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
 #include <gnutls/pkcs12.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <string.h>

-#endif

 #include <sys/types.h>
 #include <stdio.h>
 #include <glib.h>
 #include <sys/types.h>
 #include <stdio.h>
 #include <glib.h>


@@ -67,59 +63,7 @@ static gchar *get_certificate_path(const gchar *host, const gchar *port, const g
                          host, ".", port, ".cert", NULL);
 }
 
                          host, ".", port, ".cert", NULL);
 }
 

-#if USE_OPENSSL
-static SSLCertificate *ssl_certificate_new_lookup(X509 *x509_cert, gchar *host, gushort port, gboolean lookup);
-#else

 static SSLCertificate *ssl_certificate_new_lookup(gnutls_x509_crt x509_cert, gchar *host, gushort port, gboolean lookup);
 static SSLCertificate *ssl_certificate_new_lookup(gnutls_x509_crt x509_cert, gchar *host, gushort port, gboolean lookup);

-#endif
-#if USE_OPENSSL
-/* from Courier */
-time_t asn1toTime(ASN1_TIME *asn1Time)
-{
-       struct tm tm;
-       int offset;
-
-       if (asn1Time == NULL || asn1Time->length < 13)
-               return 0;
-
-       memset(&tm, 0, sizeof(tm));
-
-#define N2(n)  ((asn1Time->data[n]-'0')*10 + asn1Time->data[(n)+1]-'0')
-
-#define CPY(f,n) (tm.f=N2(n))
-
-       CPY(tm_year,0);
-
-       if(tm.tm_year < 50)
-               tm.tm_year += 100; /* Sux */
-
-       CPY(tm_mon, 2);
-       --tm.tm_mon;
-       CPY(tm_mday, 4);
-       CPY(tm_hour, 6);
-       CPY(tm_min, 8);
-       CPY(tm_sec, 10);
-
-       offset=0;
-
-       if (asn1Time->data[12] != 'Z')
-       {
-               if (asn1Time->length < 17)
-                       return 0;
-
-               offset=N2(13)*3600+N2(15)*60;
-
-               if (asn1Time->data[12] == '-')
-                       offset= -offset;
-       }
-
-#undef N2
-#undef CPY
-
-       return mktime(&tm)-offset;
-}
-#endif
-

 static char * get_fqdn(char *host)
 {
 #ifdef INET6
 static char * get_fqdn(char *host)
 {
 #ifdef INET6


@@ -229,30 +173,18 @@ static gnutls_x509_crt x509_crt_copy(gnutls_x509_crt src)
 }
 #endif
 
 }
 #endif
 

-#if USE_OPENSSL
-static SSLCertificate *ssl_certificate_new_lookup(X509 *x509_cert, gchar *host, gushort port, gboolean lookup)
-#else

 static SSLCertificate *ssl_certificate_new_lookup(gnutls_x509_crt x509_cert, gchar *host, gushort port, gboolean lookup)
 static SSLCertificate *ssl_certificate_new_lookup(gnutls_x509_crt x509_cert, gchar *host, gushort port, gboolean lookup)

-#endif

 {
        SSLCertificate *cert = g_new0(SSLCertificate, 1);
 {
        SSLCertificate *cert = g_new0(SSLCertificate, 1);

-#if USE_OPENSSL
-       unsigned int n;
-#else

        size_t n;
        size_t n;

-#endif

        unsigned char md[128];  
 
        if (host == NULL || x509_cert == NULL) {
                ssl_certificate_destroy(cert);
                return NULL;
        }
        unsigned char md[128];  
 
        if (host == NULL || x509_cert == NULL) {
                ssl_certificate_destroy(cert);
                return NULL;
        }

-#if USE_OPENSSL
-       cert->x509_cert = X509_dup(x509_cert);
-#else

        cert->x509_cert = x509_crt_copy(x509_cert);
        cert->status = (guint)-1;
        cert->x509_cert = x509_crt_copy(x509_cert);
        cert->status = (guint)-1;

-#endif

        if (lookup)
                cert->host = get_fqdn(host);
        else
        if (lookup)
                cert->host = get_fqdn(host);
        else


@@ -260,14 +192,9 @@ static SSLCertificate *ssl_certificate_new_lookup(gnutls_x509_crt x509_cert, gch
        cert->port = port;
        
        /* fingerprint */
        cert->port = port;
        
        /* fingerprint */

-#if USE_OPENSSL
-       X509_digest(cert->x509_cert, EVP_md5(), md, &n);
-       cert->fingerprint = readable_fingerprint(md, (int)n);
-#else

        n = 128;
        gnutls_x509_crt_get_fingerprint(cert->x509_cert, GNUTLS_DIG_MD5, md, &n);
        cert->fingerprint = readable_fingerprint(md, (int)n);
        n = 128;
        gnutls_x509_crt_get_fingerprint(cert->x509_cert, GNUTLS_DIG_MD5, md, &n);
        cert->fingerprint = readable_fingerprint(md, (int)n);

-#endif

        return cert;
 }
 
        return cert;
 }
 


@@ -457,11 +384,7 @@ void ssl_certificate_destroy(SSLCertificate *cert)
                return;
 
        if (cert->x509_cert)
                return;
 
        if (cert->x509_cert)

-#if USE_OPENSSL
-               X509_free(cert->x509_cert);
-#else

                gnutls_x509_crt_deinit(cert->x509_cert);
                gnutls_x509_crt_deinit(cert->x509_cert);

-#endif

        g_free(cert->host);
        g_free(cert->fingerprint);
        g_free(cert);
        g_free(cert->host);
        g_free(cert->fingerprint);
        g_free(cert);


@@ -490,11 +413,7 @@ SSLCertificate *ssl_certificate_find_lookup (gchar *host, gushort port, const gc
        gchar *buf;
        gchar *fqdn_host;
        SSLCertificate *cert = NULL;
        gchar *buf;
        gchar *fqdn_host;
        SSLCertificate *cert = NULL;

-#if USE_OPENSSL
-       X509 *tmp_x509;
-#else

        gnutls_x509_crt tmp_x509;
        gnutls_x509_crt tmp_x509;

-#endif

        FILE *fp = NULL;
        gboolean must_rename = FALSE;
 
        FILE *fp = NULL;
        gboolean must_rename = FALSE;
 


@@ -530,18 +449,10 @@ SSLCertificate *ssl_certificate_find_lookup (gchar *host, gushort port, const gc
                return NULL;
        }
        
                return NULL;
        }
        

-#if USE_OPENSSL
-       if ((tmp_x509 = d2i_X509_fp(fp, 0)) != NULL) {
-#else

        if ((tmp_x509 = gnutls_d2i_X509_fp(fp, 0)) != NULL) {
        if ((tmp_x509 = gnutls_d2i_X509_fp(fp, 0)) != NULL) {

-#endif

                cert = ssl_certificate_new_lookup(tmp_x509, fqdn_host, port, lookup);
                debug_print("got cert %p\n", cert);
                cert = ssl_certificate_new_lookup(tmp_x509, fqdn_host, port, lookup);
                debug_print("got cert %p\n", cert);

-#if USE_OPENSSL
-               X509_free(tmp_x509);
-#else

                gnutls_x509_crt_deinit(tmp_x509);
                gnutls_x509_crt_deinit(tmp_x509);

-#endif

        }
        fclose(fp);
        g_free(file);
        }
        fclose(fp);
        g_free(file);


@@ -562,14 +473,6 @@ SSLCertificate *ssl_certificate_find_lookup (gchar *host, gushort port, const gc
 
 static gboolean ssl_certificate_compare (SSLCertificate *cert_a, SSLCertificate *cert_b)
 {
 
 static gboolean ssl_certificate_compare (SSLCertificate *cert_a, SSLCertificate *cert_b)
 {

-#ifdef USE_OPENSSL
-       if (cert_a == NULL || cert_b == NULL)
-               return FALSE;
-       else if (!X509_cmp(cert_a->x509_cert, cert_b->x509_cert))
-               return TRUE;
-       else
-               return FALSE;
-#else

        char *output_a;
        char *output_b;
        size_t cert_size_a = 0, cert_size_b = 0;
        char *output_a;
        char *output_b;
        size_t cert_size_a = 0, cert_size_b = 0;


@@ -620,35 +523,8 @@ static gboolean ssl_certificate_compare (SSLCertificate *cert_a, SSLCertificate
        g_free(output_b);
        
        return TRUE;
        g_free(output_b);
        
        return TRUE;

-#endif

 }
 
 }
 

-#if USE_OPENSSL
-char *ssl_certificate_check_signer (X509 *cert) 
-{
-       X509_STORE_CTX store_ctx;
-       X509_STORE *store = SSL_CTX_get_cert_store(ssl_get_ctx());
-       char *err_msg = NULL;
-
-       if (store == NULL) {
-               g_print("Can't create X509_STORE\n");
-               return NULL;
-       }
-
-       X509_STORE_CTX_init (&store_ctx, store, cert, NULL);
-
-       if(!X509_verify_cert (&store_ctx)) {
-               err_msg = g_strdup(X509_verify_cert_error_string(
-                                       X509_STORE_CTX_get_error(&store_ctx)));
-               debug_print("Can't check signer: %s\n", err_msg);
-               X509_STORE_CTX_cleanup (&store_ctx);
-               return err_msg;
-                       
-       }
-       X509_STORE_CTX_cleanup (&store_ctx);
-       return NULL;
-}
-#else

 static guint check_cert(gnutls_x509_crt cert)
 {
        gnutls_x509_crt *ca_list;
 static guint check_cert(gnutls_x509_crt cert)
 {
        gnutls_x509_crt *ca_list;


@@ -728,24 +604,15 @@ char *ssl_certificate_check_signer (gnutls_x509_crt cert, guint status)
 
        return NULL;
 }
 
        return NULL;
 }

-#endif

 
 

-#if USE_OPENSSL
-gboolean ssl_certificate_check (X509 *x509_cert, gchar *fqdn, gchar *host, gushort port)
-#else

 gboolean ssl_certificate_check (gnutls_x509_crt x509_cert, guint status, gchar *fqdn, gchar *host, gushort port)
 gboolean ssl_certificate_check (gnutls_x509_crt x509_cert, guint status, gchar *fqdn, gchar *host, gushort port)

-#endif

 {
        SSLCertificate *current_cert = NULL;
        SSLCertificate *known_cert;
        SSLCertHookData cert_hook_data;
        gchar *fqdn_host = NULL;        
        gchar *fingerprint;
 {
        SSLCertificate *current_cert = NULL;
        SSLCertificate *known_cert;
        SSLCertHookData cert_hook_data;
        gchar *fqdn_host = NULL;        
        gchar *fingerprint;

-#ifdef USE_OPENSSL
-       unsigned int n;
-#else

        size_t n;
        size_t n;

-#endif

        unsigned char md[128];  
 
        if (fqdn)
        unsigned char md[128];  
 
        if (fqdn)


@@ -765,18 +632,11 @@ gboolean ssl_certificate_check (gnutls_x509_crt x509_cert, guint status, gchar *
                return FALSE;
        }
 
                return FALSE;
        }
 

-#if USE_GNUTLS

        current_cert->status = status;
        current_cert->status = status;

-#endif

        /* fingerprint */
        /* fingerprint */

-#if USE_OPENSSL
-       X509_digest(x509_cert, EVP_md5(), md, &n);
-       fingerprint = readable_fingerprint(md, (int)n);
-#else

        n = 128;
        gnutls_x509_crt_get_fingerprint(x509_cert, GNUTLS_DIG_MD5, md, &n);
        fingerprint = readable_fingerprint(md, n);
        n = 128;
        gnutls_x509_crt_get_fingerprint(x509_cert, GNUTLS_DIG_MD5, md, &n);
        fingerprint = readable_fingerprint(md, n);

-#endif

 
        known_cert = ssl_certificate_find_lookup (fqdn_host, port, fingerprint, FALSE);
 
 
        known_cert = ssl_certificate_find_lookup (fqdn_host, port, fingerprint, FALSE);
 


@@ -817,11 +677,7 @@ gboolean ssl_certificate_check (gnutls_x509_crt x509_cert, guint status, gchar *
                        ssl_certificate_destroy(known_cert);
                        return TRUE;
                }
                        ssl_certificate_destroy(known_cert);
                        return TRUE;
                }

-#if USE_OPENSSL
-       } else if (asn1toTime(X509_get_notAfter(current_cert->x509_cert)) < time(NULL)) {
-#else

        } else if (gnutls_x509_crt_get_expiration_time(current_cert->x509_cert) < time(NULL)) {
        } else if (gnutls_x509_crt_get_expiration_time(current_cert->x509_cert) < time(NULL)) {

-#endif

                gchar *tmp = g_strdup_printf("%s:%d", current_cert->host, current_cert->port);
                
                if (warned_expired == NULL)
                gchar *tmp = g_strdup_printf("%s:%d", current_cert->host, current_cert->port);
                
                if (warned_expired == NULL)


@@ -859,85 +715,6 @@ gboolean ssl_certificate_check (gnutls_x509_crt x509_cert, guint status, gchar *
        return TRUE;
 }
 
        return TRUE;
 }
 

-#if USE_OPENSSL
-X509 *ssl_certificate_get_x509_from_pem_file(const gchar *file)
-{
-       X509 *x509 = NULL;
-       if (!file)
-               return NULL;
-       if (is_file_exist(file)) {
-               FILE *fp = g_fopen(file, "r");
-               if (fp) {
-                       x509 = PEM_read_X509(fp, NULL, NULL, NULL);
-                       fclose(fp);
-                       return x509;
-               }
-       } else {
-               log_error(LOG_PROTOCOL, "Can not open certificate file %s\n", file);
-       }
-       return NULL;
-}
-
-static int ssl_pkey_password_cb(char *buf, int max_len, int flag, void *pwd)
-{
-       return 0;
-}
-
-EVP_PKEY *ssl_certificate_get_pkey_from_pem_file(const gchar *file)
-{
-       EVP_PKEY *pkey = NULL;
-       if (!file)
-               return NULL;
-       if (is_file_exist(file)) {
-               FILE *fp = g_fopen(file, "r");
-               if (fp) {
-                       pkey = PEM_read_PrivateKey(fp, NULL, ssl_pkey_password_cb, NULL);
-                       fclose(fp);
-                       return pkey;
-               }
-       } else {
-               log_error(LOG_PROTOCOL, "Can not open private key file %s\n", file);
-       }
-       return NULL;
-}
-
-void ssl_certificate_get_x509_and_pkey_from_p12_file(const gchar *file, const gchar *password,
-                       X509 **x509, EVP_PKEY **pkey)
-{
-       PKCS12 *p12 = NULL;
-       *x509 = NULL;
-       *pkey = NULL;
-
-       if (!file)
-               return;
-
-       if (is_file_exist(file)) {
-               FILE *fp = g_fopen(file, "r");
-               if (fp) {
-                       p12 = d2i_PKCS12_fp(fp, NULL);
-                       fclose(fp);
-               }
-       } else {
-               log_error(LOG_PROTOCOL, "Can not open certificate file %s\n", file);
-       }
-       if (p12 != NULL) {
-               if (PKCS12_parse(p12, password, pkey, x509, NULL) == 1) {
-                       /* we got the correct password */
-               } else {
-                       gchar *tmp = NULL;
-                       hooks_invoke(SSL_CERT_GET_PASSWORD, &tmp);
-                       if (PKCS12_parse(p12, tmp, pkey, x509, NULL) == 1) {
-                               debug_print("got p12\n");
-                       } else {
-                               log_error(LOG_PROTOCOL, "%s\n", ERR_error_string(ERR_get_error(),NULL));
-                       }
-               }
-               PKCS12_free(p12);
-       }
-}
-#endif
-
-#ifdef USE_GNUTLS

 gnutls_x509_crt ssl_certificate_get_x509_from_pem_file(const gchar *file)
 {
        gnutls_x509_crt x509 = NULL;
 gnutls_x509_crt ssl_certificate_get_x509_from_pem_file(const gchar *file)
 {
        gnutls_x509_crt x509 = NULL;


@@ -1130,5 +907,4 @@ void ssl_certificate_get_x509_and_pkey_from_p12_file(const gchar *file, const gc
                gnutls_pkcs12_deinit(p12);
        }
 }
                gnutls_pkcs12_deinit(p12);
        }
 }

-#endif
-#endif /* USE_OPENSSL */
+#endif /* USE_GNUTLS */

diff --git a/src/common/ssl_certificate.h b/src/common/ssl_certificate.h
index b40bc1de8c7d3b85f83a443a8c0136d5f29ab3c3..98b331a6d9369699a35764ee6c9951648764a2f4 100644 (file)
--- a/src/common/ssl_certificate.h
+++ b/src/common/ssl_certificate.h
@@ -25,14 +25,9 @@
 #  include "config.h"
 #endif
 
 #  include "config.h"
 #endif
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
-#if USE_OPENSSL
-#include <openssl/ssl.h>
-#include <openssl/objects.h>
-#else
+#ifdef USE_GNUTLS

 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>

-#endif

 
 #include <glib.h>
 
 
 #include <glib.h>
 


@@ -44,17 +39,11 @@ typedef struct _SSLCertificate SSLCertificate;
 
 struct _SSLCertificate
 {
 
 struct _SSLCertificate
 {

-#if USE_OPENSSL
-       X509 *x509_cert;
-#else

        gnutls_x509_crt x509_cert;
        gnutls_x509_crt x509_cert;

-#endif

        gchar *host;
        gushort port;
        gchar *fingerprint;
        gchar *host;
        gushort port;
        gchar *fingerprint;

-#if USE_GNUTLS

        guint status;
        guint status;

-#endif

 };
 
 typedef struct _SSLCertHookData SSLCertHookData;
 };
 
 typedef struct _SSLCertHookData SSLCertHookData;


@@ -69,27 +58,12 @@ struct _SSLCertHookData
 
 SSLCertificate *ssl_certificate_find (gchar *host, gushort port, const gchar *fingerprint);
 SSLCertificate *ssl_certificate_find_lookup (gchar *host, gushort port, const gchar *fingerprint, gboolean lookup);
 
 SSLCertificate *ssl_certificate_find (gchar *host, gushort port, const gchar *fingerprint);
 SSLCertificate *ssl_certificate_find_lookup (gchar *host, gushort port, const gchar *fingerprint, gboolean lookup);

-#if USE_OPENSSL
-gboolean ssl_certificate_check (X509 *x509_cert, gchar *fqdn, gchar *host, gushort port);
-#else

 gboolean ssl_certificate_check (gnutls_x509_crt x509_cert, guint status, gchar *fqdn, gchar *host, gushort port);
 gboolean ssl_certificate_check (gnutls_x509_crt x509_cert, guint status, gchar *fqdn, gchar *host, gushort port);

-#endif

 void ssl_certificate_destroy(SSLCertificate *cert);
 void ssl_certificate_delete_from_disk(SSLCertificate *cert);
 char * readable_fingerprint(unsigned char *src, int len);
 void ssl_certificate_destroy(SSLCertificate *cert);
 void ssl_certificate_delete_from_disk(SSLCertificate *cert);
 char * readable_fingerprint(unsigned char *src, int len);

-#if USE_OPENSSL
-char *ssl_certificate_check_signer (X509 *cert);
-time_t asn1toTime(ASN1_TIME *asn1Time);
-#else

 char *ssl_certificate_check_signer (gnutls_x509_crt cert, guint status);
 char *ssl_certificate_check_signer (gnutls_x509_crt cert, guint status);

-#endif

 
 

-#if USE_OPENSSL
-X509 *ssl_certificate_get_x509_from_pem_file(const gchar *file);
-EVP_PKEY *ssl_certificate_get_pkey_from_pem_file(const gchar *file);
-void ssl_certificate_get_x509_and_pkey_from_p12_file(const gchar *file, 
-                       const gchar *password, X509 **x509, EVP_PKEY **pkey);
-#endif

 #ifdef USE_GNUTLS
 gnutls_x509_crt ssl_certificate_get_x509_from_pem_file(const gchar *file);
 gnutls_x509_privkey ssl_certificate_get_pkey_from_pem_file(const gchar *file);
 #ifdef USE_GNUTLS
 gnutls_x509_crt ssl_certificate_get_x509_from_pem_file(const gchar *file);
 gnutls_x509_privkey ssl_certificate_get_pkey_from_pem_file(const gchar *file);


@@ -98,5 +72,5 @@ void ssl_certificate_get_x509_and_pkey_from_p12_file(const gchar *file,
 size_t gnutls_i2d_X509(gnutls_x509_crt x509_cert, unsigned char **output);
 size_t gnutls_i2d_PrivateKey(gnutls_x509_privkey pkey, unsigned char **output);
 #endif
 size_t gnutls_i2d_X509(gnutls_x509_crt x509_cert, unsigned char **output);
 size_t gnutls_i2d_PrivateKey(gnutls_x509_privkey pkey, unsigned char **output);
 #endif

-#endif /* USE_OPENSSL */
+#endif /* USE_GNUTLS */

 #endif /* SSL_CERTIFICATE_H */
 #endif /* SSL_CERTIFICATE_H */

diff --git a/src/gtk/about.c b/src/gtk/about.c
index 564519a6691d1190666d7752128501bcfaa981dc..4ccd28a1879d1b2c3edb08cdd9964b3061edcbb2 100644 (file)
--- a/src/gtk/about.c
+++ b/src/gtk/about.c
@@ -576,14 +576,6 @@ static GtkWidget *about_create_child_page_license(void)
                "http://www.gnu.org/licenses/", -1,
                "link", NULL);
        gtk_text_buffer_insert(buffer, &iter, _(">. \n\n"), -1);
                "http://www.gnu.org/licenses/", -1,
                "link", NULL);
        gtk_text_buffer_insert(buffer, &iter, _(">. \n\n"), -1);

-#ifdef USE_OPENSSL
-       gtk_text_buffer_insert(buffer, &iter,
-               _("This product includes software developed by the OpenSSL Project "
-                 "for use in the OpenSSL Toolkit ("), -1);
-       gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, OPENSSL_URI, -1,
-               "link", NULL);
-       gtk_text_buffer_insert(buffer, &iter, _(").\n"), -1);
-#endif

 
        g_signal_connect(G_OBJECT(tag), "event",
                                G_CALLBACK(about_textview_uri_clicked), text);
 
        g_signal_connect(G_OBJECT(tag), "event",
                                G_CALLBACK(about_textview_uri_clicked), text);

diff --git a/src/gtk/sslcertwindow.c b/src/gtk/sslcertwindow.c
index 215177011d2c607d222a3c420293d07172a59096..6a266a0fd768c3305903a55d0022bc72fc243fde 100644 (file)
--- a/src/gtk/sslcertwindow.c
+++ b/src/gtk/sslcertwindow.c
@@ -22,11 +22,8 @@
 #  include "config.h"
 #endif
 
 #  include "config.h"
 #endif
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 
 

-#if USE_OPENSSL
-#include <openssl/ssl.h>
-#else

 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
 #include <sys/types.h>
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
 #include <sys/types.h>


@@ -34,7 +31,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>

-#endif
+

 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>


@@ -66,76 +63,14 @@ static GtkWidget *cert_presenter(SSLCertificate *cert)
        char *subject_commonname, *subject_location, *subject_organization;
        char *sig_status, *exp_date;
        char *md5_fingerprint, *sha1_fingerprint, *fingerprint;
        char *subject_commonname, *subject_location, *subject_organization;
        char *sig_status, *exp_date;
        char *md5_fingerprint, *sha1_fingerprint, *fingerprint;

-#if USE_OPENSSL
-       unsigned int n;
-#else

        size_t n;
        size_t n;

-#endif

        char buf[100];
        unsigned char md[128];  
        char buf[100];
        unsigned char md[128];  

-#if USE_OPENSSL
-       ASN1_TIME *validity;
-#else

        char *tmp;
        char *tmp;

-#endif

        time_t exp_time_t;
        struct tm lt;
 
        /* issuer */    
        time_t exp_time_t;
        struct tm lt;
 
        /* issuer */    

-#if USE_OPENSSL
-       if (X509_NAME_get_text_by_NID(X509_get_issuer_name(cert->x509_cert), 
-                                      NID_commonName, buf, 100) >= 0)
-               issuer_commonname = g_strdup(buf);
-       else
-               issuer_commonname = g_strdup(_("<not in certificate>"));
-       if (X509_NAME_get_text_by_NID(X509_get_issuer_name(cert->x509_cert), 
-                                      NID_localityName, buf, 100) >= 0) {
-               issuer_location = g_strdup(buf);
-               if (X509_NAME_get_text_by_NID(X509_get_issuer_name(cert->x509_cert), 
-                                      NID_countryName, buf, 100) >= 0)
-                       issuer_location = g_strconcat(issuer_location,", ",buf, NULL);
-       } else if (X509_NAME_get_text_by_NID(X509_get_issuer_name(cert->x509_cert), 
-                                      NID_countryName, buf, 100) >= 0)
-               issuer_location = g_strdup(buf);
-       else
-               issuer_location = g_strdup(_("<not in certificate>"));
-
-       if (X509_NAME_get_text_by_NID(X509_get_issuer_name(cert->x509_cert), 
-                                      NID_organizationName, buf, 100) >= 0)
-               issuer_organization = g_strdup(buf);
-       else 
-               issuer_organization = g_strdup(_("<not in certificate>"));
-        
-       /* subject */   
-       if (X509_NAME_get_text_by_NID(X509_get_subject_name(cert->x509_cert), 
-                                      NID_commonName, buf, 100) >= 0)
-               subject_commonname = g_strdup(buf);
-       else
-               subject_commonname = g_strdup(_("<not in certificate>"));
-       if (X509_NAME_get_text_by_NID(X509_get_subject_name(cert->x509_cert), 
-                                      NID_localityName, buf, 100) >= 0) {
-               subject_location = g_strdup(buf);
-               if (X509_NAME_get_text_by_NID(X509_get_subject_name(cert->x509_cert), 
-                                      NID_countryName, buf, 100) >= 0)
-                       subject_location = g_strconcat(subject_location,", ",buf, NULL);
-       } else if (X509_NAME_get_text_by_NID(X509_get_subject_name(cert->x509_cert), 
-                                      NID_countryName, buf, 100) >= 0)
-               subject_location = g_strdup(buf);
-       else
-               subject_location = g_strdup(_("<not in certificate>"));
-
-       if (X509_NAME_get_text_by_NID(X509_get_subject_name(cert->x509_cert), 
-                                      NID_organizationName, buf, 100) >= 0)
-               subject_organization = g_strdup(buf);
-       else 
-               subject_organization = g_strdup(_("<not in certificate>"));
-        
-       if ((validity = X509_get_notAfter(cert->x509_cert)) != NULL) {
-               exp_time_t = asn1toTime(validity);
-       } else {
-               exp_time_t = (time_t)0;
-       }
-#else

        issuer_commonname = g_malloc(BUFFSIZE);
        issuer_location = g_malloc(BUFFSIZE);
        issuer_organization = g_malloc(BUFFSIZE);
        issuer_commonname = g_malloc(BUFFSIZE);
        issuer_location = g_malloc(BUFFSIZE);
        issuer_organization = g_malloc(BUFFSIZE);


@@ -198,7 +133,6 @@ static GtkWidget *cert_presenter(SSLCertificate *cert)
                strncpy(subject_organization, _("<not in certificate>"), BUFFSIZE);
                
        exp_time_t = gnutls_x509_crt_get_expiration_time(cert->x509_cert);
                strncpy(subject_organization, _("<not in certificate>"), BUFFSIZE);
                
        exp_time_t = gnutls_x509_crt_get_expiration_time(cert->x509_cert);

-#endif 

 
        memset(buf, 0, sizeof(buf));
        if (exp_time_t > 0) {
 
        memset(buf, 0, sizeof(buf));
        if (exp_time_t > 0) {


@@ -208,15 +142,6 @@ static GtkWidget *cert_presenter(SSLCertificate *cert)
                exp_date = g_strdup("");
 
        /* fingerprint */
                exp_date = g_strdup("");
 
        /* fingerprint */

-#if USE_OPENSSL
-       X509_digest(cert->x509_cert, EVP_md5(), md, &n);
-       md5_fingerprint = readable_fingerprint(md, (int)n);
-       X509_digest(cert->x509_cert, EVP_sha1(), md, &n);
-       sha1_fingerprint = readable_fingerprint(md, (int)n);
-
-       /* signature */
-       sig_status = ssl_certificate_check_signer(cert->x509_cert);
-#else

        n = 128;
        gnutls_x509_crt_get_fingerprint(cert->x509_cert, GNUTLS_DIG_MD5, md, &n);
        md5_fingerprint = readable_fingerprint(md, (int)n);
        n = 128;
        gnutls_x509_crt_get_fingerprint(cert->x509_cert, GNUTLS_DIG_MD5, md, &n);
        md5_fingerprint = readable_fingerprint(md, (int)n);


@@ -226,7 +151,6 @@ static GtkWidget *cert_presenter(SSLCertificate *cert)
 
        /* signature */
        sig_status = ssl_certificate_check_signer(cert->x509_cert, cert->status);
 
        /* signature */
        sig_status = ssl_certificate_check_signer(cert->x509_cert, cert->status);

-#endif

 
        if (sig_status==NULL)
                sig_status = g_strdup(_("Correct"));
 
        if (sig_status==NULL)
                sig_status = g_strdup(_("Correct"));


@@ -392,11 +316,7 @@ static gboolean sslcertwindow_ask_new_cert(SSLCertificate *cert)
        gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
        g_free(buf);
        
        gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
        g_free(buf);
        

-#if USE_OPENSSL
-       sig_status = ssl_certificate_check_signer(cert->x509_cert);
-#else

        sig_status = ssl_certificate_check_signer(cert->x509_cert, cert->status);
        sig_status = ssl_certificate_check_signer(cert->x509_cert, cert->status);

-#endif

        if (sig_status==NULL)
                sig_status = g_strdup(_("Correct"));
 
        if (sig_status==NULL)
                sig_status = g_strdup(_("Correct"));
 


@@ -436,11 +356,7 @@ static gboolean sslcertwindow_ask_expired_cert(SSLCertificate *cert)
        gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
        g_free(buf);
        
        gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
        g_free(buf);
        

-#if USE_OPENSSL
-       sig_status = ssl_certificate_check_signer(cert->x509_cert);
-#else

        sig_status = ssl_certificate_check_signer(cert->x509_cert, cert->status);
        sig_status = ssl_certificate_check_signer(cert->x509_cert, cert->status);

-#endif

 
        if (sig_status==NULL)
                sig_status = g_strdup(_("Correct"));
 
        if (sig_status==NULL)
                sig_status = g_strdup(_("Correct"));


@@ -495,11 +411,7 @@ static gboolean sslcertwindow_ask_changed_cert(SSLCertificate *old_cert, SSLCert
        gtk_box_pack_start(GTK_BOX(vbox2), label, TRUE, TRUE, 0);
        g_free(buf);
        
        gtk_box_pack_start(GTK_BOX(vbox2), label, TRUE, TRUE, 0);
        g_free(buf);
        

-#if USE_OPENSSL
-       sig_status = ssl_certificate_check_signer(new_cert->x509_cert);
-#else

        sig_status = ssl_certificate_check_signer(new_cert->x509_cert, new_cert->status);
        sig_status = ssl_certificate_check_signer(new_cert->x509_cert, new_cert->status);

-#endif

 
        if (sig_status==NULL)
                sig_status = g_strdup(_("Correct"));
 
        if (sig_status==NULL)
                sig_status = g_strdup(_("Correct"));

diff --git a/src/gtk/sslcertwindow.h b/src/gtk/sslcertwindow.h
index 9d4818d4cf646fa72662f63be4d49c29359d525b..7f9c44976a916f5a5f9dfe518059bb10a3b9eb73 100644 (file)
--- a/src/gtk/sslcertwindow.h
+++ b/src/gtk/sslcertwindow.h
@@ -25,13 +25,7 @@
 #  include "config.h"
 #endif
 
 #  include "config.h"
 #endif
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
-#ifdef USE_OPENSSL
-#include <openssl/ssl.h>
-#include <openssl/objects.h>
-#else
-/* GNUTLS */
-#endif
+#ifdef USE_GNUTLS

 #include <glib.h>
 #include <gtk/gtk.h>
 #include "ssl_certificate.h"
 #include <glib.h>
 #include <gtk/gtk.h>
 #include "ssl_certificate.h"


@@ -39,5 +33,5 @@
 void sslcertwindow_show_cert(SSLCertificate *cert);
 void sslcertwindow_register_hook(void);
 
 void sslcertwindow_show_cert(SSLCertificate *cert);
 void sslcertwindow_register_hook(void);
 

-#endif /* USE_OPENSSL */
+#endif /* USE_GNUTLS */

 #endif /* __SSL_CERTWINDOW_H__ */
 #endif /* __SSL_CERTWINDOW_H__ */

diff --git a/src/imap.c b/src/imap.c
index 7f3639c5bde66d4a5165539cef9a9503e341cbf7..4f937651d9c74a39c20b74153155d9d2dd8a07ca 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -45,7 +45,7 @@
 #  include <iconv.h>
 #endif
 
 #  include <iconv.h>
 #endif
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 #  include "ssl.h"
 #endif
 
 #  include "ssl.h"
 #endif
 


@@ -142,7 +142,7 @@ struct _IMAPNameSpace
 
 
 #define IMAP4_PORT     143
 
 
 #define IMAP4_PORT     143

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 #define IMAPS_PORT     993
 #endif
 
 #define IMAPS_PORT     993
 #endif
 


@@ -332,7 +332,7 @@ static gint imap_cmd_login  (IMAPSession    *session,
                                 const gchar    *pass,
                                 const gchar    *type);
 static gint imap_cmd_noop      (IMAPSession    *session);
                                 const gchar    *pass,
                                 const gchar    *type);
 static gint imap_cmd_noop      (IMAPSession    *session);

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 static gint imap_cmd_starttls  (IMAPSession    *session);
 #endif
 static gint imap_cmd_select    (IMAPSession    *session,
 static gint imap_cmd_starttls  (IMAPSession    *session);
 #endif
 static gint imap_cmd_select    (IMAPSession    *session,


@@ -683,7 +683,7 @@ static void imap_handle_error(Session *session, int libetpan_errcode)
        case MAILIMAP_ERROR_SASL:
                log_warning(LOG_PROTOCOL, _("IMAP error on %s: SASL error\n"), session_server);
                break;
        case MAILIMAP_ERROR_SASL:
                log_warning(LOG_PROTOCOL, _("IMAP error on %s: SASL error\n"), session_server);
                break;

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        case MAILIMAP_ERROR_SSL:
                log_warning(LOG_PROTOCOL, _("IMAP error on %s: SSL error\n"), session_server);
                break;
        case MAILIMAP_ERROR_SSL:
                log_warning(LOG_PROTOCOL, _("IMAP error on %s: SSL error\n"), session_server);
                break;


@@ -1029,7 +1029,7 @@ static IMAPSession *imap_session_new(Folder * folder,
        int r;
        int authenticated = FALSE;
        
        int r;
        int authenticated = FALSE;
        

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        /* FIXME: IMAP over SSL only... */ 
        SSLType ssl_type;
 
        /* FIXME: IMAP over SSL only... */ 
        SSLType ssl_type;
 


@@ -1066,7 +1066,7 @@ static IMAPSession *imap_session_new(Folder * folder,
        else 
 #endif
        {
        else 
 #endif
        {

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

                if (ssl_type == SSL_TUNNEL) {
                        r = imap_threaded_connect_ssl(folder,
                                                      account->recv_server,
                if (ssl_type == SSL_TUNNEL) {
                        r = imap_threaded_connect_ssl(folder,
                                                      account->recv_server,


@@ -1089,7 +1089,7 @@ static IMAPSession *imap_session_new(Folder * folder,
                authenticated = FALSE;
        }
        else {
                authenticated = FALSE;
        }
        else {

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

                if (r == MAILIMAP_ERROR_SSL)
                        log_error(LOG_PROTOCOL, _("SSL handshake failed\n"));
                else
                if (r == MAILIMAP_ERROR_SSL)
                        log_error(LOG_PROTOCOL, _("SSL handshake failed\n"));
                else


@@ -1127,7 +1127,7 @@ static IMAPSession *imap_session_new(Folder * folder,
        session->folder = folder;
        IMAP_FOLDER(session->folder)->last_seen_separator = 0;
 
        session->folder = folder;
        IMAP_FOLDER(session->folder)->last_seen_separator = 0;
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        if (account->ssl_imap == SSL_STARTTLS) {
                gint ok;
 
        if (account->ssl_imap == SSL_STARTTLS) {
                gint ok;
 


@@ -3482,7 +3482,7 @@ static gint imap_cmd_login(IMAPSession *session,
        if (!strcmp(type, "LOGIN") && imap_has_capability(session, "LOGINDISABLED")) {
                gint ok = MAILIMAP_ERROR_BAD_STATE;
                if (imap_has_capability(session, "STARTTLS")) {
        if (!strcmp(type, "LOGIN") && imap_has_capability(session, "LOGINDISABLED")) {
                gint ok = MAILIMAP_ERROR_BAD_STATE;
                if (imap_has_capability(session, "STARTTLS")) {

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

                        log_warning(LOG_PROTOCOL, _("Server requires TLS to log in.\n"));
                        ok = imap_cmd_starttls(session);
                        if (ok != MAILIMAP_NO_ERROR) {
                        log_warning(LOG_PROTOCOL, _("Server requires TLS to log in.\n"));
                        ok = imap_cmd_starttls(session);
                        if (ok != MAILIMAP_NO_ERROR) {


@@ -3568,7 +3568,7 @@ static gint imap_cmd_noop(IMAPSession *session)
        return MAILIMAP_NO_ERROR;
 }
 
        return MAILIMAP_NO_ERROR;
 }
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 static gint imap_cmd_starttls(IMAPSession *session)
 {
        int r;
 static gint imap_cmd_starttls(IMAPSession *session)
 {
        int r;

diff --git a/src/inc.c b/src/inc.c
index d4b80694f00989a67bd3220ad80814421bb483af..9633138409889633c5e1e0c34fbaba5e3f5351f6 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -782,7 +782,7 @@ static IncState inc_pop3_session_do(IncSession *session)
        g_free(buf);
 
        server = pop3_session->ac_prefs->recv_server;
        g_free(buf);
 
        server = pop3_session->ac_prefs->recv_server;

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        port = pop3_session->ac_prefs->set_popport ?
                pop3_session->ac_prefs->popport :
                pop3_session->ac_prefs->ssl_pop == SSL_TUNNEL ? 995 : 110;
        port = pop3_session->ac_prefs->set_popport ?
                pop3_session->ac_prefs->popport :
                pop3_session->ac_prefs->ssl_pop == SSL_TUNNEL ? 995 : 110;

diff --git a/src/main.c b/src/main.c
index e7ed4f6e886a2e08cab24431c74d275ba35c07d3..bf28a1736164cc113e81c8a9a158238a2c2cb099 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -121,7 +121,7 @@ GCRY_THREAD_OPTION_PTHREAD_IMPL;
 #ifdef HAVE_VALGRIND
 #include "valgrind.h"
 #endif
 #ifdef HAVE_VALGRIND
 #include "valgrind.h"
 #endif

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 #  include "ssl.h"
 #endif
 
 #  include "ssl.h"
 #endif
 

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 0c5ed63f2553051c5351fdeafac02d06b256ef4e..06fcbcebfdda7f6fa592afb01a89b611ad5ad990 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -342,7 +342,7 @@ static void prefs_post_processing_open_cb (GtkAction        *action,
 
 static void prefs_filtering_open_cb    (GtkAction      *action,
                                  gpointer       data);
 
 static void prefs_filtering_open_cb    (GtkAction      *action,
                                  gpointer       data);

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 static void ssl_manager_open_cb        (GtkAction      *action,
                                  gpointer       data);
 #endif
 static void ssl_manager_open_cb        (GtkAction      *action,
                                  gpointer       data);
 #endif


@@ -689,7 +689,7 @@ static GtkActionEntry mainwin_entries[] =
        /* {"Tools/---",                        NULL, "---", NULL, NULL, NULL }, */
 
        {"Tools/Execute",                       NULL, N_("E_xecute"), "X", NULL, G_CALLBACK(execute_summary_cb) }, 
        /* {"Tools/---",                        NULL, "---", NULL, NULL, NULL }, */
 
        {"Tools/Execute",                       NULL, N_("E_xecute"), "X", NULL, G_CALLBACK(execute_summary_cb) }, 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        /* {"Tools/---",                        NULL, "---", NULL, NULL, NULL }, */
        {"Tools/SSLCertificates",               NULL, N_("SSL cer_tificates"), NULL, NULL, G_CALLBACK(ssl_manager_open_cb) }, 
 #endif
        /* {"Tools/---",                        NULL, "---", NULL, NULL, NULL }, */
        {"Tools/SSLCertificates",               NULL, N_("SSL cer_tificates"), NULL, NULL, G_CALLBACK(ssl_manager_open_cb) }, 
 #endif


@@ -1889,7 +1889,7 @@ MainWindow *main_window_create()
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "Separator5", "Tools/---", GTK_UI_MANAGER_SEPARATOR)
 
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "Execute", "Tools/Execute", GTK_UI_MANAGER_MENUITEM)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "Separator5", "Tools/---", GTK_UI_MANAGER_SEPARATOR)
 
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "Execute", "Tools/Execute", GTK_UI_MANAGER_MENUITEM)

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "Separator6", "Tools/---", GTK_UI_MANAGER_SEPARATOR)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "SSLCertificates", "Tools/SSLCertificates", GTK_UI_MANAGER_MENUITEM)
 #endif
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "Separator6", "Tools/---", GTK_UI_MANAGER_SEPARATOR)
        MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Tools", "SSLCertificates", "Tools/SSLCertificates", GTK_UI_MANAGER_MENUITEM)
 #endif


@@ -2251,7 +2251,7 @@ MainWindow *main_window_create()
        folderview_init(folderview);
        summary_init(summaryview);
        messageview_init(messageview);
        folderview_init(folderview);
        summary_init(summaryview);
        messageview_init(messageview);

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        sslcertwindow_register_hook();
 #endif
        mainwin->lock_count = 0;
        sslcertwindow_register_hook();
 #endif
        mainwin->lock_count = 0;


@@ -4822,7 +4822,7 @@ static void prefs_tags_open_cb(GtkAction *action, gpointer data)
        GSList * list = summary_get_selected_msg_list(mainwin->summaryview);
        tag_apply_open(list);
 }
        GSList * list = summary_get_selected_msg_list(mainwin->summaryview);
        tag_apply_open(list);
 }

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 static void ssl_manager_open_cb(GtkAction *action, gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;
 static void ssl_manager_open_cb(GtkAction *action, gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;

diff --git a/src/news.c b/src/news.c
index f0a9f1afc03f79cb28084e4509ffbea3c504c937..e1505edfa7eb47ffd312d046be8126aa3a29fc2c 100644 (file)
--- a/src/news.c
+++ b/src/news.c
@@ -55,12 +55,12 @@
 #include "remotefolder.h"
 #include "alertpanel.h"
 #include "inc.h"
 #include "remotefolder.h"
 #include "alertpanel.h"
 #include "inc.h"

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 #  include "ssl.h"
 #endif
 
 #define NNTP_PORT      119
 #  include "ssl.h"
 #endif
 
 #define NNTP_PORT      119

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 #define NNTPS_PORT     563
 #endif
 
 #define NNTPS_PORT     563
 #endif
 


@@ -99,7 +99,7 @@ static gchar *news_fetch_msg          (Folder         *folder,
 static void news_remove_cached_msg     (Folder         *folder, 
                                         FolderItem     *item, 
                                         MsgInfo        *msginfo);
 static void news_remove_cached_msg     (Folder         *folder, 
                                         FolderItem     *item, 
                                         MsgInfo        *msginfo);

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 static Session *news_session_new        (Folder        *folder,
                                          const gchar   *server,
                                          gushort        port,
 static Session *news_session_new        (Folder        *folder,
                                          const gchar   *server,
                                          gushort        port,


@@ -281,7 +281,7 @@ static void news_session_destroy(Session *session)
                g_free(news_session->group);
 }
 
                g_free(news_session->group);
 }
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 static Session *news_session_new(Folder *folder, const gchar *server, gushort port,
                                 const gchar *userid, const gchar *passwd,
                                 SSLType ssl_type)
 static Session *news_session_new(Folder *folder, const gchar *server, gushort port,
                                 const gchar *userid, const gchar *passwd,
                                 SSLType ssl_type)


@@ -305,7 +305,7 @@ static Session *news_session_new(Folder *folder, const gchar *server, gushort po
        
        nntp_init(folder);
 
        
        nntp_init(folder);
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        if (ssl_type != SSL_NONE)
                r = nntp_threaded_connect_ssl(folder, server, port);
        else
        if (ssl_type != SSL_NONE)
                r = nntp_threaded_connect_ssl(folder, server, port);
        else


@@ -343,7 +343,7 @@ static Session *news_session_new_for_folder(Folder *folder)
                                                                  &(ac->session_passwd));
        }
 
                                                                  &(ac->session_passwd));
        }
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        port = ac->set_nntpport ? ac->nntpport
                : ac->ssl_nntp ? NNTPS_PORT : NNTP_PORT;
        session = news_session_new(folder, ac->nntp_server, port, userid, passwd,
        port = ac->set_nntpport ? ac->nntpport
                : ac->ssl_nntp ? NNTPS_PORT : NNTP_PORT;
        session = news_session_new(folder, ac->nntp_server, port, userid, passwd,

diff --git a/src/pop.c b/src/pop.c
index 968e951f4abc7000289e4075aed0f64fed836d2c..a49e01ea104255c09f04abffbc64d95ebbe6ebca 100644 (file)
--- a/src/pop.c
+++ b/src/pop.c
@@ -45,7 +45,7 @@ static gint pop3_greeting_recv                (Pop3Session *session,
 static gint pop3_getauth_user_send     (Pop3Session *session);
 static gint pop3_getauth_pass_send     (Pop3Session *session);
 static gint pop3_getauth_apop_send     (Pop3Session *session);
 static gint pop3_getauth_user_send     (Pop3Session *session);
 static gint pop3_getauth_pass_send     (Pop3Session *session);
 static gint pop3_getauth_apop_send     (Pop3Session *session);

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 static gint pop3_stls_send             (Pop3Session *session);
 static gint pop3_stls_recv             (Pop3Session *session);
 #endif
 static gint pop3_stls_send             (Pop3Session *session);
 static gint pop3_stls_recv             (Pop3Session *session);
 #endif


@@ -100,7 +100,7 @@ static gint pop3_greeting_recv(Pop3Session *session, const gchar *msg)
        return PS_SUCCESS;
 }
 
        return PS_SUCCESS;
 }
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 static gint pop3_stls_send(Pop3Session *session)
 {
        session->state = POP3_STLS;
 static gint pop3_stls_send(Pop3Session *session)
 {
        session->state = POP3_STLS;


@@ -116,7 +116,7 @@ static gint pop3_stls_recv(Pop3Session *session)
        }
        return PS_SUCCESS;
 }
        }
        return PS_SUCCESS;
 }

-#endif /* USE_OPENSSL */
+#endif /* USE_GNUTLS */

 
 static gint pop3_getauth_user_send(Pop3Session *session)
 {
 
 static gint pop3_getauth_user_send(Pop3Session *session)
 {


@@ -880,7 +880,7 @@ static Pop3ErrorValue pop3_ok(Pop3Session *session, const gchar *msg)
                        ok = PS_ERROR;
                } else {
                        switch (session->state) {
                        ok = PS_ERROR;
                } else {
                        switch (session->state) {

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

                        case POP3_STLS:
                                log_error(LOG_PROTOCOL, _("couldn't start TLS session\n"));
                                ok = PS_ERROR;
                        case POP3_STLS:
                                log_error(LOG_PROTOCOL, _("couldn't start TLS session\n"));
                                ok = PS_ERROR;


@@ -944,7 +944,7 @@ static gint pop3_session_recv_msg(Session *session, const gchar *msg)
        case POP3_READY:
        case POP3_GREETING:
                pop3_greeting_recv(pop3_session, body);
        case POP3_READY:
        case POP3_GREETING:
                pop3_greeting_recv(pop3_session, body);

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

                if (pop3_session->ac_prefs->ssl_pop == SSL_STARTTLS)
                        val = pop3_stls_send(pop3_session);
                else
                if (pop3_session->ac_prefs->ssl_pop == SSL_STARTTLS)
                        val = pop3_stls_send(pop3_session);
                else


@@ -954,7 +954,7 @@ static gint pop3_session_recv_msg(Session *session, const gchar *msg)
                else
                        val = pop3_getauth_user_send(pop3_session);
                break;
                else
                        val = pop3_getauth_user_send(pop3_session);
                break;

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        case POP3_STLS:
                if (pop3_stls_recv(pop3_session) != PS_SUCCESS)
                        return -1;
        case POP3_STLS:
                if (pop3_stls_recv(pop3_session) != PS_SUCCESS)
                        return -1;

diff --git a/src/pop.h b/src/pop.h
index cd95c1fd15fb91f3e05d00147a3b8d2134b45306..64377ba59410f4d821ab09ee0fa71489620dd896 100644 (file)
--- a/src/pop.h
+++ b/src/pop.h
@@ -47,7 +47,7 @@ typedef struct _MailReceiveData       MailReceiveData;
 typedef enum {
        POP3_READY,
        POP3_GREETING,
 typedef enum {
        POP3_READY,
        POP3_GREETING,

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        POP3_STLS,
 #endif
        POP3_GETAUTH_USER,
        POP3_STLS,
 #endif
        POP3_GETAUTH_USER,

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 4f17d82c8bb12086eee125af925fe87c6696560b..4d568726706ddfc853d66c4e37ca5a81b15859bf 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -72,7 +72,7 @@ static GtkWidget *entry_sigpath;
 static GtkWidget *signature_browse_button;
 static GtkWidget *signature_edit_button;
 
 static GtkWidget *signature_browse_button;
 static GtkWidget *signature_edit_button;
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 static GtkWidget *entry_in_cert_file;
 static GtkWidget *entry_out_cert_file;
 static GtkWidget *in_ssl_cert_browse_button;
 static GtkWidget *entry_in_cert_file;
 static GtkWidget *entry_out_cert_file;
 static GtkWidget *in_ssl_cert_browse_button;


@@ -305,7 +305,7 @@ static SendPage send_page;
 static ComposePage compose_page;
 static TemplatesPage templates_page;
 static PrivacyPage privacy_page;
 static ComposePage compose_page;
 static TemplatesPage templates_page;
 static PrivacyPage privacy_page;

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 static SSLPage ssl_page;
 #endif
 static AdvancedPage advanced_page;
 static SSLPage ssl_page;
 #endif
 static AdvancedPage advanced_page;


@@ -680,7 +680,7 @@ static PrefParam privacy_param[] = {
 };
 
 static PrefParam ssl_param[] = {
 };
 
 static PrefParam ssl_param[] = {

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        {"ssl_pop", "0", &tmp_ac_prefs.ssl_pop, P_ENUM,
         &ssl_page.pop_nossl_radiobtn,
         prefs_account_enum_set_data_from_radiobtn,
        {"ssl_pop", "0", &tmp_ac_prefs.ssl_pop, P_ENUM,
         &ssl_page.pop_nossl_radiobtn,
         prefs_account_enum_set_data_from_radiobtn,


@@ -743,7 +743,7 @@ static PrefParam ssl_param[] = {
 
        {"use_nonblocking_ssl", "1", &tmp_ac_prefs.use_nonblocking_ssl, P_BOOL,
         NULL, NULL, NULL},
 
        {"use_nonblocking_ssl", "1", &tmp_ac_prefs.use_nonblocking_ssl, P_BOOL,
         NULL, NULL, NULL},

-#endif /* USE_OPENSSL */
+#endif /* USE_GNUTLS */

 
        {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
 };
 
        {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
 };


@@ -850,7 +850,7 @@ static void prefs_account_sigcmd_radiobtn_cb        (GtkWidget      *widget,
 
 static void prefs_account_signature_browse_cb  (GtkWidget      *widget,
                                                 gpointer        data);
 
 static void prefs_account_signature_browse_cb  (GtkWidget      *widget,
                                                 gpointer        data);

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 static void prefs_account_in_cert_browse_cb    (GtkWidget      *widget,
                                                 gpointer        data);
 
 static void prefs_account_in_cert_browse_cb    (GtkWidget      *widget,
                                                 gpointer        data);
 


@@ -2248,7 +2248,7 @@ static void privacy_create_widget_func(PrefsPage * _page,
        page->page.widget = vbox1;
 }
        
        page->page.widget = vbox1;
 }
        

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 
 #define CREATE_RADIO_BUTTON(box, btn, btn_p, label, data)              \
 {                                                                      \
 
 #define CREATE_RADIO_BUTTON(box, btn, btn_p, label, data)              \
 {                                                                      \


@@ -2498,7 +2498,7 @@ static void ssl_create_widget_func(PrefsPage * _page,
 
 #undef CREATE_RADIO_BUTTONS
 #undef CREATE_RADIO_BUTTON
 
 #undef CREATE_RADIO_BUTTONS
 #undef CREATE_RADIO_BUTTON

-#endif /* USE_OPENSSL */
+#endif /* USE_GNUTLS */

        
 static void advanced_create_widget_func(PrefsPage * _page,
                                            GtkWindow * window,
        
 static void advanced_create_widget_func(PrefsPage * _page,
                                            GtkWindow * window,


@@ -2856,7 +2856,7 @@ static gint prefs_privacy_apply(void)
        return 0;
 }
 
        return 0;
 }
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 static gint prefs_ssl_apply(void)
 {
        prefs_set_data_from_dialog(ssl_param);
 static gint prefs_ssl_apply(void)
 {
        prefs_set_data_from_dialog(ssl_param);


@@ -2900,7 +2900,7 @@ static void privacy_destroy_widget_func(PrefsPage *_page)
        /* PrivacyPage *page = (PrivacyPage *) _page; */
 }
 
        /* PrivacyPage *page = (PrivacyPage *) _page; */
 }
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 static void ssl_destroy_widget_func(PrefsPage *_page)
 {
        /* SSLPage *page = (SSLPage *) _page; */
 static void ssl_destroy_widget_func(PrefsPage *_page)
 {
        /* SSLPage *page = (SSLPage *) _page; */


@@ -2972,7 +2972,7 @@ static gboolean privacy_can_close_func(PrefsPage *_page)
        return prefs_privacy_apply() >= 0;
 }
 
        return prefs_privacy_apply() >= 0;
 }
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 static gboolean ssl_can_close_func(PrefsPage *_page)
 {
        SSLPage *page = (SSLPage *) _page;
 static gboolean ssl_can_close_func(PrefsPage *_page)
 {
        SSLPage *page = (SSLPage *) _page;


@@ -3072,7 +3072,7 @@ static void privacy_save_func(PrefsPage *_page)
                cancelled = FALSE;
 }
 
                cancelled = FALSE;
 }
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 static void ssl_save_func(PrefsPage *_page)
 {
        SSLPage *page = (SSLPage *) _page;
 static void ssl_save_func(PrefsPage *_page)
 {
        SSLPage *page = (SSLPage *) _page;


@@ -3204,7 +3204,7 @@ static void register_privacy_page(void)
        prefs_account_register_page((PrefsPage *) &privacy_page);
 }
 
        prefs_account_register_page((PrefsPage *) &privacy_page);
 }
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 static void register_ssl_page(void)
 {
        static gchar *path[3];
 static void register_ssl_page(void)
 {
        static gchar *path[3];


@@ -3313,7 +3313,7 @@ void prefs_account_init()
        register_compose_page();
        register_templates_page();
        register_privacy_page();
        register_compose_page();
        register_templates_page();
        register_privacy_page();

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        register_ssl_page();
        hooks_register_hook(SSLCERT_GET_CLIENT_CERT_HOOKLIST, sslcert_get_client_cert_hook, NULL);
        hooks_register_hook(SSL_CERT_GET_PASSWORD, sslcert_get_password, NULL);
        register_ssl_page();
        hooks_register_hook(SSLCERT_GET_CLIENT_CERT_HOOKLIST, sslcert_get_client_cert_hook, NULL);
        hooks_register_hook(SSL_CERT_GET_PASSWORD, sslcert_get_password, NULL);


@@ -3690,7 +3690,7 @@ static void prefs_account_signature_browse_cb(GtkWidget *widget, gpointer data)
        g_free(utf8_filename);
 }
 
        g_free(utf8_filename);
 }
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 static void prefs_account_in_cert_browse_cb(GtkWidget *widget, gpointer data)
 {
        gchar *filename;
 static void prefs_account_in_cert_browse_cb(GtkWidget *widget, gpointer data)
 {
        gchar *filename;


@@ -4055,7 +4055,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                                 FALSE);
                }
 
                                 FALSE);
                }
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

                gtk_widget_hide(ssl_page.pop_frame);
                gtk_widget_hide(ssl_page.imap_frame);
                gtk_widget_show(ssl_page.nntp_frame);
                gtk_widget_hide(ssl_page.pop_frame);
                gtk_widget_hide(ssl_page.imap_frame);
                gtk_widget_show(ssl_page.nntp_frame);


@@ -4149,7 +4149,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                                 TRUE);
                }
 
                                 TRUE);
                }
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

                gtk_widget_hide(ssl_page.pop_frame);
                gtk_widget_hide(ssl_page.imap_frame);
                gtk_widget_hide(ssl_page.nntp_frame);
                gtk_widget_hide(ssl_page.pop_frame);
                gtk_widget_hide(ssl_page.imap_frame);
                gtk_widget_hide(ssl_page.nntp_frame);


@@ -4252,7 +4252,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                                 FALSE);
                }
 
                                 FALSE);
                }
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

                gtk_widget_hide(ssl_page.pop_frame);
                gtk_widget_show(ssl_page.imap_frame);
                gtk_widget_hide(ssl_page.nntp_frame);
                gtk_widget_hide(ssl_page.pop_frame);
                gtk_widget_show(ssl_page.imap_frame);
                gtk_widget_hide(ssl_page.nntp_frame);


@@ -4344,7 +4344,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                gtk_toggle_button_set_active
                        (GTK_TOGGLE_BUTTON(receive_page.recvatgetall_checkbtn), FALSE);
 
                gtk_toggle_button_set_active
                        (GTK_TOGGLE_BUTTON(receive_page.recvatgetall_checkbtn), FALSE);
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

                gtk_widget_hide(ssl_page.pop_frame);
                gtk_widget_hide(ssl_page.imap_frame);
                gtk_widget_hide(ssl_page.nntp_frame);
                gtk_widget_hide(ssl_page.pop_frame);
                gtk_widget_hide(ssl_page.imap_frame);
                gtk_widget_hide(ssl_page.nntp_frame);


@@ -4442,7 +4442,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                                 TRUE);
                }
 
                                 TRUE);
                }
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

                gtk_widget_show(ssl_page.pop_frame);
                gtk_widget_hide(ssl_page.imap_frame);
                gtk_widget_hide(ssl_page.nntp_frame);
                gtk_widget_show(ssl_page.pop_frame);
                gtk_widget_hide(ssl_page.imap_frame);
                gtk_widget_hide(ssl_page.nntp_frame);

diff --git a/src/send_message.c b/src/send_message.c
index ea5ac42caf309ac69159c621277ab527fe4d6ad9..104da08ebcc3179b8d1bd7a30ff2a9c95efba8d9 100644 (file)
--- a/src/send_message.c
+++ b/src/send_message.c
@@ -278,7 +278,7 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
                        smtp_session->pass = NULL;
                }
 
                        smtp_session->pass = NULL;
                }
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

                port = ac_prefs->set_smtpport ? ac_prefs->smtpport :
                        ac_prefs->ssl_smtp == SSL_TUNNEL ? SSMTP_PORT : SMTP_PORT;
                session->ssl_type = ac_prefs->ssl_smtp;
                port = ac_prefs->set_smtpport ? ac_prefs->smtpport :
                        ac_prefs->ssl_smtp == SSL_TUNNEL ? SSMTP_PORT : SMTP_PORT;
                session->ssl_type = ac_prefs->ssl_smtp;

diff --git a/src/send_message.h b/src/send_message.h
index 40612a015d11839d8242ecd973ba9f9ac7a55749..579ee66ea85c570ebb2c83f3b54b8431cb4c242d 100644 (file)
--- a/src/send_message.h
+++ b/src/send_message.h
@@ -25,7 +25,7 @@
 #include "prefs_account.h"
 
 #define SMTP_PORT      25
 #include "prefs_account.h"
 
 #define SMTP_PORT      25

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 #define SSMTP_PORT     465
 #endif
 
 #define SSMTP_PORT     465
 #endif
 

diff --git a/src/ssl_manager.c b/src/ssl_manager.c
index 7856d0c3e3996fa946977ff2a12fe290f670692f..5ad9dd79541a00f7cb4c5323b8f8c84b910ba592 100644 (file)
--- a/src/ssl_manager.c
+++ b/src/ssl_manager.c
@@ -21,7 +21,7 @@
 #  include "config.h"
 #endif
 
 #  include "config.h"
 #endif
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 #include <gtk/gtk.h>
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <glib.h>
 #include <glib/gi18n.h>

diff --git a/src/ssl_manager.h b/src/ssl_manager.h
index f6443f028da74999285531210219b5cb9e731a9c..cca6dc151b4dfdc3f4d4afa0eb5197b1dc48fbe7 100644 (file)
--- a/src/ssl_manager.h
+++ b/src/ssl_manager.h
@@ -20,7 +20,7 @@
 
 #ifndef SSL_MANAGER_H
 #define SSL_MANAGER_H
 
 #ifndef SSL_MANAGER_H
 #define SSL_MANAGER_H

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 #include "mainwindow.h"
 
 void ssl_manager_create (void); 
 #include "mainwindow.h"
 
 void ssl_manager_create (void); 

diff --git a/src/wizard.c b/src/wizard.c
index 031e565a6ad4aed6d57513efe73920fcfe0a194e..4b1bcb680239d2d1bcb40896b3c395a8e139f1c5 100644 (file)
--- a/src/wizard.c
+++ b/src/wizard.c
@@ -49,7 +49,7 @@
 #include "folder.h"
 #include "alertpanel.h"
 #include "filesel.h"
 #include "folder.h"
 #include "alertpanel.h"
 #include "filesel.h"

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 #include "ssl.h"
 #endif
 #include "prefs_common.h"
 #include "ssl.h"
 #endif
 #include "prefs_common.h"


@@ -109,7 +109,7 @@ typedef struct
        GtkWidget *recv_imap_subdir;
        GtkWidget *subsonly_checkbtn;
        GtkWidget *no_imap_warning;
        GtkWidget *recv_imap_subdir;
        GtkWidget *subsonly_checkbtn;
        GtkWidget *no_imap_warning;

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        GtkWidget *smtp_use_ssl;
        GtkWidget *recv_use_ssl;
        GtkWidget *smtp_use_tls;
        GtkWidget *smtp_use_ssl;
        GtkWidget *recv_use_ssl;
        GtkWidget *smtp_use_tls;


@@ -623,7 +623,7 @@ static gboolean wizard_write_config(WizardWindow *wizard)
        GList *account_list = NULL;
        gchar *smtp_server, *recv_server;
        gint smtp_port, recv_port;
        GList *account_list = NULL;
        gchar *smtp_server, *recv_server;
        gint smtp_port, recv_port;

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        SSLType smtp_ssl_type, recv_ssl_type;
 #endif
 
        SSLType smtp_ssl_type, recv_ssl_type;
 #endif
 


@@ -798,7 +798,7 @@ static gboolean wizard_write_config(WizardWindow *wizard)
                prefs_account->use_smtp_auth = TRUE;
        }
 
                prefs_account->use_smtp_auth = TRUE;
        }
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        smtp_ssl_type = SSL_NONE;
        recv_ssl_type = SSL_NONE;       
 
        smtp_ssl_type = SSL_NONE;
        recv_ssl_type = SSL_NONE;       
 


@@ -1212,7 +1212,7 @@ static void smtp_auth_changed (GtkWidget *btn, gpointer data)
        gtk_widget_set_sensitive(wizard->smtp_password_label, do_auth);
 }
 
        gtk_widget_set_sensitive(wizard->smtp_password_label, do_auth);
 }
 

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

 static void cert_browse_cb(GtkWidget *widget, gpointer data)
 {
        GtkEntry *dest = GTK_ENTRY(data);
 static void cert_browse_cb(GtkWidget *widget, gpointer data)
 {
        GtkEntry *dest = GTK_ENTRY(data);


@@ -1237,7 +1237,7 @@ static GtkWidget* smtp_page (WizardWindow * wizard)
        GtkWidget *table = gtk_table_new(1, 1, FALSE);
        GtkWidget *vbox;
        GtkWidget *hbox;
        GtkWidget *table = gtk_table_new(1, 1, FALSE);
        GtkWidget *vbox;
        GtkWidget *hbox;

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        GtkWidget *label;
        GtkWidget *button;
        GtkWidget *smtp_cert_table;
        GtkWidget *label;
        GtkWidget *button;
        GtkWidget *smtp_cert_table;


@@ -1311,7 +1311,7 @@ static GtkWidget* smtp_page (WizardWindow * wizard)
                gtk_misc_set_alignment(GTK_MISC(wizard->smtp_password_label), 1, 0.5);        
        gtk_box_pack_start(GTK_BOX(hbox), wizard->smtp_password_label, FALSE, FALSE, 0);
        gtk_box_pack_start(GTK_BOX(hbox), wizard->smtp_password, TRUE, TRUE, 0);
                gtk_misc_set_alignment(GTK_MISC(wizard->smtp_password_label), 1, 0.5);        
        gtk_box_pack_start(GTK_BOX(hbox), wizard->smtp_password_label, FALSE, FALSE, 0);
        gtk_box_pack_start(GTK_BOX(hbox), wizard->smtp_password, TRUE, TRUE, 0);

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
        gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
        wizard->smtp_use_ssl = gtk_check_button_new_with_label(
        hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
        gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
        wizard->smtp_use_ssl = gtk_check_button_new_with_label(


@@ -1381,7 +1381,7 @@ static void wizard_protocol_change(WizardWindow *wizard, RecvProtocol protocol)
                gtk_widget_show(wizard->recv_username_label);
                gtk_widget_show(wizard->recv_password_label);
                gtk_widget_hide(wizard->no_imap_warning);
                gtk_widget_show(wizard->recv_username_label);
                gtk_widget_show(wizard->recv_password_label);
                gtk_widget_hide(wizard->no_imap_warning);

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

                gtk_widget_show(wizard->recv_use_ssl);
                gtk_widget_show(wizard->recv_use_tls);
                gtk_widget_show(wizard->recv_cert_table);
                gtk_widget_show(wizard->recv_use_ssl);
                gtk_widget_show(wizard->recv_use_tls);
                gtk_widget_show(wizard->recv_cert_table);


@@ -1406,7 +1406,7 @@ static void wizard_protocol_change(WizardWindow *wizard, RecvProtocol protocol)
                gtk_widget_show(wizard->recv_username_label);
                gtk_widget_show(wizard->recv_password_label);
                gtk_widget_hide(wizard->no_imap_warning);
                gtk_widget_show(wizard->recv_username_label);
                gtk_widget_show(wizard->recv_password_label);
                gtk_widget_hide(wizard->no_imap_warning);

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

                gtk_widget_show(wizard->recv_use_ssl);
                gtk_widget_show(wizard->recv_use_tls);
                gtk_widget_show(wizard->recv_cert_table);
                gtk_widget_show(wizard->recv_use_ssl);
                gtk_widget_show(wizard->recv_use_tls);
                gtk_widget_show(wizard->recv_cert_table);


@@ -1432,7 +1432,7 @@ static void wizard_protocol_change(WizardWindow *wizard, RecvProtocol protocol)
                        gtk_widget_hide(wizard->mailbox_label);
                        gtk_widget_hide(wizard->mailbox_name);
                }
                        gtk_widget_hide(wizard->mailbox_label);
                        gtk_widget_hide(wizard->mailbox_name);
                }

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

                gtk_widget_hide(wizard->recv_use_ssl);
                gtk_widget_hide(wizard->recv_use_tls);
                gtk_widget_hide(wizard->recv_cert_table);
                gtk_widget_hide(wizard->recv_use_ssl);
                gtk_widget_hide(wizard->recv_use_tls);
                gtk_widget_hide(wizard->recv_cert_table);


@@ -1451,7 +1451,7 @@ static void wizard_protocol_change(WizardWindow *wizard, RecvProtocol protocol)
                gtk_widget_hide(wizard->recv_password);
                gtk_widget_hide(wizard->recv_username_label);
                gtk_widget_hide(wizard->recv_password_label);
                gtk_widget_hide(wizard->recv_password);
                gtk_widget_hide(wizard->recv_username_label);
                gtk_widget_hide(wizard->recv_password_label);

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

                gtk_widget_hide(wizard->recv_use_ssl);
                gtk_widget_hide(wizard->recv_use_tls);
                gtk_widget_hide(wizard->recv_cert_table);
                gtk_widget_hide(wizard->recv_use_ssl);
                gtk_widget_hide(wizard->recv_use_tls);
                gtk_widget_hide(wizard->recv_cert_table);


@@ -1477,7 +1477,7 @@ static GtkWidget* recv_page (WizardWindow * wizard)
        GtkWidget *table = gtk_table_new(1,1, FALSE);
        GtkWidget *vbox;
        GtkWidget *hbox;
        GtkWidget *table = gtk_table_new(1,1, FALSE);
        GtkWidget *vbox;
        GtkWidget *hbox;

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        GtkWidget *label;
        GtkWidget *button;
        GtkWidget *recv_cert_table;
        GtkWidget *label;
        GtkWidget *button;
        GtkWidget *recv_cert_table;


@@ -1574,7 +1574,7 @@ static GtkWidget* recv_page (WizardWindow * wizard)
        gtk_box_pack_start(GTK_BOX(hbox), wizard->recv_password_label, FALSE, FALSE, 0);
        gtk_box_pack_start(GTK_BOX(hbox), wizard->recv_password, TRUE, TRUE, 0);
        
        gtk_box_pack_start(GTK_BOX(hbox), wizard->recv_password_label, FALSE, FALSE, 0);
        gtk_box_pack_start(GTK_BOX(hbox), wizard->recv_password, TRUE, TRUE, 0);
        

-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS

        hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
        gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
        wizard->recv_use_ssl = gtk_check_button_new_with_label(
        hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
        gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
        wizard->recv_use_ssl = gtk_check_button_new_with_label(