summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2014-05-25 05:39:00 -0700
committerDaniil Baturin <daniil@baturin.org>2014-05-25 05:39:00 -0700
commitcb7c2c8eb55a29957514b7862fa77ea660fdbc50 (patch)
tree9841b3119e5c543c5a12a1a77c0b82df63e0b221 /templates
parentae7363afce9dccdca2416158a38124d6ffff051c (diff)
parent9554319f0bb7517793d2ee4db281a968416c8d53 (diff)
downloadvyatta-cfg-vpn-cb7c2c8eb55a29957514b7862fa77ea660fdbc50.tar.gz
vyatta-cfg-vpn-cb7c2c8eb55a29957514b7862fa77ea660fdbc50.zip
Merge pull request #3 from ryanriske/helium-sha2
Bug 220: Add support for SHA2 hashes
Diffstat (limited to 'templates')
-rw-r--r--templates/vpn/ipsec/esp-group/node.tag/proposal/node.tag/hash/node.def5
-rw-r--r--templates/vpn/ipsec/ike-group/node.tag/proposal/node.tag/hash/node.def5
2 files changed, 8 insertions, 2 deletions
diff --git a/templates/vpn/ipsec/esp-group/node.tag/proposal/node.tag/hash/node.def b/templates/vpn/ipsec/esp-group/node.tag/proposal/node.tag/hash/node.def
index 681f008..7d5651c 100644
--- a/templates/vpn/ipsec/esp-group/node.tag/proposal/node.tag/hash/node.def
+++ b/templates/vpn/ipsec/esp-group/node.tag/proposal/node.tag/hash/node.def
@@ -1,6 +1,9 @@
help: Hash algorithm
type: txt
default: "sha1"
-syntax:expression: $VAR(@) in "md5", "sha1"; "must be md5 or sha1"
+syntax:expression: $VAR(@) in "md5", "sha1", "sha256", "sha384", "sha512"; "must be md5, sha1, sha256, sha384 or sha512"
val_help: md5; MD5 hash
val_help: sha1; SHA1 hash (default)
+val_help: sha256; SHA2-256 hash
+val_help: sha384; SHA2-384 hash
+val_help: sha512; SHA2-512 hash
diff --git a/templates/vpn/ipsec/ike-group/node.tag/proposal/node.tag/hash/node.def b/templates/vpn/ipsec/ike-group/node.tag/proposal/node.tag/hash/node.def
index 681f008..7d5651c 100644
--- a/templates/vpn/ipsec/ike-group/node.tag/proposal/node.tag/hash/node.def
+++ b/templates/vpn/ipsec/ike-group/node.tag/proposal/node.tag/hash/node.def
@@ -1,6 +1,9 @@
help: Hash algorithm
type: txt
default: "sha1"
-syntax:expression: $VAR(@) in "md5", "sha1"; "must be md5 or sha1"
+syntax:expression: $VAR(@) in "md5", "sha1", "sha256", "sha384", "sha512"; "must be md5, sha1, sha256, sha384 or sha512"
val_help: md5; MD5 hash
val_help: sha1; SHA1 hash (default)
+val_help: sha256; SHA2-256 hash
+val_help: sha384; SHA2-384 hash
+val_help: sha512; SHA2-512 hash