diff options
| author | Bob Reese <reese@ece.msstate.edu> | 2016-08-15 10:13:08 -0500 |
|---|---|---|
| committer | Bob Reese <reese@ece.msstate.edu> | 2016-08-15 10:13:08 -0500 |
| commit | be1fc26cdc2dcde8c5e6ff2f99e21e6c77193b56 (patch) | |
| tree | 0b795dbdff96ca8d346f35a2f93605f6e36eb490 | |
| parent | 7367571a5a04263c28e7e75a248ad0f6a39d5ecd (diff) | |
| download | pysnmp-git-be1fc26cdc2dcde8c5e6ff2f99e21e6c77193b56.tar.gz | |
Cleaned up code as per Illya's comments.
| -rw-r--r-- | pysnmp/proto/secmod/eso/priv/des3.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pysnmp/proto/secmod/eso/priv/des3.py b/pysnmp/proto/secmod/eso/priv/des3.py index de25b80d..b4d2af2a 100644 --- a/pysnmp/proto/secmod/eso/priv/des3.py +++ b/pysnmp/proto/secmod/eso/priv/des3.py @@ -8,7 +8,6 @@ import random from pysnmp.proto.secmod.rfc3414.priv import base from pysnmp.proto.secmod.rfc3414.auth import hmacmd5, hmacsha from pysnmp.proto.secmod.rfc3414 import localkey -from pysnmp.proto.secmod.rfc3414.localkey import hashPassphraseMD5,localizeKeyMD5,hashPassphraseSHA,localizeKeySHA from pysnmp.proto import errind, error from pyasn1.type import univ from pyasn1.compat.octets import null @@ -57,14 +56,14 @@ class Des3(base.AbstractEncryptionService): if authProtocol == hmacmd5.HmacMd5.serviceID: localPrivKey = localkey.localizeKeyMD5(privKey, snmpEngineID) #now extend this key if too short by repeating steps that includes the hashPassphrase step - while (len(localPrivKey) < self.keySize): - newKey = hashPassphraseMD5(localPrivKey) - localPrivKey = localPrivKey + localizeKeyMD5(newKey, snmpEngineID) + while len(localPrivKey) < self.keySize: + newKey = localkey.hashPassphraseMD5(localPrivKey) + localPrivKey += localkey.localizeKeyMD5(newKey, snmpEngineID) elif authProtocol == hmacsha.HmacSha.serviceID: localPrivKey = localkey.localizeKeySHA(privKey, snmpEngineID) - while (len(localPrivKey) < self.keySize): - newKey = hashPassphraseSHA(localPrivKey) - localPrivKey = localPrivKey + localizeKeySHA(newKey, snmpEngineID) + while len(localPrivKey) < self.keySize: + newKey = localkey.hashPassphraseSHA(localPrivKey) + localPrivKey += localkey.localizeKeySHA(newKey, snmpEngineID) else: raise error.ProtocolError( 'Unknown auth protocol %s' % (authProtocol,) |