diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-06-24 13:06:04 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-06-24 13:06:04 +0200 |
| commit | 1e57b56f271d55bee4e1118f4f4f9aad27b813ce (patch) | |
| tree | 52644fe91c46af6dbad1edf2664e2f359ed6c992 /templates/vpn/ipsec/esp-group | |
| parent | a2574ad42f708aa662bc9fc7bbbf0badf8349bd1 (diff) | |
| parent | 90daa5e2cf02ffd3fd5936b4f372f1e85ab62ef6 (diff) | |
| download | vyatta-cfg-vpn-lithium.tar.gz vyatta-cfg-vpn-lithium.zip | |
Merge branch 'current' into lithiumlithium
Conflicts:
scripts/vpn-config.pl
Diffstat (limited to 'templates/vpn/ipsec/esp-group')
| -rw-r--r-- | templates/vpn/ipsec/esp-group/node.tag/proposal/node.tag/encryption/node.def | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/vpn/ipsec/esp-group/node.tag/proposal/node.tag/encryption/node.def b/templates/vpn/ipsec/esp-group/node.tag/proposal/node.tag/encryption/node.def index 0e8fd2d..ba66828 100644 --- a/templates/vpn/ipsec/esp-group/node.tag/proposal/node.tag/encryption/node.def +++ b/templates/vpn/ipsec/esp-group/node.tag/proposal/node.tag/encryption/node.def @@ -1,10 +1,10 @@ help: Encryption algorithm type: txt default: "aes128" -syntax:expression: $VAR(@) in "aes128", "aes256", "3des"; "must be aes128, or aes256, or 3des" -syntax:expression: $VAR(@) in "aes128", "aes256", "3des", "aes128gcm128", "aes256gcm128"; "must be aes128, or aes128gcm128, or aes256, or aes256gcm128, or 3des" +syntax:expression: $VAR(@) in "aes128", "aes256", "aes128gcm128", "aes256gcm128", "3des", "chacha20poly1305"; "must be aes128, aes256, 3des, or chacha20poly1305" val_help: aes128; AES-128 encryption (default) val_help: aes256; AES-256 encryption val_help: aes128gcm128; AES-128 encryption with Galois Counter Mode 128-bit val_help: aes256gcm128; AES-256 encryption with Galois Counter Mode 128-bit val_help: 3des; 3DES encryption +val_help: chacha20poly1305; ChaCha20-Poly1305 encryption |