mirror of
https://github.com/NLnetLabs/unbound.git
synced 2025-12-22 07:41:16 -05:00
RSASHA256 implicitly means NSEC3 support.
git-svn-id: file:///svn/unbound/trunk@1593 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
parent
5a9dcd323d
commit
3b386055c7
3 changed files with 6 additions and 8 deletions
|
|
@ -1,3 +1,7 @@
|
||||||
|
9 April 2009: Wouter
|
||||||
|
- Fix for removal of RSASHA256_NSEC3 protonumber from ldns.
|
||||||
|
- ldns tarball updated.
|
||||||
|
|
||||||
6 April 2009: Wouter
|
6 April 2009: Wouter
|
||||||
- windows compile fix.
|
- windows compile fix.
|
||||||
- Detect FreeBSD jail without ipv6 addresses assigned.
|
- Detect FreeBSD jail without ipv6 addresses assigned.
|
||||||
|
|
|
||||||
BIN
ldns-src.tar.gz
BIN
ldns-src.tar.gz
Binary file not shown.
|
|
@ -372,11 +372,9 @@ dnskey_algo_id_is_supported(int id)
|
||||||
case LDNS_RSAMD5:
|
case LDNS_RSAMD5:
|
||||||
#ifdef HAVE_EVP_SHA256
|
#ifdef HAVE_EVP_SHA256
|
||||||
case LDNS_RSASHA256:
|
case LDNS_RSASHA256:
|
||||||
case LDNS_RSASHA256_NSEC3:
|
|
||||||
#endif
|
#endif
|
||||||
#ifdef HAVE_EVP_SHA512
|
#ifdef HAVE_EVP_SHA512
|
||||||
case LDNS_RSASHA512:
|
case LDNS_RSASHA512:
|
||||||
case LDNS_RSASHA512_NSEC3:
|
|
||||||
#endif
|
#endif
|
||||||
return 1;
|
return 1;
|
||||||
default:
|
default:
|
||||||
|
|
@ -1241,11 +1239,9 @@ setup_key_digest(int algo, EVP_PKEY* evp_key, const EVP_MD** digest_type,
|
||||||
case LDNS_RSASHA1_NSEC3:
|
case LDNS_RSASHA1_NSEC3:
|
||||||
#ifdef HAVE_EVP_SHA256
|
#ifdef HAVE_EVP_SHA256
|
||||||
case LDNS_RSASHA256:
|
case LDNS_RSASHA256:
|
||||||
case LDNS_RSASHA256_NSEC3:
|
|
||||||
#endif
|
#endif
|
||||||
#ifdef HAVE_EVP_SHA512
|
#ifdef HAVE_EVP_SHA512
|
||||||
case LDNS_RSASHA512:
|
case LDNS_RSASHA512:
|
||||||
case LDNS_RSASHA512_NSEC3:
|
|
||||||
#endif
|
#endif
|
||||||
rsa = ldns_key_buf2rsa_raw(key, keylen);
|
rsa = ldns_key_buf2rsa_raw(key, keylen);
|
||||||
if(!rsa) {
|
if(!rsa) {
|
||||||
|
|
@ -1261,14 +1257,12 @@ setup_key_digest(int algo, EVP_PKEY* evp_key, const EVP_MD** digest_type,
|
||||||
|
|
||||||
/* select SHA version */
|
/* select SHA version */
|
||||||
#ifdef HAVE_EVP_SHA256
|
#ifdef HAVE_EVP_SHA256
|
||||||
if(algo == LDNS_RSASHA256 ||
|
if(algo == LDNS_RSASHA256)
|
||||||
algo == LDNS_RSASHA256_NSEC3)
|
|
||||||
*digest_type = EVP_sha256();
|
*digest_type = EVP_sha256();
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
#ifdef HAVE_EVP_SHA512
|
#ifdef HAVE_EVP_SHA512
|
||||||
if(algo == LDNS_RSASHA512 ||
|
if(algo == LDNS_RSASHA512)
|
||||||
algo == LDNS_RSASHA512_NSEC3)
|
|
||||||
*digest_type = EVP_sha512();
|
*digest_type = EVP_sha512();
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue