fmDNS - #156 - Added bind 9.10 key algorithms

WillyXJ · Oct 13, 2014 · 2e89355 · 2e89355
1 parent 21d08af
commit 2e89355
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/server/fm-modules/fmDNS/change.log b/server/fm-modules/fmDNS/change.log
@@ -1,7 +1,8 @@
-1.3.1 (2014-??)
-================
+1.3.1 (2014-10-13)
+==================
 * Server - [improvement] No longer default to creating a SOA template. (Issue #155)
 * Server - [feature] Added ability to define default SOA. (Issue #155)
+* Server - [feature] Added BIND 9.10 support key algorithms. (Issue #156)
 
 1.3 (2014-09-17)
 ================

diff --git a/server/fm-modules/fmDNS/install.php b/server/fm-modules/fmDNS/install.php
@@ -107,7 +107,7 @@ function installfmDNSSchema($link = null, $database, $module, $noisy = true) {
   `key_id` int(11) NOT NULL AUTO_INCREMENT,
   `account_id` int(11) NOT NULL DEFAULT '1',
   `key_name` varchar(255) NOT NULL,
-  `key_algorithm` enum('hmac-md5') NOT NULL DEFAULT 'hmac-md5',
+  `key_algorithm` enum('hmac-md5',  'hmac-sha1',  'hmac-sha224',  'hmac-sha256', 'hmac-sha384',  'hmac-sha512') NOT NULL DEFAULT 'hmac-md5',
   `key_secret` varchar(255) NOT NULL,
   `key_view` int(11) NOT NULL DEFAULT '0',
   `key_comment` text,

diff --git a/server/fm-modules/fmDNS/upgrade.php b/server/fm-modules/fmDNS/upgrade.php
@@ -1172,6 +1172,7 @@ function upgradefmDNS_131($__FM_CONFIG, $running_version) {
 	if (!$success) return false;
 
 	$table[] = "ALTER TABLE  `fm_{$__FM_CONFIG['fmDNS']['prefix']}soa` ADD `soa_default` ENUM('yes','no') NOT NULL DEFAULT 'no' AFTER `soa_template`;";
+	$table[] = "ALTER TABLE  `fm_{$__FM_CONFIG['fmDNS']['prefix']}keys` CHANGE  `key_algorithm`  `key_algorithm` ENUM(  'hmac-md5',  'hmac-sha1',  'hmac-sha224',  'hmac-sha256', 'hmac-sha384',  'hmac-sha512' ) NOT NULL DEFAULT  'hmac-md5';";
 
 	$inserts = $updates = null;
 

diff --git a/server/fm-modules/fmDNS/variables.inc.php b/server/fm-modules/fmDNS/variables.inc.php
@@ -31,7 +31,7 @@
 
 /** Module Information */
 $__FM_CONFIG['fmDNS'] = array(
-		'version'							=> '1.3',
+		'version'							=> '1.3.1',
 		'client_version'					=> '1.3',
 		'description'						=> 'Easily manage one or more ISC BIND servers through a web interface.  No more editing configuration
 												and zone files manually.',