summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhil Pennock <pdp@exim.org>2012-05-26 20:10:40 -0400
committerPhil Pennock <pdp@exim.org>2012-05-26 20:10:40 -0400
commit1f00591e43de58718045ab86916011cc564e5201 (patch)
treed9db8b9a83078d1a0f33ebab35dff7f3b4771d32 /src
parentf88b6b91544b58850beaacba37f206506f5c3812 (diff)
fix size param for gnutls_dh_params_export_pkcs3() again
Diffstat (limited to 'src')
-rw-r--r--src/src/tls-gnu.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/src/tls-gnu.c b/src/src/tls-gnu.c
index b2659d7a7..aa2f92514 100644
--- a/src/src/tls-gnu.c
+++ b/src/src/tls-gnu.c
@@ -512,18 +512,15 @@ 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; 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. */
+ /* this will return a size 1 less than the allocation size above */
rc = gnutls_dh_params_export_pkcs3(dh_server_params, GNUTLS_X509_FMT_PEM,
- m.data, &m.size);
+ m.data, &sz);
if (rc != GNUTLS_E_SUCCESS)
{
free(m.data);
exim_gnutls_err_check(US"gnutls_dh_params_export_pkcs3() real");
}
+ m.size = sz; /* shrink by 1, probably */
sz = write_to_fd_buf(fd, m.data, (size_t) m.size);
if (sz != m.size)