You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2016/03/10 03:17:13 UTC
[1/2] git commit: updated refs/heads/master to 9a9136e
Repository: cloudstack
Updated Branches:
refs/heads/master 359d20e8d -> 9a9136e39
ADD be explicit about the underlying limitation - OpenSwan
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/783aac82
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/783aac82
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/783aac82
Branch: refs/heads/master
Commit: 783aac8268398a68dd73d282893a4b517fce5666
Parents: 7017a82
Author: Nuno Tavares <n....@tech.leaseweb.com>
Authored: Wed Mar 2 11:11:34 2016 +0100
Committer: Nuno Tavares <n....@tech.leaseweb.com>
Committed: Wed Mar 2 11:11:34 2016 +0100
----------------------------------------------------------------------
.../api/command/user/vpn/CreateVpnCustomerGatewayCmd.java | 2 +-
.../api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/783aac82/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java
index 0fb496c..e113109 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java
@@ -51,7 +51,7 @@ public class CreateVpnCustomerGatewayCmd extends BaseAsyncCmd {
@Parameter(name = ApiConstants.CIDR_LIST, type = CommandType.STRING, required = true, description = "guest cidr list of the customer gateway")
private String peerCidrList;
- @Parameter(name = ApiConstants.IPSEC_PSK, type = CommandType.STRING, required = true, description = "IPsec Preshared-Key of the customer gateway")
+ @Parameter(name = ApiConstants.IPSEC_PSK, type = CommandType.STRING, required = true, description = "IPsec Preshared-Key of the customer gateway. Cannot contain newline or double quotes.")
private String ipsecPsk;
@Parameter(name = ApiConstants.IKE_POLICY, type = CommandType.STRING, required = true, description = "IKE policy of the customer gateway")
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/783aac82/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java
index 3b188b8..bb59141 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java
@@ -57,7 +57,7 @@ public class UpdateVpnCustomerGatewayCmd extends BaseAsyncCmd {
@Parameter(name = ApiConstants.CIDR_LIST, type = CommandType.STRING, required = true, description = "guest cidr of the customer gateway")
private String guestCidrList;
- @Parameter(name = ApiConstants.IPSEC_PSK, type = CommandType.STRING, required = true, description = "IPsec Preshared-Key of the customer gateway")
+ @Parameter(name = ApiConstants.IPSEC_PSK, type = CommandType.STRING, required = true, description = "IPsec Preshared-Key of the customer gateway. Cannot contain newline or double quotes.")
private String ipsecPsk;
@Parameter(name = ApiConstants.IKE_POLICY, type = CommandType.STRING, required = true, description = "IKE policy of the customer gateway")
[2/2] git commit: updated refs/heads/master to 9a9136e
Posted by ra...@apache.org.
Merge pull request #1426 from ntavares/ipsec-psk-rules
ADD be explicit about the underlying limitation - OpenSwanAccording to:
http://linux.die.net/man/5/ipsec.secrets
A preshared secret is most conveniently represented as a sequence of characters, delimited by the double-quote character ("). The sequence cannot contain a newline or double-quote.
* pr/1426:
ADD be explicit about the underlying limitation - OpenSwan
Signed-off-by: Rafael Weingärtner <ra...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9a9136e3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9a9136e3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9a9136e3
Branch: refs/heads/master
Commit: 9a9136e39beb11c2ce692bdcfe826b0c7b1c6cae
Parents: 359d20e 783aac8
Author: Rafael Weingärtner <ra...@apache.org>
Authored: Wed Mar 9 23:15:08 2016 -0300
Committer: Rafael Weingärtner <ra...@apache.org>
Committed: Wed Mar 9 23:15:08 2016 -0300
----------------------------------------------------------------------
.../api/command/user/vpn/CreateVpnCustomerGatewayCmd.java | 2 +-
.../api/command/user/vpn/UpdateVpnCustomerGatewayCmd.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------