String handling: refactor the expanding-string routines and users to use a descriptor...

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

diff --git a/src/src/pdkim/signing.c b/src/src/pdkim/signing.c
index ec68414c8e83bc5c569904f2a9de1b853e5992c8..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*/
 }
 
 
@@ -338,6 +335,7 @@ if (  (s1 = as_mpi(&der, &sign_ctx->n))
    )
   return s1;
 
+#ifdef extreme_debug
 DEBUG(D_acl) debug_printf_indent("rsa_signing_init:\n");
   {
   uschar * s;
@@ -358,6 +356,7 @@ DEBUG(D_acl) debug_printf_indent("rsa_signing_init:\n");
   gcry_mpi_aprint (GCRYMPI_FMT_HEX, &s, NULL, sign_ctx->qp);
   debug_printf_indent(" QP: %s\n", s);
   }
+#endif
 return NULL;
 
 asn_err: return US asn1_strerror(rc);
@@ -375,7 +374,7 @@ Return: NULL for success, or an error string */
 const uschar *
 exim_dkim_sign(es_ctx * sign_ctx, hashmethod hash, blob * data, blob * sig)
 {
-BOOL is_sha1;
+char * sexp_hash;
 gcry_sexp_t s_hash = NULL, s_key = NULL, s_sig = NULL;
 gcry_mpi_t m_sig;
 uschar * errstr;
@@ -390,8 +389,8 @@ Will need extension for non-RSA sugning algos. */
 
 switch (hash)
   {
-  case HASH_SHA1:      is_sha1 = TRUE; break;
-  case HASH_SHA2_256:  is_sha1 = FALSE; break;
+  case HASH_SHA1:      sexp_hash = "(data(flags pkcs1)(hash sha1 %b))"; break;
+  case HASH_SHA2_256:  sexp_hash = "(data(flags pkcs1)(hash sha256 %b))"; break;
   default:             return US"nonhandled hash type";
   }
 
@@ -409,10 +408,7 @@ if (  (gerr = gcry_sexp_build (&s_key, NULL,
                sign_ctx->n, sign_ctx->e,
                sign_ctx->d, sign_ctx->p,
                sign_ctx->q, sign_ctx->qp))
-   || (gerr = gcry_sexp_build (&s_hash, NULL,
-               is_sha1
-               ? "(data(flags pkcs1)(hash sha1 %b))"
-               : "(data(flags pkcs1)(hash sha256 %b))",
+   || (gerr = gcry_sexp_build (&s_hash, NULL, sexp_hash,
                (int) data->len, CS data->data))
    ||  (gerr = gcry_pk_sign (&s_sig, s_hash, s_key))
    )
@@ -426,12 +422,14 @@ if (  !(s_sig = gcry_sexp_find_token(s_sig, "s", 0))
 
 m_sig = gcry_sexp_nth_mpi(s_sig, 1, GCRYMPI_FMT_USG);
 
+#ifdef extreme_debug
 DEBUG(D_acl)
   {
   uschar * s;
   gcry_mpi_aprint (GCRYMPI_FMT_HEX, &s, NULL, m_sig);
   debug_printf_indent(" SG: %s\n", s);
   }
+#endif
 
 gerr = gcry_mpi_print(GCRYMPI_FMT_USG, sig->data, SIGSPACE, &sig->len, m_sig);
 if (gerr)
@@ -508,6 +506,7 @@ if (  (errstr = as_mpi(pubkey_der, &verify_ctx->n))
    )
   return errstr;
 
+#ifdef extreme_debug
 DEBUG(D_acl) debug_printf_indent("rsa_verify_init:\n");
        {
        uschar * s;
@@ -517,6 +516,7 @@ DEBUG(D_acl) debug_printf_indent("rsa_verify_init:\n");
        debug_printf_indent(" E : %s\n", s);
        }
 
+#endif
 return NULL;
 
 asn_err:
@@ -534,27 +534,25 @@ exim_dkim_verify(ev_ctx * verify_ctx, hashmethod hash, blob * data_hash, blob *
 /*
 cf. libgnutls 2.8.5 _wrap_gcry_pk_verify()
 */
+char * sexp_hash;
 gcry_mpi_t m_sig;
 gcry_sexp_t s_sig = NULL, s_hash = NULL, s_pkey = NULL;
 gcry_error_t gerr;
 uschar * stage;
 
+/*XXX needs extension for SHA512 */
 switch (hash)
   {
-  case HASH_SHA1:      is_sha1 = TRUE; break;
-  case HASH_SHA2_256:  is_sha1 = FALSE; break;
-  default:             return US"nonhandled hash type";
+  case HASH_SHA1:     sexp_hash = "(data(flags pkcs1)(hash sha1 %b))"; break;
+  case HASH_SHA2_256: sexp_hash = "(data(flags pkcs1)(hash sha256 %b))"; break;
+  default:           return US"nonhandled hash type";
   }
 
 if (  (stage = US"pkey sexp build",
        gerr = gcry_sexp_build (&s_pkey, NULL, "(public-key(rsa(n%m)(e%m)))",
                        verify_ctx->n, verify_ctx->e))
    || (stage = US"data sexp build",
-       gerr = gcry_sexp_build (&s_hash, NULL,
-/*XXX needs extension for SHA512 */
-               is_sha1
-               ? "(data(flags pkcs1)(hash sha1 %b))"
-               : "(data(flags pkcs1)(hash sha256 %b))",
+       gerr = gcry_sexp_build (&s_hash, NULL, sexp_hash,
                (int) data_hash->len, CS data_hash->data))
    || (stage = US"sig mpi scan",
        gerr = gcry_mpi_scan(&m_sig, GCRYMPI_FMT_USG, sig->data, sig->len, NULL))
@@ -587,14 +585,15 @@ return NULL;
 void
 exim_dkim_init(void)
 {
+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*/
 }
 
 
@@ -607,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;
 }
 
@@ -618,7 +617,7 @@ return NULL;
 OR
 sign hash.
 
-Return: NULL for success, or an error string */
+Return: NULL for success with the signaature in the sig blob, or an error string */
 
 const uschar *
 exim_dkim_sign(es_ctx * sign_ctx, hashmethod hash, blob * data, blob * sig)
@@ -644,14 +643,17 @@ if (  (ctx = EVP_PKEY_CTX_new(sign_ctx->key, NULL))
   {
   /* Allocate mem for signature */
   sig->data = store_get(siglen);
-  sig->len = siglen;
 
   if (EVP_PKEY_sign(ctx, sig->data, &siglen, data->data, data->len) > 0)
-    { EVP_PKEY_CTX_free(ctx); return NULL; }
+    {
+    EVP_PKEY_CTX_free(ctx);
+    sig->len = siglen;
+    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);
 }
 
 
@@ -668,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);
 }
 
 
@@ -701,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);
 }