drop conditional auth protocols use

etingof · Dec 22, 2017 · 0ac99df · 0ac99df
1 parent 4674238
commit 0ac99df
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 27 deletions.
diff --git a/scripts/snmprec.py b/scripts/snmprec.py
@@ -65,22 +65,13 @@
 authProtocols = {
     'MD5': config.usmHMACMD5AuthProtocol,
     'SHA': config.usmHMACSHAAuthProtocol,
+    'SHA224': config.usmHMAC128SHA224AuthProtocol,
+    'SHA256': config.usmHMAC192SHA256AuthProtocol,
+    'SHA384': config.usmHMAC256SHA384AuthProtocol,
+    'SHA512': config.usmHMAC384SHA512AuthProtocol,
     'NONE': config.usmNoAuthProtocol
 }
 
-try:
-    authProtocols.update(
-        {
-            'SHA224': config.usmHMAC128SHA224AuthProtocol,
-            'SHA256': config.usmHMAC192SHA256AuthProtocol,
-            'SHA384': config.usmHMAC256SHA384AuthProtocol,
-            'SHA512': config.usmHMAC384SHA512AuthProtocol,
-        }
-    )
-
-except AttributeError:
-    pass
-
 privProtocols = {
     'DES': config.usmDESPrivProtocol,
     '3DES': config.usm3DESEDEPrivProtocol,

diff --git a/scripts/snmpsimd.py b/scripts/snmpsimd.py
@@ -60,22 +60,13 @@
 authProtocols = {
     'MD5': config.usmHMACMD5AuthProtocol,
     'SHA': config.usmHMACSHAAuthProtocol,
+    'SHA224': config.usmHMAC128SHA224AuthProtocol,
+    'SHA256': config.usmHMAC192SHA256AuthProtocol,
+    'SHA384': config.usmHMAC256SHA384AuthProtocol,
+    'SHA512': config.usmHMAC384SHA512AuthProtocol,
     'NONE': config.usmNoAuthProtocol
 }
 
-try:
-    authProtocols.update(
-        {
-            'SHA224': config.usmHMAC128SHA224AuthProtocol,
-            'SHA256': config.usmHMAC192SHA256AuthProtocol,
-            'SHA384': config.usmHMAC256SHA384AuthProtocol,
-            'SHA512': config.usmHMAC384SHA512AuthProtocol,
-        }
-    )
-
-except AttributeError:
-    pass
-
 privProtocols = {
   'DES': config.usmDESPrivProtocol,
   '3DES': config.usm3DESEDEPrivProtocol,
@@ -88,7 +79,6 @@
   'NONE': config.usmNoPrivProtocol
 }
 
-
 # Transport endpoints collection
 
 class TransportEndpointsBase: