summaryrefslogtreecommitdiff
path: root/pysnmp/proto
diff options
context:
space:
mode:
authorelie <elie>2013-06-26 15:50:51 +0000
committerelie <elie>2013-06-26 15:50:51 +0000
commit03008c981c87ce56dced6702fc3cd78db346f80e (patch)
tree319ca20f0c1ec0a3a02812343bb10f455d21aab2 /pysnmp/proto
parent42b77241693f023243c500f3f546118ddf4b1256 (diff)
downloadpysnmp-03008c981c87ce56dced6702fc3cd78db346f80e.tar.gz
fix to octet string typing (used to throw an exception)
Diffstat (limited to 'pysnmp/proto')
-rw-r--r--pysnmp/proto/secmod/eso/priv/des3.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pysnmp/proto/secmod/eso/priv/des3.py b/pysnmp/proto/secmod/eso/priv/des3.py
index f5a4d88..9926111 100644
--- a/pysnmp/proto/secmod/eso/priv/des3.py
+++ b/pysnmp/proto/secmod/eso/priv/des3.py
@@ -79,7 +79,7 @@ class Des3(base.AbstractEncryptionService):
def __getDecryptionKey(self, privKey, salt):
return privKey[:24].asOctets(), \
- univ.OctetString(map(lambda x,y:x^y, salt, privKey[24:32].asNumbers())).asOctets()
+ univ.OctetString(map(lambda x,y:x^y, salt.asNumbers(), privKey[24:32].asNumbers())).asOctets()
# 5.1.1.2
def encryptData(self, encryptKey, privParameters, dataToEncrypt):
@@ -103,7 +103,7 @@ class Des3(base.AbstractEncryptionService):
ciphertext = null
while plaintext:
cipherblock = des3Obj.encrypt(
- univ.OctetString(map(lambda x,y:x^y, univ.OctetString(cipherblock).asNumbers(), univ.OctetString(plaintext[:8]).asNumbers()))
+ univ.OctetString(map(lambda x,y:x^y, univ.OctetString(cipherblock).asNumbers(), univ.OctetString(plaintext[:8]).asNumbers())).asOctets()
)
ciphertext = ciphertext + cipherblock
plaintext = plaintext[8:]