[Emacs-diffs] /srv/bzr/emacs/trunk r106206: More gnutls memory fixes.

[Chong Yidong]

------------------------------------------------------------
revno: 106206
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Thu 2011-10-27 16:07:28 +0800
message:
  More gnutls memory fixes.
  
  * src/gnutls.c (emacs_gnutls_deinit): Deinit the gnutls_state if it is
  non-NULL, regardless of GNUTLS_INITSTAGE.
  (Fgnutls_boot): Cleanups.  Call emacs_gnutls_deinit if we signal
  an error.  Set process slots as soon as we allocate them.
  
  * src/gnutls.h (GNUTLS_LOG, GNUTLS_LOG2): Fix macros.
  
  * src/process.c (make_process): Set gnutls_state to NULL.
modified:
  src/ChangeLog
  src/gnutls.c
  src/gnutls.h
  src/process.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-10-27 06:07:09 +0000
+++ b/src/ChangeLog     2011-10-27 08:07:28 +0000
@@ -1,5 +1,16 @@
 2011-10-27  Chong Yidong  <address@hidden>
 
+       * process.c (make_process): Set gnutls_state to NULL.
+
+       * gnutls.c (emacs_gnutls_deinit): Deinit the gnutls_state if it is
+       non-NULL, regardless of GNUTLS_INITSTAGE.
+       (Fgnutls_boot): Cleanups.  Call emacs_gnutls_deinit if we signal
+       an error.  Set process slots as soon as we allocate them.
+
+       * gnutls.h (GNUTLS_LOG, GNUTLS_LOG2): Fix macros.
+
+2011-10-27  Chong Yidong  <address@hidden>
+
        * gnutls.c (emacs_gnutls_deinit): New function.  Deallocate
        credentials structures as well as calling gnutls_deinit.
        (Fgnutls_deinit, Fgnutls_boot): Use it.

=== modified file 'src/gnutls.c'
--- a/src/gnutls.c      2011-10-27 06:07:09 +0000
+++ b/src/gnutls.c      2011-10-27 08:07:28 +0000
@@ -490,10 +490,12 @@
       XPROCESS (proc)->gnutls_anon_cred = NULL;
     }
 
-  if (GNUTLS_INITSTAGE (proc) >= GNUTLS_STAGE_INIT)
+  if (XPROCESS (proc)->gnutls_state)
     {
       fn_gnutls_deinit (XPROCESS (proc)->gnutls_state);
-      GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_INIT - 1;
+      XPROCESS (proc)->gnutls_state = NULL;
+      if (GNUTLS_INITSTAGE (proc) >= GNUTLS_STAGE_INIT)
+       GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_INIT - 1;
     }
 
   XPROCESS (proc)->gnutls_p = 0;
@@ -647,7 +649,7 @@
 
 DEFUN ("gnutls-boot", Fgnutls_boot, Sgnutls_boot, 3, 3, 0,
        doc: /* Initialize GnuTLS client for process PROC with TYPE+PROPLIST.
-Currently only client mode is supported.  Returns a success/failure
+Currently only client mode is supported.  Return a success/failure
 value you can check with `gnutls-errorp'.
 
 TYPE is a symbol, either `gnutls-anon' or `gnutls-x509pki'.
@@ -698,23 +700,13 @@
   (Lisp_Object proc, Lisp_Object type, Lisp_Object proplist)
 {
   int ret = GNUTLS_E_SUCCESS;
-
   int max_log_level = 0;
 
-  /* TODO: GNUTLS_X509_FMT_DER is also an option.  */
-  int file_format = GNUTLS_X509_FMT_PEM;
-
-  unsigned int gnutls_verify_flags = GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT;
-  gnutls_x509_crt_t gnutls_verify_cert;
-  unsigned int gnutls_verify_cert_list_size;
-  const gnutls_datum_t *gnutls_verify_cert_list;
-
   gnutls_session_t state;
-  gnutls_certificate_credentials_t x509_cred;
-  gnutls_anon_client_credentials_t anon_cred;
+  gnutls_certificate_credentials_t x509_cred = NULL;
+  gnutls_anon_client_credentials_t anon_cred = NULL;
   Lisp_Object global_init;
   char const *priority_string_ptr = "NORMAL"; /* default priority string.  */
-  Lisp_Object tail;
   unsigned int peer_verification;
   char* c_hostname;
 
@@ -726,7 +718,6 @@
   /* Lisp_Object callbacks; */
   Lisp_Object loglevel;
   Lisp_Object hostname;
-  Lisp_Object verify_flags;
   /* Lisp_Object verify_error; */
   Lisp_Object verify_hostname_error;
   Lisp_Object prime_bits;
@@ -741,21 +732,23 @@
       return gnutls_make_error (GNUTLS_EMACS_ERROR_NOT_LOADED);
     }
 
+  if (!EQ (type, Qgnutls_x509pki) && !EQ (type, Qgnutls_anon))
+    {
+      error ("Invalid GnuTLS credential type");
+      return gnutls_make_error (GNUTLS_EMACS_ERROR_INVALID_TYPE);
+    }
+
   hostname              = Fplist_get (proplist, QCgnutls_bootprop_hostname);
   priority_string       = Fplist_get (proplist, QCgnutls_bootprop_priority);
   trustfiles            = Fplist_get (proplist, QCgnutls_bootprop_trustfiles);
   keylist               = Fplist_get (proplist, QCgnutls_bootprop_keylist);
   crlfiles              = Fplist_get (proplist, QCgnutls_bootprop_crlfiles);
-  /* callbacks          = Fplist_get (proplist, QCgnutls_bootprop_callbacks); 
*/
   loglevel              = Fplist_get (proplist, QCgnutls_bootprop_loglevel);
-  verify_flags          = Fplist_get (proplist, 
QCgnutls_bootprop_verify_flags);
-  /* verify_error       = Fplist_get (proplist, 
QCgnutls_bootprop_verify_error); */
   verify_hostname_error = Fplist_get (proplist, 
QCgnutls_bootprop_verify_hostname_error);
   prime_bits            = Fplist_get (proplist, 
QCgnutls_bootprop_min_prime_bits);
 
   if (!STRINGP (hostname))
     error ("gnutls-boot: invalid :hostname parameter");
-
   c_hostname = SSDATA (hostname);
 
   if (NUMBERP (loglevel))
@@ -777,53 +770,50 @@
 
   /* Mark PROC as a GnuTLS process.  */
   XPROCESS (proc)->gnutls_p = 1;
+  XPROCESS (proc)->gnutls_state = NULL;
   XPROCESS (proc)->gnutls_x509_cred = NULL;
   XPROCESS (proc)->gnutls_anon_cred = NULL;
+  XPROCESS (proc)->gnutls_cred_type = type;
   GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_EMPTY;
 
   GNUTLS_LOG (1, max_log_level, "allocating credentials");
   if (EQ (type, Qgnutls_x509pki))
     {
+      Lisp_Object verify_flags;
+      unsigned int gnutls_verify_flags = GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT;
+
       GNUTLS_LOG (2, max_log_level, "allocating x509 credentials");
-      x509_cred = XPROCESS (proc)->gnutls_x509_cred;
       fn_gnutls_certificate_allocate_credentials (&x509_cred);
+      XPROCESS (proc)->gnutls_x509_cred = x509_cred;
 
+      verify_flags = Fplist_get (proplist, QCgnutls_bootprop_verify_flags);
       if (NUMBERP (verify_flags))
        {
          gnutls_verify_flags = XINT (verify_flags);
          GNUTLS_LOG (2, max_log_level, "setting verification flags");
        }
       else if (NILP (verify_flags))
-       {
-         /* The default is already GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT.  */
-         GNUTLS_LOG (2, max_log_level, "using default verification flags");
-       }
+       GNUTLS_LOG (2, max_log_level, "using default verification flags");
       else
-       {
-         /* The default is already GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT.  */
-         GNUTLS_LOG (2, max_log_level, "ignoring invalid verify-flags");
-       }
+       GNUTLS_LOG (2, max_log_level, "ignoring invalid verify-flags");
+
       fn_gnutls_certificate_set_verify_flags (x509_cred, gnutls_verify_flags);
     }
-  else if (EQ (type, Qgnutls_anon))
+  else /* Qgnutls_anon: */
     {
       GNUTLS_LOG (2, max_log_level, "allocating anon credentials");
-      anon_cred = XPROCESS (proc)->gnutls_anon_cred;
       fn_gnutls_anon_allocate_client_credentials (&anon_cred);
-    }
-  else
-    {
-      error ("unknown credential type");
-      ret = GNUTLS_EMACS_ERROR_INVALID_TYPE;
-    }
-
-  if (ret < GNUTLS_E_SUCCESS)
-    return gnutls_make_error (ret);
+      XPROCESS (proc)->gnutls_anon_cred = anon_cred;
+    }
 
   GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_CRED_ALLOC;
 
   if (EQ (type, Qgnutls_x509pki))
     {
+      /* TODO: GNUTLS_X509_FMT_DER is also an option.  */
+      int file_format = GNUTLS_X509_FMT_PEM;
+      Lisp_Object tail;
+
       for (tail = trustfiles; !NILP (tail); tail = Fcdr (tail))
        {
          Lisp_Object trustfile = Fcar (tail);
@@ -841,8 +831,8 @@
            }
          else
            {
-             error ("Sorry, GnuTLS can't use non-string trustfile %s",
-                    SDATA (trustfile));
+             emacs_gnutls_deinit (proc);
+             error ("Invalid trustfile");
            }
        }
 
@@ -854,17 +844,15 @@
              GNUTLS_LOG2 (1, max_log_level, "setting the CRL file: ",
                           SSDATA (crlfile));
              ret = fn_gnutls_certificate_set_x509_crl_file
-               (x509_cred,
-                SSDATA (crlfile),
-                file_format);
+               (x509_cred, SSDATA (crlfile), file_format);
 
              if (ret < GNUTLS_E_SUCCESS)
                return gnutls_make_error (ret);
            }
          else
            {
-             error ("Sorry, GnuTLS can't use non-string CRL file %s",
-                    SDATA (crlfile));
+             emacs_gnutls_deinit (proc);
+             error ("Invalid CRL file");
            }
        }
 
@@ -879,45 +867,31 @@
              GNUTLS_LOG2 (1, max_log_level, "setting the client cert file: ",
                           SSDATA (certfile));
              ret = fn_gnutls_certificate_set_x509_key_file
-               (x509_cred,
-                SSDATA (certfile),
-                SSDATA (keyfile),
-                file_format);
+               (x509_cred, SSDATA (certfile), SSDATA (keyfile), file_format);
 
              if (ret < GNUTLS_E_SUCCESS)
                return gnutls_make_error (ret);
            }
          else
            {
-             if (STRINGP (keyfile))
-               error ("Sorry, GnuTLS can't use non-string client cert file %s",
-                      SDATA (certfile));
-             else
-               error ("Sorry, GnuTLS can't use non-string client key file %s",
-                      SDATA (keyfile));
+             emacs_gnutls_deinit (proc);
+             error (STRINGP (keyfile) ? "Invalid client cert file"
+                    : "Invalid client key file");
            }
        }
     }
 
   GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_FILES;
-
   GNUTLS_LOG (1, max_log_level, "gnutls callbacks");
-
   GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_CALLBACKS;
 
-#ifdef HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY
-#else
-#endif
+  /* Call gnutls_init here: */
 
   GNUTLS_LOG (1, max_log_level, "gnutls_init");
-
   ret = fn_gnutls_init (&state, GNUTLS_CLIENT);
-
-  if (ret < GNUTLS_E_SUCCESS)
-    return gnutls_make_error (ret);
-
   XPROCESS (proc)->gnutls_state = state;
-
+  if (ret < GNUTLS_E_SUCCESS)
+    return gnutls_make_error (ret);
   GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_INIT;
 
   if (STRINGP (priority_string))
@@ -933,46 +907,25 @@
     }
 
   GNUTLS_LOG (1, max_log_level, "setting the priority string");
-
   ret = fn_gnutls_priority_set_direct (state,
                                       priority_string_ptr,
                                       NULL);
-
   if (ret < GNUTLS_E_SUCCESS)
     return gnutls_make_error (ret);
 
   GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_PRIORITY;
 
-  if (!EQ (prime_bits, Qnil))
-    {
-      fn_gnutls_dh_set_prime_bits (state, XUINT (prime_bits));
-    }
-
-  if (EQ (type, Qgnutls_x509pki))
-    {
-      ret = fn_gnutls_credentials_set (state, GNUTLS_CRD_CERTIFICATE, 
x509_cred);
-    }
-  else if (EQ (type, Qgnutls_anon))
-    {
-      ret = fn_gnutls_credentials_set (state, GNUTLS_CRD_ANON, anon_cred);
-    }
-  else
-    {
-      error ("unknown credential type");
-      ret = GNUTLS_EMACS_ERROR_INVALID_TYPE;
-    }
-
+  if (INTEGERP (prime_bits))
+    fn_gnutls_dh_set_prime_bits (state, XUINT (prime_bits));
+
+  ret = EQ (type, Qgnutls_x509pki)
+    ? fn_gnutls_credentials_set (state, GNUTLS_CRD_CERTIFICATE, x509_cred)
+    : fn_gnutls_credentials_set (state, GNUTLS_CRD_ANON, anon_cred);
   if (ret < GNUTLS_E_SUCCESS)
     return gnutls_make_error (ret);
 
-  XPROCESS (proc)->gnutls_anon_cred = anon_cred;
-  XPROCESS (proc)->gnutls_x509_cred = x509_cred;
-  XPROCESS (proc)->gnutls_cred_type = type;
-
   GNUTLS_INITSTAGE (proc) = GNUTLS_STAGE_CRED_SET;
-
   ret = emacs_gnutls_handshake (XPROCESS (proc));
-
   if (ret < GNUTLS_E_SUCCESS)
     return gnutls_make_error (ret);
 
@@ -983,69 +936,71 @@
      gnutls_x509_crt_check_hostname() against :hostname.  */
 
   ret = fn_gnutls_certificate_verify_peers2 (state, &peer_verification);
-
   if (ret < GNUTLS_E_SUCCESS)
     return gnutls_make_error (ret);
 
   if (XINT (loglevel) > 0 && peer_verification & GNUTLS_CERT_INVALID)
-    message ("%s certificate could not be verified.",
-            c_hostname);
-
- if (peer_verification & GNUTLS_CERT_REVOKED)
-   GNUTLS_LOG2 (1, max_log_level, "certificate was revoked (CRL):",
-               c_hostname);
-
- if (peer_verification & GNUTLS_CERT_SIGNER_NOT_FOUND)
-   GNUTLS_LOG2 (1, max_log_level, "certificate signer was not found:",
-               c_hostname);
-
- if (peer_verification & GNUTLS_CERT_SIGNER_NOT_CA)
-   GNUTLS_LOG2 (1, max_log_level, "certificate signer is not a CA:",
-               c_hostname);
-
- if (peer_verification & GNUTLS_CERT_INSECURE_ALGORITHM)
-   GNUTLS_LOG2 (1, max_log_level,
-               "certificate was signed with an insecure algorithm:",
-               c_hostname);
-
- if (peer_verification & GNUTLS_CERT_NOT_ACTIVATED)
-   GNUTLS_LOG2 (1, max_log_level, "certificate is not yet activated:",
-               c_hostname);
-
- if (peer_verification & GNUTLS_CERT_EXPIRED)
-   GNUTLS_LOG2 (1, max_log_level, "certificate has expired:",
-               c_hostname);
-
- if (peer_verification != 0)
-   {
-     if (NILP (verify_hostname_error))
-       {
-        GNUTLS_LOG2 (1, max_log_level, "certificate validation failed:",
-                     c_hostname);
-       }
-     else
-       {
-        error ("Certificate validation failed %s, verification code %d",
-               c_hostname, peer_verification);
-       }
-   }
+    message ("%s certificate could not be verified.", c_hostname);
+
+  if (peer_verification & GNUTLS_CERT_REVOKED)
+    GNUTLS_LOG2 (1, max_log_level, "certificate was revoked (CRL):",
+                c_hostname);
+
+  if (peer_verification & GNUTLS_CERT_SIGNER_NOT_FOUND)
+    GNUTLS_LOG2 (1, max_log_level, "certificate signer was not found:",
+                c_hostname);
+
+  if (peer_verification & GNUTLS_CERT_SIGNER_NOT_CA)
+    GNUTLS_LOG2 (1, max_log_level, "certificate signer is not a CA:",
+                c_hostname);
+
+  if (peer_verification & GNUTLS_CERT_INSECURE_ALGORITHM)
+    GNUTLS_LOG2 (1, max_log_level,
+                "certificate was signed with an insecure algorithm:",
+                c_hostname);
+
+  if (peer_verification & GNUTLS_CERT_NOT_ACTIVATED)
+    GNUTLS_LOG2 (1, max_log_level, "certificate is not yet activated:",
+                c_hostname);
+
+  if (peer_verification & GNUTLS_CERT_EXPIRED)
+    GNUTLS_LOG2 (1, max_log_level, "certificate has expired:",
+                c_hostname);
+
+  if (peer_verification != 0)
+    {
+      if (NILP (verify_hostname_error))
+       GNUTLS_LOG2 (1, max_log_level, "certificate validation failed:",
+                    c_hostname);
+      else
+       {
+         emacs_gnutls_deinit (proc);
+         error ("Certificate validation failed %s, verification code %d",
+                c_hostname, peer_verification);
+       }
+    }
 
   /* Up to here the process is the same for X.509 certificates and
      OpenPGP keys.  From now on X.509 certificates are assumed.  This
      can be easily extended to work with openpgp keys as well.  */
   if (fn_gnutls_certificate_type_get (state) == GNUTLS_CRT_X509)
     {
+      gnutls_x509_crt_t gnutls_verify_cert;
+      const gnutls_datum_t *gnutls_verify_cert_list;
+      unsigned int gnutls_verify_cert_list_size;
+
       ret = fn_gnutls_x509_crt_init (&gnutls_verify_cert);
-
       if (ret < GNUTLS_E_SUCCESS)
        return gnutls_make_error (ret);
 
       gnutls_verify_cert_list =
        fn_gnutls_certificate_get_peers (state, &gnutls_verify_cert_list_size);
 
-      if (NULL == gnutls_verify_cert_list)
+      if (gnutls_verify_cert_list == NULL)
        {
-         error ("No x509 certificate was found!\n");
+         fn_gnutls_x509_crt_deinit (gnutls_verify_cert);
+         emacs_gnutls_deinit (proc);
+         error ("No x509 certificate was found\n");
        }
 
       /* We only check the first certificate in the given chain.  */
@@ -1062,18 +1017,15 @@
       if (!fn_gnutls_x509_crt_check_hostname (gnutls_verify_cert, c_hostname))
        {
          if (NILP (verify_hostname_error))
-           {
-             GNUTLS_LOG2 (1, max_log_level, "x509 certificate does not match:",
-                          c_hostname);
-           }
+           GNUTLS_LOG2 (1, max_log_level, "x509 certificate does not match:",
+                        c_hostname);
          else
            {
              fn_gnutls_x509_crt_deinit (gnutls_verify_cert);
-             error ("The x509 certificate does not match \"%s\"",
-                    c_hostname);
+             emacs_gnutls_deinit (proc);
+             error ("The x509 certificate does not match \"%s\"", c_hostname);
            }
        }
-
       fn_gnutls_x509_crt_deinit (gnutls_verify_cert);
     }
 

=== modified file 'src/gnutls.h'
--- a/src/gnutls.h      2011-10-27 06:07:09 +0000
+++ b/src/gnutls.h      2011-10-27 08:07:28 +0000
@@ -49,9 +49,9 @@
 
 #define GNUTLS_PROCESS_USABLE(proc) (GNUTLS_INITSTAGE(proc) >= 
GNUTLS_STAGE_READY)
 
-#define GNUTLS_LOG(level, max, string) if (level <= max) { gnutls_log_function 
(level, "(Emacs) " string); }
+#define GNUTLS_LOG(level, max, string) do { if (level <= max) { 
gnutls_log_function (level, "(Emacs) " string); } } while (0)
 
-#define GNUTLS_LOG2(level, max, string, extra) if (level <= max) { 
gnutls_log_function2 (level, "(Emacs) " string, extra); }
+#define GNUTLS_LOG2(level, max, string, extra) do { if (level <= max) { 
gnutls_log_function2 (level, "(Emacs) " string, extra); } } while (0)
 
 extern EMACS_INT
 emacs_gnutls_write (struct Lisp_Process *proc, const char *buf, EMACS_INT 
nbyte);

=== modified file 'src/process.c'
--- a/src/process.c     2011-10-27 06:07:09 +0000
+++ b/src/process.c     2011-10-27 08:07:28 +0000
@@ -642,6 +642,7 @@
   p->gnutls_initstage = GNUTLS_STAGE_EMPTY;
   p->gnutls_log_level = 0;
   p->gnutls_p = 0;
+  p->gnutls_state = NULL;
   p->gnutls_x509_cred = NULL;
   p->gnutls_anon_cred = NULL;
 #endif