#ifndef DISABLE_DKIM /* rest of file */
-#ifndef SUPPORT_TLS
-# error Need SUPPORT_TLS for DKIM
+#ifdef DISABLE_TLS
+# error Must no DISABLE_TLS, for DKIM
#endif
{
case KEYFMT_DER:
if ((rc = gnutls_pubkey_import(verify_ctx->key, &k, GNUTLS_X509_FMT_DER)))
- ret = gnutls_strerror(rc);
+ ret = US gnutls_strerror(rc);
break;
#ifdef SIGN_HAVE_ED25519
case KEYFMT_ED25519_BARE:
if ((rc = gnutls_pubkey_import_ecc_raw(verify_ctx->key,
GNUTLS_ECC_CURVE_ED25519, &k, NULL)))
- ret = gnutls_strerror(rc);
+ ret = US gnutls_strerror(rc);
break;
#endif
default:
{
if ((rc = gnutls_pubkey_verify_data2(verify_ctx->key,
GNUTLS_SIGN_EDDSA_ED25519, 0, &k, &s)) < 0)
- ret = gnutls_strerror(rc);
+ ret = US gnutls_strerror(rc);
}
else
#endif
}
if ((rc = gnutls_pubkey_verify_hash2(verify_ctx->key, algo, 0, &k, &s)) < 0)
- ret = gnutls_strerror(rc);
+ ret = US gnutls_strerror(rc);
}
gnutls_pubkey_deinit(verify_ctx->key);
{
EVP_MD_CTX * ctx;
- if ( (ctx = EVP_MD_CTX_new())
- && EVP_DigestVerifyInit(ctx, NULL, md, NULL, verify_ctx->key) > 0
- && EVP_DigestVerify(ctx, sig->data, sig->len, data->data, data->len) > 0
- )
- { EVP_MD_CTX_free(ctx); return NULL; }
-
- if (ctx) EVP_MD_CTX_free(ctx);
+ if ((ctx = EVP_MD_CTX_new()))
+ {
+ if ( EVP_DigestVerifyInit(ctx, NULL, md, NULL, verify_ctx->key) > 0
+ && EVP_DigestVerify(ctx, sig->data, sig->len, data->data, data->len) > 0
+ )
+ { EVP_MD_CTX_free(ctx); return NULL; }
+ EVP_MD_CTX_free(ctx);
+ }
}
else
#endif
{
EVP_PKEY_CTX * ctx;
- if ( (ctx = EVP_PKEY_CTX_new(verify_ctx->key, NULL))
- && EVP_PKEY_verify_init(ctx) > 0
- && EVP_PKEY_CTX_set_rsa_padding(ctx, RSA_PKCS1_PADDING) > 0
- && EVP_PKEY_CTX_set_signature_md(ctx, md) > 0
- && EVP_PKEY_verify(ctx, sig->data, sig->len,
- data->data, data->len) == 1
- )
- { EVP_PKEY_CTX_free(ctx); return NULL; }
-
- if (ctx) EVP_PKEY_CTX_free(ctx);
+ if ((ctx = EVP_PKEY_CTX_new(verify_ctx->key, NULL)))
+ {
+ if ( EVP_PKEY_verify_init(ctx) > 0
+ && EVP_PKEY_CTX_set_rsa_padding(ctx, RSA_PKCS1_PADDING) > 0
+ && EVP_PKEY_CTX_set_signature_md(ctx, md) > 0
+ && EVP_PKEY_verify(ctx, sig->data, sig->len,
+ data->data, data->len) == 1
+ )
+ { EVP_PKEY_CTX_free(ctx); return NULL; }
+ EVP_PKEY_CTX_free(ctx);
+
+ DEBUG(D_tls)
+ if (Ustrcmp(ERR_reason_error_string(ERR_peek_error()), "wrong signature length") == 0)
+ debug_printf("sig len (from msg hdr): %d, expected (from dns pubkey) %d\n",
+ (int) sig->len, EVP_PKEY_size(verify_ctx->key));
+ }
}
+
return US ERR_error_string(ERR_get_error(), NULL);
}