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/31 01:46:43 UTC
git commit: S2S VPN: Update the supported crypto list
Updated Branches:
refs/heads/vpc 67941f818 -> e8d2ca48b
S2S VPN: Update the supported crypto list
We would support 3DES, AES128, AES192, AES256.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/e8d2ca48
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/e8d2ca48
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/e8d2ca48
Branch: refs/heads/vpc
Commit: e8d2ca48b4db568c032a185c787d5890072a5692
Parents: 67941f8
Author: Sheng Yang <sh...@citrix.com>
Authored: Mon Jul 30 16:43:55 2012 -0700
Committer: Sheng Yang <sh...@citrix.com>
Committed: Mon Jul 30 16:43:55 2012 -0700
----------------------------------------------------------------------
utils/src/com/cloud/utils/net/NetUtils.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e8d2ca48/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 e84a7e2..333e784 100755
--- a/utils/src/com/cloud/utils/net/NetUtils.java
+++ b/utils/src/com/cloud/utils/net/NetUtils.java
@@ -1080,7 +1080,7 @@ public class NetUtils {
}
String cipher = list[0];
String hash = list[1];
- if (!cipher.matches("3des|aes|aes128|aes256")) {
+ if (!cipher.matches("3des|aes128|aes192|aes256")) {
return false;
}
if (!hash.matches("md5|sha1")) {