Fix GCrypt build

[exim.git] / src / src / pdkim / signing.c

diff --git a/src/src/pdkim/signing.c b/src/src/pdkim/signing.c
index 5f270bfd4e5ad588388f03c90df3086216ed3df3..1396b194e3806a22117210c4510ed772ae0e20b0 100644 (file)
--- a/src/src/pdkim/signing.c
+++ b/src/src/pdkim/signing.c
@@ -28,13 +28,10 @@ exim_dkim_init(void)
 
 
 /* accumulate data (gnutls-only).  String to be appended must be nul-terminated. */
-blob *
-exim_dkim_data_append(blob * b, int * alloc, uschar * s)
+gstring *
+exim_dkim_data_append(gstring * g, uschar * s)
 {
-int len = b->len;
-b->data = string_append(b->data, alloc, &len, 1, s);
-b->len = len;
-return b;
+return string_cat(g, s);
 }
 
 
@@ -268,10 +265,10 @@ return;
 /* Accumulate data (gnutls-only).
 String to be appended must be nul-terminated. */
 
-blob *
-exim_dkim_data_append(blob * b, int * alloc, uschar * s)
+gstring *
+exim_dkim_data_append(gstring * g, uschar * s)
 {
-return b;      /*dummy*/
+return g;      /*dummy*/
 }
 
 
@@ -593,10 +590,10 @@ ERR_load_crypto_strings();
 
 
 /* accumulate data (gnutls-only) */
-blob *
-exim_dkim_data_append(blob * b, int * alloc, uschar * s)
+gstring *
+exim_dkim_data_append(gstring * g, uschar * s)
 {
-return b;      /*dummy*/
+return g;      /*dummy*/
 }
 
 
@@ -609,7 +606,7 @@ exim_dkim_signing_init(uschar * privkey_pem, es_ctx * sign_ctx)
 BIO * bp = BIO_new_mem_buf(privkey_pem, -1);
 
 if (!(sign_ctx->key = PEM_read_bio_PrivateKey(bp, NULL, NULL, NULL)))
-  return ERR_error_string(ERR_get_error(), NULL);
+  return US ERR_error_string(ERR_get_error(), NULL);
 return NULL;
 }
 
@@ -656,7 +653,7 @@ if (  (ctx = EVP_PKEY_CTX_new(sign_ctx->key, NULL))
   }
 
 if (ctx) EVP_PKEY_CTX_free(ctx);
-return ERR_error_string(ERR_get_error(), NULL);
+return US ERR_error_string(ERR_get_error(), NULL);
 }
 
 
@@ -673,7 +670,7 @@ const uschar * s = pubkey_der->data;
 
 if ((verify_ctx->key = d2i_PUBKEY(NULL, &s, pubkey_der->len)))
   return NULL;
-return ERR_error_string(ERR_get_error(), NULL);
+return US ERR_error_string(ERR_get_error(), NULL);
 }
 
 
@@ -706,7 +703,7 @@ if (  (ctx = EVP_PKEY_CTX_new(verify_ctx->key, NULL))
   { EVP_PKEY_CTX_free(ctx); return NULL; }
 
 if (ctx) EVP_PKEY_CTX_free(ctx);
-return ERR_error_string(ERR_get_error(), NULL);
+return US ERR_error_string(ERR_get_error(), NULL);
 }