Lines 5301-5306
Link Here
|
5301 |
size_t diglen = 0; |
5301 |
size_t diglen = 0; |
5302 |
#ifdef USE_GNUTLS |
5302 |
#ifdef USE_GNUTLS |
5303 |
gnutls_datum_t key; |
5303 |
gnutls_datum_t key; |
|
|
5304 |
gnutls_sign_algorithm_t sign_algo; |
5304 |
#else /* USE_GNUTLS */ |
5305 |
#else /* USE_GNUTLS */ |
5305 |
BIO *key; |
5306 |
BIO *key; |
5306 |
#endif /* USE_GNUTLS */ |
5307 |
#endif /* USE_GNUTLS */ |
Lines 5413-5418
Link Here
|
5413 |
rsa->rsa_digest.data = digest; |
5414 |
rsa->rsa_digest.data = digest; |
5414 |
rsa->rsa_digest.size = diglen; |
5415 |
rsa->rsa_digest.size = diglen; |
5415 |
|
5416 |
|
|
|
5417 |
sign_algo = gnutls_pk_to_sign(GNUTLS_PK_RSA, (dkim->dkim_signalg != DKIM_SIGN_RSASHA1 ? GNUTLS_DIG_SHA256 : GNUTLS_DIG_SHA1)); |
5418 |
|
5416 |
status = gnutls_pubkey_init(&rsa->rsa_pubkey); |
5419 |
status = gnutls_pubkey_init(&rsa->rsa_pubkey); |
5417 |
if (status != GNUTLS_E_SUCCESS) |
5420 |
if (status != GNUTLS_E_SUCCESS) |
5418 |
{ |
5421 |
{ |
Lines 5442-5448
Link Here
|
5442 |
return DKIM_STAT_OK; |
5445 |
return DKIM_STAT_OK; |
5443 |
} |
5446 |
} |
5444 |
|
5447 |
|
5445 |
rsastat = gnutls_pubkey_verify_hash(rsa->rsa_pubkey, 0, |
5448 |
rsastat = gnutls_pubkey_verify_hash2(rsa->rsa_pubkey, |
|
|
5449 |
sign_algo, 0, |
5446 |
&rsa->rsa_digest, |
5450 |
&rsa->rsa_digest, |
5447 |
&rsa->rsa_sig); |
5451 |
&rsa->rsa_sig); |
5448 |
if (rsastat < 0) |
5452 |
if (rsastat < 0) |