diff options
author | sthen <sthen@openbsd.org> | 2015-07-17 17:36:01 +0000 |
---|---|---|
committer | sthen <sthen@openbsd.org> | 2015-07-17 17:36:01 +0000 |
commit | c939baa47e74c1c9d041cfa3af1d0d0e62c34641 (patch) | |
tree | a7cdf9265f94dba688493776204cc821f6255344 /usr.sbin/nsd/tsig-openssl.c | |
parent | add exdisplay to chromebook_devs (diff) | |
download | wireguard-openbsd-c939baa47e74c1c9d041cfa3af1d0d0e62c34641.tar.xz wireguard-openbsd-c939baa47e74c1c9d041cfa3af1d0d0e62c34641.zip |
update to NSD 4.1.3, ok florian@, also tested by brad
Diffstat (limited to 'usr.sbin/nsd/tsig-openssl.c')
-rw-r--r-- | usr.sbin/nsd/tsig-openssl.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/usr.sbin/nsd/tsig-openssl.c b/usr.sbin/nsd/tsig-openssl.c index 6795e750f1f..40a35f50324 100644 --- a/usr.sbin/nsd/tsig-openssl.c +++ b/usr.sbin/nsd/tsig-openssl.c @@ -61,14 +61,19 @@ tsig_openssl_init(region_type *region) int count = 0; OpenSSL_add_all_digests(); - count += tsig_openssl_init_algorithm(region, "md5", "hmac-md5","hmac-md5.sig-alg.reg.int."); -#ifdef HAVE_EVP_SHA1 - count += tsig_openssl_init_algorithm(region, "sha1", "hmac-sha1", "hmac-sha1."); -#endif /* HAVE_EVP_SHA1 */ - -#ifdef HAVE_EVP_SHA256 - count += tsig_openssl_init_algorithm(region, "sha256", "hmac-sha256", "hmac-sha256."); -#endif /* HAVE_EVP_SHA256 */ + count += tsig_openssl_init_algorithm(region, + "md5", "hmac-md5","hmac-md5.sig-alg.reg.int."); + count += tsig_openssl_init_algorithm(region, + "sha1", "hmac-sha1", "hmac-sha1."); + count += tsig_openssl_init_algorithm(region, + "sha224", "hmac-sha224", "hmac-sha224."); + count += tsig_openssl_init_algorithm(region, + "sha256", "hmac-sha256", "hmac-sha256."); + count += tsig_openssl_init_algorithm(region, + "sha384", "hmac-sha384", "hmac-sha384."); + count += tsig_openssl_init_algorithm(region, + "sha512", "hmac-sha512", "hmac-sha512."); + return count; } |