From 53ca0fcbe5b5eccbc2733fce563ee12e7493cd4a Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Thu, 18 Feb 2010 16:07:53 -0800
Subject: [PATCH] Added new NSEC3 algorithms for DNSSEC.

---
 bind8/CHANGELOG    | 2 ++
 bind8/bind8-lib.pl | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/bind8/CHANGELOG b/bind8/CHANGELOG
index ad7e28ce8..8e9b156be 100644
--- a/bind8/CHANGELOG
+++ b/bind8/CHANGELOG
@@ -114,3 +114,5 @@ If nscd is running when BIND is restarted or a zone is applied, it will be signa
 When all DNS records in a zone are shown, the Type column can be clicked on to sort them.
 ---- Changes since 1.490 ----
 Root zone records files are now included in Webmin backups.
+---- Changes since 1.500 ----
+Added new NSEC3 algorithms for DNSSEC.
diff --git a/bind8/bind8-lib.pl b/bind8/bind8-lib.pl
index 1758a0063..1b93d67cd 100755
--- a/bind8/bind8-lib.pl
+++ b/bind8/bind8-lib.pl
@@ -2660,12 +2660,15 @@ local ($alg) = @_;
 return $alg eq 'RSAMD5' || $alg eq 'RSASHA1' ? ( 512, 2048 ) :
        $alg eq 'DH' ? ( 128, 4096 ) :
        $alg eq 'DSA' ? ( 512, 1024, 64 ) :
-       $alg eq 'HMAC-MD5' ? ( 1, 512 ) : ( );
+       $alg eq 'HMAC-MD5' ? ( 1, 512 ) :
+       $alg eq 'NSEC3RSASHA1' ? ( 512, 4096 ) :
+       $alg eq 'NSEC3DSA' ? ( 512, 1024, 64 ) : ( );
 }
 
 sub list_dnssec_algorithms
 {
-return ("DSA", "RSAMD5", "RSASHA1", "DH", "HMAC-MD5");
+return ("DSA", "RSAMD5", "RSASHA1", "DH", "HMAC-MD5",
+	"NSEC3RSASHA1", "NSEC3DSA");
 }
 
 # get_keys_dir(&zone|&zone-name)