commit ce0c0b27320ff29949c129c52c060a538d635115
parent 574c22a71d592c6a3998f8c728917b40ea8fb5df
Author: Colin Leroy <colin@colino.net>
Date: Tue, 30 Aug 2011 06:25:59 +0000
2011-08-30 [colin] 3.7.10cvs9
* src/etpan/imap-thread.c
* src/etpan/nntp-thread.c
Remove dead openSSL code
Diffstat:
5 files changed, 12 insertions(+), 69 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-30 [colin] 3.7.10cvs9
+
+ * src/etpan/imap-thread.c
+ * src/etpan/nntp-thread.c
+ Remove dead openSSL code
+
2011-08-30 [colin] 3.7.10cvs8
* src/ssl_manager.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4212,3 +4212,4 @@
( cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/plugins/pgpcore/Makefile.am; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/plugins/pgpinline/Makefile.am; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/plugins/pgpmime/Makefile.am; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/smime/Makefile.am; ) > 3.7.10cvs6.patchset
( cvs diff -u -r 1.105.2.167 -r 1.105.2.168 src/prefs_account.c; ) > 3.7.10cvs7.patchset
( cvs diff -u -r 1.3.2.34 -r 1.3.2.35 src/ssl_manager.c; cvs diff -u -r 1.9.2.44 -r 1.9.2.45 src/common/ssl.c; cvs diff -u -r 1.4.2.39 -r 1.4.2.40 src/common/ssl_certificate.c; cvs diff -u -r 1.1.4.15 -r 1.1.4.16 src/common/ssl_certificate.h; cvs diff -u -r 1.1.4.115 -r 1.1.4.116 src/etpan/imap-thread.c; cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/etpan/nntp-thread.c; ) > 3.7.10cvs8.patchset
+( cvs diff -u -r 1.1.4.116 -r 1.1.4.117 src/etpan/imap-thread.c; cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/etpan/nntp-thread.c; ) > 3.7.10cvs9.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
MICRO_VERSION=10
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=8
+EXTRA_VERSION=9
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
@@ -523,27 +523,7 @@ int imap_threaded_connect(Folder * folder, const char * server, int port)
static int etpan_certificate_check(const unsigned char *certificate, int len, void *data)
{
-#ifdef USE_OPENSSL
- struct connect_param *param = (struct connect_param *)data;
- X509 *cert = NULL;
-
- if (certificate == NULL || len < 0) {
- g_warning("no cert presented.\n");
- return 0;
- }
- cert = d2i_X509(NULL, (const unsigned char **)&certificate, len);
- if (cert == NULL) {
- g_warning("IMAP: can't get cert\n");
- return 0;
- } else if (ssl_certificate_check(cert, (gchar *)param->server,
- (gushort)param->port) == TRUE) {
- X509_free(cert);
- return 0;
- } else {
- X509_free(cert);
- return -1;
- }
-#elif USE_GNUTLS
+#ifdef USE_GNUTLS
struct connect_param *param = (struct connect_param *)data;
gnutls_x509_crt cert = NULL;
gnutls_datum tmp;
@@ -574,17 +554,12 @@ static int etpan_certificate_check(const unsigned char *certificate, int len, vo
static void connect_ssl_context_cb(struct mailstream_ssl_context * ssl_context, void * data)
{
-#if (defined(USE_OPENSSL) || defined(USE_GNUTLS))
+#ifdef USE_GNUTLS
PrefsAccount *account = (PrefsAccount *)data;
const gchar *cert_path = NULL;
const gchar *password = NULL;
-#ifdef USE_OPENSSL
- X509 *x509 = NULL;
- EVP_PKEY *pkey = NULL;
-#else
gnutls_x509_crt x509 = NULL;
gnutls_x509_privkey pkey = NULL;
-#endif
if (account->in_ssl_client_cert_file && *account->in_ssl_client_cert_file)
cert_path = account->in_ssl_client_cert_file;
@@ -604,13 +579,8 @@ static void connect_ssl_context_cb(struct mailstream_ssl_context * ssl_context,
unsigned char *x509_der = NULL, *pkey_der = NULL;
size_t x509_len, pkey_len;
-#ifndef USE_GNUTLS
- x509_len = (size_t)i2d_X509(x509, &x509_der);
- pkey_len = (size_t)i2d_PrivateKey(pkey, &pkey_der);
-#else
x509_len = (size_t)gnutls_i2d_X509(x509, &x509_der);
pkey_len = (size_t)gnutls_i2d_PrivateKey(pkey, &pkey_der);
-#endif
if (x509_len > 0 && pkey_len > 0) {
if (mailstream_ssl_set_client_certificate_data(ssl_context, x509_der, x509_len) < 0 ||
mailstream_ssl_set_client_private_key_data(ssl_context, pkey_der, pkey_len) < 0)
@@ -618,10 +588,8 @@ static void connect_ssl_context_cb(struct mailstream_ssl_context * ssl_context,
g_free(x509_der);
g_free(pkey_der);
}
-#ifdef USE_GNUTLS
gnutls_x509_crt_deinit(x509);
gnutls_x509_privkey_deinit(pkey);
-#endif
}
#endif
}
diff --git a/src/etpan/nntp-thread.c b/src/etpan/nntp-thread.c
@@ -374,27 +374,7 @@ int nntp_threaded_connect(Folder * folder, const char * server, int port)
static int etpan_certificate_check(const unsigned char *certificate, int len, void *data)
{
-#ifdef USE_OPENSSL
- struct connect_param *param = (struct connect_param *)data;
- X509 *cert = NULL;
-
- if (certificate == NULL || len < 0) {
- g_warning("no cert presented.\n");
- return 0;
- }
- cert = d2i_X509(NULL, (const unsigned char **)&certificate, len);
- if (cert == NULL) {
- g_warning("nntp: can't get cert\n");
- return 0;
- } else if (ssl_certificate_check(cert,
- (gchar *)param->server, (gushort)param->port) == TRUE) {
- X509_free(cert);
- return 0;
- } else {
- X509_free(cert);
- return -1;
- }
-#elif USE_GNUTLS
+#ifdef USE_GNUTLS
struct connect_param *param = (struct connect_param *)data;
gnutls_x509_crt cert = NULL;
gnutls_datum tmp;
@@ -425,17 +405,12 @@ static int etpan_certificate_check(const unsigned char *certificate, int len, vo
static void connect_ssl_context_cb(struct mailstream_ssl_context * ssl_context, void * data)
{
-#if (defined(USE_OPENSSL) || defined(USE_GNUTLS))
+#ifdef USE_GNUTLS
PrefsAccount *account = (PrefsAccount *)data;
const gchar *cert_path = NULL;
const gchar *password = NULL;
-#ifdef USE_OPENSSL
- X509 *x509 = NULL;
- EVP_PKEY *pkey = NULL;
-#else
gnutls_x509_crt x509 = NULL;
gnutls_x509_privkey pkey = NULL;
-#endif
if (account->in_ssl_client_cert_file && *account->in_ssl_client_cert_file)
cert_path = account->in_ssl_client_cert_file;
@@ -455,13 +430,8 @@ static void connect_ssl_context_cb(struct mailstream_ssl_context * ssl_context,
unsigned char *x509_der = NULL, *pkey_der = NULL;
size_t x509_len, pkey_len;
-#ifndef USE_GNUTLS
- x509_len = (size_t)i2d_X509(x509, &x509_der);
- pkey_len = (size_t)i2d_PrivateKey(pkey, &pkey_der);
-#else
x509_len = (size_t)gnutls_i2d_X509(x509, &x509_der);
pkey_len = (size_t)gnutls_i2d_PrivateKey(pkey, &pkey_der);
-#endif
if (x509_len > 0 && pkey_len > 0) {
if (mailstream_ssl_set_client_certificate_data(ssl_context, x509_der, x509_len) < 0 ||
mailstream_ssl_set_client_private_key_data(ssl_context, pkey_der, pkey_len) < 0)
@@ -469,10 +439,8 @@ static void connect_ssl_context_cb(struct mailstream_ssl_context * ssl_context,
g_free(x509_der);
g_free(pkey_der);
}
-#ifdef USE_GNUTLS
gnutls_x509_crt_deinit(x509);
gnutls_x509_privkey_deinit(pkey);
-#endif
}
#endif
}
