You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ya...@apache.org on 2012/07/10 19:38:29 UTC
git commit: CS-15513: Fix group 5 of s2s vpn
Updated Branches:
refs/heads/vpc 911ed25fb -> 94c62f212
CS-15513: Fix group 5 of s2s vpn
Conflicts:
utils/test/com/cloud/utils/net/NetUtilsTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/94c62f21
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/94c62f21
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/94c62f21
Branch: refs/heads/vpc
Commit: 94c62f212778016a3a42d7f7a732b92cb28e9ecd
Parents: 911ed25
Author: Sheng Yang <sh...@citrix.com>
Authored: Tue Jul 10 10:30:48 2012 -0700
Committer: Sheng Yang <sh...@citrix.com>
Committed: Tue Jul 10 10:38:17 2012 -0700
----------------------------------------------------------------------
.../cloud/network/vpn/Site2SiteVpnManagerImpl.java | 4 ++--
utils/src/com/cloud/utils/net/NetUtils.java | 2 +-
utils/test/com/cloud/utils/net/NetUtilsTest.java | 10 +++++-----
3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/94c62f21/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
index 0104d09..6b4187e 100644
--- a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
+++ b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
@@ -105,10 +105,10 @@ public class Site2SiteVpnManagerImpl implements Site2SiteVpnService, Manager {
String ikePolicy = cmd.getIkePolicy();
String espPolicy = cmd.getEspPolicy();
if (!NetUtils.isValidS2SVpnPolicy(ikePolicy)) {
- throw new InvalidParameterValueException("The customer gateway IKE policy" + ikePolicy + " is invalid!");
+ throw new InvalidParameterValueException("The customer gateway IKE policy " + ikePolicy + " is invalid!");
}
if (!NetUtils.isValidS2SVpnPolicy(espPolicy)) {
- throw new InvalidParameterValueException("The customer gateway ESP policy" + espPolicy + " is invalid!");
+ throw new InvalidParameterValueException("The customer gateway ESP policy " + espPolicy + " is invalid!");
}
Long lifetime = cmd.getLifetime();
if (lifetime == null) {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/94c62f21/utils/src/com/cloud/utils/net/NetUtils.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/net/NetUtils.java b/utils/src/com/cloud/utils/net/NetUtils.java
index f33fe4a..6d17ffb 100755
--- a/utils/src/com/cloud/utils/net/NetUtils.java
+++ b/utils/src/com/cloud/utils/net/NetUtils.java
@@ -1086,7 +1086,7 @@ public class NetUtils {
if (!hash.matches("md5|sha1")) {
return false;
}
- if (pfsGroup != null && !pfsGroup.matches("modp768|modp1024|modp2048")) {
+ if (pfsGroup != null && !pfsGroup.matches("modp1024|modp1536")) {
return false;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/94c62f21/utils/test/com/cloud/utils/net/NetUtilsTest.java
----------------------------------------------------------------------
diff --git a/utils/test/com/cloud/utils/net/NetUtilsTest.java b/utils/test/com/cloud/utils/net/NetUtilsTest.java
index 5e387bc..4bcddeb 100644
--- a/utils/test/com/cloud/utils/net/NetUtilsTest.java
+++ b/utils/test/com/cloud/utils/net/NetUtilsTest.java
@@ -55,14 +55,14 @@ public class NetUtilsTest extends TestCase {
public void testVpnPolicy() {
assertTrue(NetUtils.isValidS2SVpnPolicy("aes-sha1"));
- assertTrue(NetUtils.isValidS2SVpnPolicy("des-md5;modp768"));
- assertTrue(NetUtils.isValidS2SVpnPolicy("des-md5;modp768,aes-sha1;modp2048"));
- assertTrue(NetUtils.isValidS2SVpnPolicy("3des-sha1,aes-sha1;modp2048"));
+ assertTrue(NetUtils.isValidS2SVpnPolicy("des-md5;modp1024"));
+ assertTrue(NetUtils.isValidS2SVpnPolicy("des-md5;modp1024,aes-sha1;modp1536"));
+ assertTrue(NetUtils.isValidS2SVpnPolicy("3des-sha1,aes-sha1;modp1536"));
assertTrue(NetUtils.isValidS2SVpnPolicy("3des-sha1,aes-sha1"));
assertFalse(NetUtils.isValidS2SVpnPolicy("abc-123,ase-sha1"));
assertFalse(NetUtils.isValidS2SVpnPolicy("de-sh,aes-sha1"));
assertFalse(NetUtils.isValidS2SVpnPolicy(""));
- assertFalse(NetUtils.isValidS2SVpnPolicy(";modp2048"));
- assertFalse(NetUtils.isValidS2SVpnPolicy(",aes;modp2048,,,"));
+ assertFalse(NetUtils.isValidS2SVpnPolicy(";modp1536"));
+ assertFalse(NetUtils.isValidS2SVpnPolicy(",aes;modp1536,,,"));
}
}