From: Phil Pennock <pdp@exim.org>
Date: Wed, 23 May 2012 05:20:09 +0000 (-0400)
Subject: expanded comment, noting size types and API issue
X-Git-Tag: exim-4_80_RC5~7
X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=commitdiff_plain;h=60788a1cfdd64787ed6513986af2335b51d89766

expanded comment, noting size types and API issue
---

diff --git a/src/src/tls-gnu.c b/src/src/tls-gnu.c
index 0ac72ad25..b2659d7a7 100644
--- a/src/src/tls-gnu.c
+++ b/src/src/tls-gnu.c
@@ -512,7 +512,11 @@ if (rc < 0)
   m.data = malloc(m.size);
   if (m.data == NULL)
     return tls_error(US"memory allocation failed", strerror(errno), NULL);
-  /* this will return a size 1 less than the allocation size above */
+  /* this will return a size 1 less than the allocation size above; I
+  originally used sz so as to avoid type compatibility errors, as gnutls_datum
+  uses "unsigned int" for the size field, but this call takes separate data
+  and size fields, with the latter being a size_t*.  For now, we live with
+  the error as being safer than throwing away type information. */
   rc = gnutls_dh_params_export_pkcs3(dh_server_params, GNUTLS_X509_FMT_PEM,
       m.data, &m.size);
   if (rc != GNUTLS_E_SUCCESS)