RSASHA256 implicitly means NSEC3 support.

git-svn-id: file:///svn/unbound/trunk@1593 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2009-04-09 14:51:17 +00:00
parent 5a9dcd323d
commit 3b386055c7
3 changed files with 6 additions and 8 deletions

View file

@ -1,3 +1,7 @@
9 April 2009: Wouter
- Fix for removal of RSASHA256_NSEC3 protonumber from ldns.
- ldns tarball updated.
6 April 2009: Wouter
- windows compile fix.
- Detect FreeBSD jail without ipv6 addresses assigned.

Binary file not shown.

View file

@ -372,11 +372,9 @@ dnskey_algo_id_is_supported(int id)
case LDNS_RSAMD5:
#ifdef HAVE_EVP_SHA256
case LDNS_RSASHA256:
case LDNS_RSASHA256_NSEC3:
#endif
#ifdef HAVE_EVP_SHA512
case LDNS_RSASHA512:
case LDNS_RSASHA512_NSEC3:
#endif
return 1;
default:
@ -1241,11 +1239,9 @@ setup_key_digest(int algo, EVP_PKEY* evp_key, const EVP_MD** digest_type,
case LDNS_RSASHA1_NSEC3:
#ifdef HAVE_EVP_SHA256
case LDNS_RSASHA256:
case LDNS_RSASHA256_NSEC3:
#endif
#ifdef HAVE_EVP_SHA512
case LDNS_RSASHA512:
case LDNS_RSASHA512_NSEC3:
#endif
rsa = ldns_key_buf2rsa_raw(key, keylen);
if(!rsa) {
@ -1261,14 +1257,12 @@ setup_key_digest(int algo, EVP_PKEY* evp_key, const EVP_MD** digest_type,
/* select SHA version */
#ifdef HAVE_EVP_SHA256
if(algo == LDNS_RSASHA256 ||
algo == LDNS_RSASHA256_NSEC3)
if(algo == LDNS_RSASHA256)
*digest_type = EVP_sha256();
else
#endif
#ifdef HAVE_EVP_SHA512
if(algo == LDNS_RSASHA512 ||
algo == LDNS_RSASHA512_NSEC3)
if(algo == LDNS_RSASHA512)
*digest_type = EVP_sha512();
else
#endif