Changeset 5431:fe615fd5e0de

Timestamp:

2008-06-28 18:44:10 (5 months ago)

Author:

Brendan Cully <brendan@…>

Branch:

HEAD

Message:

Basic support for $ssl_client_cert when compiled with gnutls.
The key must not be encrypted. Closes #2911.

Files:

• ChangeLog (modified) (1 diff)
• UPDATING (modified) (1 diff)
• globals.h (modified) (1 diff)
• init.h (modified) (2 diffs)
• mutt_sasl.c (modified) (1 diff)
• mutt_ssl_gnutls.c (modified) (1 diff)

ChangeLog

@@ -1 @@
-2008-06-26 12:47 -0700  Brendan Cully  <brendan@kublai.com>  (be7e07963099)
+2008-06-27 12:04 -0700  Petr Písař  <petr.pisar@atlas.cz>  (40c6e851bf76)
+
+        * po/cs.po: Updated Czech translation.
+
+2008-06-26 12:52 -0700  Brendan Cully  <brendan@kublai.com>  (c5256c65eedb)
+
+        * handler.c: Mark new error message for translation.
 
         * curs_lib.c: Force a resize event after calling an external editor.

UPDATING

@@ -7 +7 @@
 hg tip:
 
+  + $ssl_client_cert available with gnutls as well as openssl
   + 'mime_lookup application/octet-stream' added to system Muttrc
 

globals.h

@@ -128 +128 @@
 #if defined(USE_SSL)
 WHERE char *SslCertFile INITVAL (NULL);
-#endif
+WHERE char *SslClientCert INITVAL (NULL);
 #ifdef USE_SSL_OPENSSL
-WHERE char *SslClientCert INITVAL (NULL);
 WHERE LIST *SslSessionCerts INITVAL (NULL);
 #endif
-#if defined(USE_SSL)
 WHERE char *SslEntropyFile INITVAL (NULL);
-#endif
 #ifdef USE_SSL_GNUTLS
 WHERE short SslDHPrimeBits;
 WHERE char *SslCACertFile INITVAL (NULL);
+#endif
 #endif
 WHERE char *StChars;

init.h

@@ -1996 +1996 @@
   
 #if defined(USE_SSL)
-#ifdef USE_SSL_OPENSSL
   { "ssl_client_cert", DT_PATH, R_NONE, UL &SslClientCert, 0 },
   /*
@@ -2003 +2002 @@
   ** key.
   */
-#endif /* USE_SSL_OPENSSL */
   { "ssl_force_tls",            DT_BOOL, R_NONE, OPTSSLFORCETLS, 0 },
   /*

mutt_sasl.c

@@ -385 +385 @@
   ACCOUNT* account = (ACCOUNT*) context;
 
+  if (!result)
+    return SASL_FAIL;
+
   *result = NULL;
   if (len)

mutt_ssl_gnutls.c

@@ -200 +200 @@
   }
 
-/*
-  gnutls_set_x509_client_key (data->xcred, "", "");
-  gnutls_set_x509_cert_callback (data->xcred, cert_callback);
-*/
+  if (SslClientCert)
+  {
+    dprint (2, (debugfile, "Using client certificate %s\n", SslClientCert));
+    gnutls_certificate_set_x509_key_file (data->xcred, SslClientCert,
+                                          SslClientCert, GNUTLS_X509_FMT_PEM);
+  }
 
   gnutls_init(&data->state, GNUTLS_CLIENT);