adding docstrings, cleaning up generic_*crypt missing backend handling, and fixing copy-pasted parameter names on decyrpt methods

3 files changed, 9 insertions, 9 deletions

diff --git a/pysnmp/proto/secmod/eso/priv/des3.py b/pysnmp/proto/secmod/eso/priv/des3.py
index 2edfa7a7..bf39a8ff 100644
--- a/pysnmp/proto/secmod/eso/priv/des3.py
+++ b/pysnmp/proto/secmod/eso/priv/des3.py
@@ -5,7 +5,7 @@
 # License: http://snmplabs.com/pysnmp/license.html
 #
 import random
-from pysnmp.crypto.des3 import decrypt, encrypt
+from pysnmp.crypto import des3
 from pysnmp.proto.secmod.rfc3414.priv import base
 from pysnmp.proto.secmod.rfc3414.auth import hmacmd5, hmacsha
 from pysnmp.proto.secmod.rfc3414 import localkey
@@ -117,7 +117,7 @@ class Des3(base.AbstractEncryptionService):
         privParameters = univ.OctetString(salt)
 
         plaintext = dataToEncrypt + univ.OctetString((0,) * (8 - len(dataToEncrypt) % 8)).asOctets()
-        ciphertext = encrypt(plaintext, des3Key, iv)
+        ciphertext = des3.encrypt(plaintext, des3Key, iv)
 
         return univ.OctetString(ciphertext), privParameters
 
@@ -138,6 +138,6 @@ class Des3(base.AbstractEncryptionService):
             )
 
         ciphertext = encryptedData.asOctets()
-        plaintext = decrypt(ciphertext, des3Key, iv)
+        plaintext = des3.decrypt(ciphertext, des3Key, iv)
 
         return plaintext
diff --git a/pysnmp/proto/secmod/rfc3414/priv/des.py b/pysnmp/proto/secmod/rfc3414/priv/des.py
index 7a46e2af..b874162a 100644
--- a/pysnmp/proto/secmod/rfc3414/priv/des.py
+++ b/pysnmp/proto/secmod/rfc3414/priv/des.py
@@ -5,7 +5,7 @@
 # License: http://snmplabs.com/pysnmp/license.html
 #
 import random
-from pysnmp.crypto.des import decrypt, encrypt
+from pysnmp.crypto import des
 from pysnmp.proto.secmod.rfc3414.priv import base
 from pysnmp.proto.secmod.rfc3414.auth import hmacmd5, hmacsha
 from pysnmp.proto.secmod.rfc3414 import localkey
@@ -107,7 +107,7 @@ class Des(base.AbstractEncryptionService):
 
         # 8.1.1.2
         plaintext = dataToEncrypt + univ.OctetString((0,) * (8 - len(dataToEncrypt) % 8)).asOctets()
-        ciphertext = encrypt(plaintext, desKey, iv)
+        ciphertext = des.encrypt(plaintext, desKey, iv)
 
         # 8.3.1.3 & 4
         return univ.OctetString(ciphertext), privParameters
@@ -134,4 +134,4 @@ class Des(base.AbstractEncryptionService):
             )
 
         # 8.3.2.6
-        return decrypt(encryptedData.asOctets(), desKey, iv)
+        return des.decrypt(encryptedData.asOctets(), desKey, iv)
diff --git a/pysnmp/proto/secmod/rfc3826/priv/aes.py b/pysnmp/proto/secmod/rfc3826/priv/aes.py
index 6ee351ce..82fa0da5 100644
--- a/pysnmp/proto/secmod/rfc3826/priv/aes.py
+++ b/pysnmp/proto/secmod/rfc3826/priv/aes.py
@@ -6,7 +6,7 @@
 #
 import random
 from pyasn1.type import univ
-from pysnmp.crypto.aes import decrypt, encrypt
+from pysnmp.crypto import aes
 from pysnmp.proto.secmod.rfc3414.priv import base
 from pysnmp.proto.secmod.rfc3414.auth import hmacmd5, hmacsha
 from pysnmp.proto.secmod.rfc7860.auth import hmacsha2
@@ -110,7 +110,7 @@ class Aes(base.AbstractEncryptionService):
         # PyCrypto seems to require padding
         dataToEncrypt = dataToEncrypt + univ.OctetString((0,) * (16 - len(dataToEncrypt) % 16)).asOctets()
 
-        ciphertext = encrypt(dataToEncrypt, aesKey, iv)
+        ciphertext = aes.encrypt(dataToEncrypt, aesKey, iv)
 
         # 3.3.1.4
         return univ.OctetString(ciphertext), univ.OctetString(salt)
@@ -134,4 +134,4 @@ class Aes(base.AbstractEncryptionService):
         encryptedData = encryptedData + univ.OctetString((0,) * (16 - len(encryptedData) % 16)).asOctets()
 
         # 3.3.2.4-6
-        return decrypt(encryptedData.asOctets(), aesKey, iv)
+        return aes.decrypt(encryptedData.asOctets(), aesKey, iv)