browser: Added SNMPv3 AES encryption (issue #24)

cederberg · Feb 20, 2017 · 3a6bb8e · 3a6bb8e
1 parent 4b44898
commit 3a6bb8e
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 9 deletions.
diff --git a/src/doc/release/version.xml b/src/doc/release/version.xml
@@ -9,11 +9,10 @@
 
     <list>
       <item>
-        <title>Fixed NPE if imported MIB not found</title>
-        <text>The <code>MibImport</code> class unfortunately threw a
-        <code>NullPointerException</code> when an imported MIB wasn't found.
-        Thanks to Yonghao Yu for fixing and reporting this.
-        <ref issue="23" /></text>
+        <title>Added AES encryption to MibbleBrowser</title>
+        <text>The MibbleBrowser application now supports AES encryption of
+        messages. Thanks to Richard Thompson for suggesting this.
+        <ref issue="24" /></text>
       </item>
 
       <item>
@@ -22,6 +21,14 @@
         6.1 to enable AES privacy. This library is only used by the example
         MibbleBrowser application and isn't required for MIB parsing.</text>
       </item>
+
+      <item>
+        <title>Fixed NPE when imported MIB not found</title>
+        <text>The <code>MibImport</code> class unfortunately threw a
+        <code>NullPointerException</code> when an imported MIB wasn't found.
+        Thanks to Yonghao Yu for fixing and reporting this.
+        <ref issue="23" /></text>
+      </item>
     </list>
 
 

diff --git a/src/java/net/percederberg/mibble/browser/SnmpManager.java b/src/java/net/percederberg/mibble/browser/SnmpManager.java
@@ -164,7 +164,11 @@ public static SnmpManager createSNMPv3(String host,
             }
             if (auth != null && privacy != null) {
                 type = privacy.getType();
-                if (!type.equals(SnmpPrivacy.CBC_DES_TYPE)) {
+                if (type.equals(SnmpPrivacy.DES_TYPE)) {
+                    pool.setPrivacyProtocol(SnmpContextv3Face.DES_ENCRYPT);
+                } else if (type.equals(SnmpPrivacy.AES_TYPE)) {
+                    pool.setPrivacyProtocol(SnmpContextv3Face.AES_ENCRYPT);
+                } else {
                     throw new SnmpException("Unsupported privacy " +
                                             "protocol: " + type);
                 }

diff --git a/src/java/net/percederberg/mibble/browser/SnmpPanel.java b/src/java/net/percederberg/mibble/browser/SnmpPanel.java
@@ -273,7 +273,8 @@ private void initialize() {
         authTypeCombo.addItem(SnmpAuthentication.MD5_TYPE);
         authTypeCombo.addItem(SnmpAuthentication.SHA1_TYPE);
         privacyTypeCombo.addItem("None");
-        privacyTypeCombo.addItem(SnmpPrivacy.CBC_DES_TYPE);
+        privacyTypeCombo.addItem(SnmpPrivacy.DES_TYPE);
+        privacyTypeCombo.addItem(SnmpPrivacy.AES_TYPE);
 
         // Associate labels
         hostLabel.setLabelFor(hostField);

diff --git a/src/java/net/percederberg/mibble/browser/SnmpPrivacy.java b/src/java/net/percederberg/mibble/browser/SnmpPrivacy.java
@@ -18,9 +18,14 @@
 public class SnmpPrivacy {
 
     /**
-     * The CBC-DES privacy type.
+     * The DES privacy type.
      */
-    public static final String CBC_DES_TYPE = "CBC-DES";
+    public static final String DES_TYPE = "3-DES (CBC-DES)";
+
+    /**
+     * The AES privacy type.
+     */
+    public static final String AES_TYPE = "AES (CFB128-AES-128)";
 
     /**
      * The privacy type.