summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2017-02-08 17:31:37 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2017-02-08 17:31:37 +0000
commit6e4aaa853615d40316858a5ca08da784350cb142 (patch)
treee76ba7803d4e8cf0f87649b08ab77e8e86fffa65
parente1d04f48a45c9f8e8ff75610003048f8ead73219 (diff)
downloadexim4-6e4aaa853615d40316858a5ca08da784350cb142.tar.gz
Fix DKIM/GnuTLS build
Broken-by: e1d04f48a45c
-rw-r--r--src/src/pdkim/rsa.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/src/pdkim/rsa.c b/src/src/pdkim/rsa.c
index 548bae6be..950c617c7 100644
--- a/src/src/pdkim/rsa.c
+++ b/src/src/pdkim/rsa.c
@@ -170,7 +170,7 @@ uschar tag_class;
int taglen;
long tag, len;
-/* acl_debug_printf("as_tag: %02x %02x %02x %02x\n",
+/* debug_printf_indent("as_tag: %02x %02x %02x %02x\n",
der->data[0], der->data[1], der->data[2], der->data[3]); */
if ((rc = asn1_get_tag_der(der->data++, der->len--, &tag_class, &taglen, &tag))
@@ -183,7 +183,7 @@ if ((len = asn1_get_length_der(der->data, der->len, &taglen)) < 0)
return ASN1_DER_ERROR;
if (alen) *alen = len;
-/* acl_debug_printf("as_tag: tlen %d dlen %d\n", taglen, (int)len); */
+/* debug_printf_indent("as_tag: tlen %d dlen %d\n", taglen, (int)len); */
der->data += taglen;
der->len -= taglen;
@@ -325,25 +325,25 @@ if ( (s1 = as_mpi(&der, &sign_ctx->n))
)
return s1;
-DEBUG(D_acl) acl_debug_printf("rsa_signing_init:\n");
+DEBUG(D_acl) debug_printf_indent("rsa_signing_init:\n");
{
uschar * s;
gcry_mpi_aprint (GCRYMPI_FMT_HEX, &s, NULL, sign_ctx->n);
- acl_debug_printf(" N : %s\n", s);
+ debug_printf_indent(" N : %s\n", s);
gcry_mpi_aprint (GCRYMPI_FMT_HEX, &s, NULL, sign_ctx->e);
- acl_debug_printf(" E : %s\n", s);
+ debug_printf_indent(" E : %s\n", s);
gcry_mpi_aprint (GCRYMPI_FMT_HEX, &s, NULL, sign_ctx->d);
- acl_debug_printf(" D : %s\n", s);
+ debug_printf_indent(" D : %s\n", s);
gcry_mpi_aprint (GCRYMPI_FMT_HEX, &s, NULL, sign_ctx->p);
- acl_debug_printf(" P : %s\n", s);
+ debug_printf_indent(" P : %s\n", s);
gcry_mpi_aprint (GCRYMPI_FMT_HEX, &s, NULL, sign_ctx->q);
- acl_debug_printf(" Q : %s\n", s);
+ debug_printf_indent(" Q : %s\n", s);
gcry_mpi_aprint (GCRYMPI_FMT_HEX, &s, NULL, sign_ctx->dp);
- acl_debug_printf(" DP: %s\n", s);
+ debug_printf_indent(" DP: %s\n", s);
gcry_mpi_aprint (GCRYMPI_FMT_HEX, &s, NULL, sign_ctx->dq);
- acl_debug_printf(" DQ: %s\n", s);
+ debug_printf_indent(" DQ: %s\n", s);
gcry_mpi_aprint (GCRYMPI_FMT_HEX, &s, NULL, sign_ctx->qp);
- acl_debug_printf(" QP: %s\n", s);
+ debug_printf_indent(" QP: %s\n", s);
}
return NULL;
@@ -402,13 +402,13 @@ DEBUG(D_acl)
{
uschar * s;
gcry_mpi_aprint (GCRYMPI_FMT_HEX, &s, NULL, m_sig);
- acl_debug_printf(" SG: %s\n", s);
+ debug_printf_indent(" SG: %s\n", s);
}
gerr = gcry_mpi_print(GCRYMPI_FMT_USG, sig->data, SIGSPACE, &sig->len, m_sig);
if (gerr)
{
- acl_debug_printf("signature conversion from MPI to buffer failed\n");
+ debug_printf_indent("signature conversion from MPI to buffer failed\n");
return US gcry_strerror(gerr);
}
#undef SIGSPACE
@@ -480,13 +480,13 @@ if ( (errstr = as_mpi(pubkey_der, &verify_ctx->n))
)
return errstr;
-DEBUG(D_acl) acl_debug_printf("rsa_verify_init:\n");
+DEBUG(D_acl) debug_printf_indent("rsa_verify_init:\n");
{
uschar * s;
gcry_mpi_aprint (GCRYMPI_FMT_HEX, &s, NULL, verify_ctx->n);
- acl_debug_printf(" N : %s\n", s);
+ debug_printf_indent(" N : %s\n", s);
gcry_mpi_aprint (GCRYMPI_FMT_HEX, &s, NULL, verify_ctx->e);
- acl_debug_printf(" E : %s\n", s);
+ debug_printf_indent(" E : %s\n", s);
}
return NULL;
@@ -528,7 +528,7 @@ if ( (stage = US"pkey sexp build",
gerr = gcry_pk_verify (s_sig, s_hash, s_pkey))
)
{
- DEBUG(D_acl) acl_debug_printf("verify: error in stage '%s'\n", stage);
+ DEBUG(D_acl) debug_printf_indent("verify: error in stage '%s'\n", stage);
return US gcry_strerror(gerr);
}