[Hyperic-hq-discuss] hq r14341 - in trunk: src/org/hyperic/snmp web/WEB-INF/classes

[<pn...@hy...>]

Author: pnguyen
Date: 2010-03-02 14:51:47 -0800 (Tue, 02 Mar 2010)
New Revision: 14341
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14341

Modified:
   trunk/src/org/hyperic/snmp/SNMPSession_v3.java
   trunk/web/WEB-INF/classes/ApplicationResources.properties
Log:
Update SNMPv3 privacy protocol support

Modified: trunk/src/org/hyperic/snmp/SNMPSession_v3.java
===================================================================
--- trunk/src/org/hyperic/snmp/SNMPSession_v3.java	2010-03-02 09:33:27 UTC (rev 14340)
+++ trunk/src/org/hyperic/snmp/SNMPSession_v3.java	2010-03-02 22:51:47 UTC (rev 14341)
@@ -99,15 +99,13 @@
 
         if (val.equals("DES")) {
             return PrivDES.ID;
-        } else if (val.equals("3DES")) // "Triple DES" privacy (encryption) mode
-                                       // has been added in HQ v4.3
-        {
+        } else if (val.equals("3DES")) {
             return Priv3DES.ID;
-        } else if ((val.equals("AES128")) || (val.equals("AES"))) {
+        } else if (val.equals("AES128") || val.equals("AES-128") || val.equals("AES")) {
             return PrivAES128.ID;
-        } else if (val.equals("AES192")) {
+        } else if (val.equals("AES192") || val.equals("AES-192")) {
             return PrivAES192.ID;
-        } else if (val.equals("AES256")) {
+        } else if (val.equals("AES256") || val.equals("AES-256")) {
             return PrivAES256.ID;
         } else {
             throw new SNMPException("Privacy protocol " + val + " not supported");

Modified: trunk/web/WEB-INF/classes/ApplicationResources.properties
===================================================================
--- trunk/web/WEB-INF/classes/ApplicationResources.properties	2010-03-02 09:33:27 UTC (rev 14340)
+++ trunk/web/WEB-INF/classes/ApplicationResources.properties	2010-03-02 22:51:47 UTC (rev 14341)
@@ -667,6 +667,11 @@
 admin.settings.SNMPAgentAddress=Agent Address:
 admin.settings.SNMPNotificationMechanism=Notification Mechanism:
 admin.settings.SNMPDefaultNotificationMechanism=Default Notification Mechanism:
+admin.settings.snmp.privacy.DES=DES
+admin.settings.snmp.privacy.3DES=3DES
+admin.settings.snmp.privacy.AES128=AES-128
+admin.settings.snmp.privacy.AES192=AES-192
+admin.settings.snmp.privacy.AES256=AES-256
 
 admin.settings.UseLDAPAuth=Use LDAP Authentication