X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-sys%2Fmutt_ssl_gnutls.c;h=d2663581e1e51bd96553a69dfd7611c8fcb7fcf7;hp=dfac2ca3d33bacf9febb349be11c8ecc4bde2968;hb=8fac066483c9ae3176984527c037190fca9dc7f0;hpb=f65ae399906906f734398432691dbacf2c7bda9f

diff --git a/lib-sys/mutt_ssl_gnutls.c b/lib-sys/mutt_ssl_gnutls.c
index dfac2ca..d266358 100644
--- a/lib-sys/mutt_ssl_gnutls.c
+++ b/lib-sys/mutt_ssl_gnutls.c
@@ -10,8 +10,6 @@
 
 #include <lib-lib/lib-lib.h>
 
-#ifdef USE_GNUTLS
-
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
 #ifdef HAVE_GNUTLS_OPENSSL_H
@@ -23,7 +21,6 @@
 
 #include "mutt.h"
 #include "mutt_socket.h"
-#include "mutt_ssl.h"
 
 typedef struct _tlssockdata {
   gnutls_session state;
@@ -310,7 +307,7 @@ static int tls_compare_certificates (const gnutls_datum * peercert)
   }
 
   b64_data.size = fread (b64_data.data, 1, b64_data.size, fd1);
-  fclose (fd1);
+  m_fclose(&fd1);
 
   do {
     ret = gnutls_pem_base64_decode_alloc (NULL, &b64_data, &cert);
@@ -412,7 +409,7 @@ static int tls_check_stored_hostname (const gnutls_datum * cert,
               m_strcmp(linestr + pmatch[2].rm_so, buf) == 0) {
             regfree (&preg);
             p_delete(&linestr);
-            fclose (fp);
+            m_fclose(&fp);
             return 1;
           }
         }
@@ -420,7 +417,7 @@ static int tls_check_stored_hostname (const gnutls_datum * cert,
     }
 
     regfree (&preg);
-    fclose (fp);
+    m_fclose(&fp);
   }
 
   /* not found a matching name */
@@ -431,17 +428,17 @@ static int tls_check_certificate (CONNECTION * conn)
 {
   tlssockdata *data = conn->sockdata;
   gnutls_session state = data->state;
-  char helpstr[SHORT_STRING];
-  char buf[SHORT_STRING];
-  char fpbuf[SHORT_STRING];
+  char helpstr[STRING];
+  char buf[STRING];
+  char fpbuf[STRING];
   ssize_t buflen;
-  char dn_common_name[SHORT_STRING];
-  char dn_email[SHORT_STRING];
-  char dn_organization[SHORT_STRING];
-  char dn_organizational_unit[SHORT_STRING];
-  char dn_locality[SHORT_STRING];
-  char dn_province[SHORT_STRING];
-  char dn_country[SHORT_STRING];
+  char dn_common_name[STRING];
+  char dn_email[STRING];
+  char dn_organization[STRING];
+  char dn_organizational_unit[STRING];
+  char dn_locality[STRING];
+  char dn_province[STRING];
+  char dn_country[STRING];
   MUTTMENU *menu;
   int done, row, i, ret;
   FILE *fp;
@@ -574,10 +571,10 @@ static int tls_check_certificate (CONNECTION * conn)
   menu->max = 25;
   menu->dialog = p_new(char*, menu->max);
   for (i = 0; i < menu->max; i++)
-    menu->dialog[i] = p_new(char, SHORT_STRING);
+    menu->dialog[i] = p_new(char, STRING);
 
   row = 0;
-  m_strcpy(menu->dialog[row], SHORT_STRING,
+  m_strcpy(menu->dialog[row], STRING,
            _("This certificate belongs to:"));
   row++;
 
@@ -613,16 +610,16 @@ static int tls_check_certificate (CONNECTION * conn)
                                      dn_country, (size_t *)&buflen) != 0)
     dn_country[0] = '\0';
 
-  snprintf (menu->dialog[row++], SHORT_STRING, "   %s  %s", dn_common_name,
+  snprintf (menu->dialog[row++], STRING, "   %s  %s", dn_common_name,
             dn_email);
-  snprintf (menu->dialog[row++], SHORT_STRING, "   %s", dn_organization);
-  snprintf (menu->dialog[row++], SHORT_STRING, "   %s",
+  snprintf (menu->dialog[row++], STRING, "   %s", dn_organization);
+  snprintf (menu->dialog[row++], STRING, "   %s",
             dn_organizational_unit);
-  snprintf (menu->dialog[row++], SHORT_STRING, "   %s  %s  %s", dn_locality,
+  snprintf (menu->dialog[row++], STRING, "   %s  %s  %s", dn_locality,
             dn_province, dn_country);
   row++;
 
-  m_strcpy(menu->dialog[row], SHORT_STRING,
+  m_strcpy(menu->dialog[row], STRING,
            _("This certificate was issued by:"));
   row++;
 
@@ -658,58 +655,58 @@ static int tls_check_certificate (CONNECTION * conn)
       (cert, GNUTLS_OID_X520_COUNTRY_NAME, 0, 0, dn_country, (size_t *)&buflen) != 0)
     dn_country[0] = '\0';
 
-  snprintf (menu->dialog[row++], SHORT_STRING, "   %s  %s", dn_common_name,
+  snprintf (menu->dialog[row++], STRING, "   %s  %s", dn_common_name,
             dn_email);
-  snprintf (menu->dialog[row++], SHORT_STRING, "   %s", dn_organization);
-  snprintf (menu->dialog[row++], SHORT_STRING, "   %s",
+  snprintf (menu->dialog[row++], STRING, "   %s", dn_organization);
+  snprintf (menu->dialog[row++], STRING, "   %s",
             dn_organizational_unit);
-  snprintf (menu->dialog[row++], SHORT_STRING, "   %s  %s  %s", dn_locality,
+  snprintf (menu->dialog[row++], STRING, "   %s  %s  %s", dn_locality,
             dn_province, dn_country);
   row++;
 
-  snprintf (menu->dialog[row++], SHORT_STRING,
+  snprintf (menu->dialog[row++], STRING,
             _("This certificate is valid"));
 
   t = gnutls_x509_crt_get_activation_time (cert);
-  snprintf (menu->dialog[row++], SHORT_STRING, _("   from %s"),
+  snprintf (menu->dialog[row++], STRING, _("   from %s"),
             tls_make_date (t, datestr, 30));
 
   t = gnutls_x509_crt_get_expiration_time (cert);
-  snprintf (menu->dialog[row++], SHORT_STRING, _("     to %s"),
+  snprintf (menu->dialog[row++], STRING, _("     to %s"),
             tls_make_date (t, datestr, 30));
 
   fpbuf[0] = '\0';
   tls_fingerprint (GNUTLS_DIG_SHA, fpbuf, sizeof (fpbuf), &cert_list[0]);
-  snprintf (menu->dialog[row++], SHORT_STRING, _("SHA1 Fingerprint: %s"),
+  snprintf (menu->dialog[row++], STRING, _("SHA1 Fingerprint: %s"),
             fpbuf);
   fpbuf[0] = '\0';
   tls_fingerprint (GNUTLS_DIG_MD5, fpbuf, sizeof (fpbuf), &cert_list[0]);
-  snprintf (menu->dialog[row++], SHORT_STRING, _("MD5 Fingerprint: %s"),
+  snprintf (menu->dialog[row++], STRING, _("MD5 Fingerprint: %s"),
             fpbuf);
 
   if (certerr_notyetvalid) {
     row++;
-    m_strcpy(menu->dialog[row], SHORT_STRING,
+    m_strcpy(menu->dialog[row], STRING,
              _("WARNING: Server certificate is not yet valid"));
   }
   if (certerr_expired) {
     row++;
-    m_strcpy(menu->dialog[row], SHORT_STRING,
+    m_strcpy(menu->dialog[row], STRING,
              _("WARNING: Server certificate has expired"));
   }
   if (certerr_revoked) {
     row++;
-    m_strcpy(menu->dialog[row], SHORT_STRING,
+    m_strcpy(menu->dialog[row], STRING,
              _("WARNING: Server certificate has been revoked"));
   }
   if (certerr_hostname) {
     row++;
-    m_strcpy(menu->dialog[row], SHORT_STRING,
+    m_strcpy(menu->dialog[row], STRING,
              _("WARNING: Server hostname does not match certificate"));
   }
   if (certerr_signernotca) {
     row++;
-    m_strcpy(menu->dialog[row], SHORT_STRING,
+    m_strcpy(menu->dialog[row], STRING,
              _("WARNING: Signer of server certificate is not a CA"));
   }
 
@@ -761,7 +758,7 @@ static int tls_check_certificate (CONNECTION * conn)
             gnutls_free (pemdata.data);
           }
         }
-        fclose (fp);
+        m_fclose(&fp);
       }
       if (!done) {
         mutt_error (_("Warning: Couldn't save certificate"));
@@ -782,5 +779,3 @@ static int tls_check_certificate (CONNECTION * conn)
   gnutls_x509_crt_deinit (cert);
   return (done == 2);
 }
-
-#endif /* USE_GNUTLS */