diff options
| author | Jeff Leung <jleung@v10networks.ca> | 2015-12-06 03:12:18 -0500 |
|---|---|---|
| committer | Jeff Leung <jleung@v10networks.ca> | 2015-12-06 03:12:18 -0500 |
| commit | 9e5c1863dde4762120d52f851d25178d8be5bb24 (patch) | |
| tree | 76ba86b3540c59268da6435bd32fd10ee561f1b9 /templates/vpn/ipsec | |
| parent | 209d0ae7650cb76a18feedaf75052eb03036c184 (diff) | |
| parent | 5c1672341b33dc726da5d7845725bd74e3cc7cb6 (diff) | |
| download | vyatta-cfg-vpn-9e5c1863dde4762120d52f851d25178d8be5bb24.tar.gz vyatta-cfg-vpn-9e5c1863dde4762120d52f851d25178d8be5bb24.zip | |
Merge branch 'lithium' into lithium-strongswan5
Conflicts:
templates/vpn/ipsec/esp-group/node.tag/proposal/node.tag/encryption/node.def
templates/vpn/ipsec/ike-group/node.tag/proposal/node.tag/encryption/node.def
Get the GCM and ChaCha20+Poly1305 ciphers to play nice with each other
Diffstat (limited to 'templates/vpn/ipsec')
| -rw-r--r-- | templates/vpn/ipsec/site-to-site/peer/node.tag/authentication/use-x509-id/node.def | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/templates/vpn/ipsec/site-to-site/peer/node.tag/authentication/use-x509-id/node.def b/templates/vpn/ipsec/site-to-site/peer/node.tag/authentication/use-x509-id/node.def new file mode 100644 index 0000000..95a90c1 --- /dev/null +++ b/templates/vpn/ipsec/site-to-site/peer/node.tag/authentication/use-x509-id/node.def @@ -0,0 +1 @@ +help: Use certificate common name as ID |