diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-05-20 11:54:55 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-05-20 11:54:55 -0400 |
| commit | 29f98cdba4d7babc9fa8c0d479059060edc9aa2b (patch) | |
| tree | 8a893de7b3613100775a2c6af1a06733365ec2ce /src/lib/Bcfg2/Server/Encryption.py | |
| parent | 152aab6994694419aabf4817737bc130257205eb (diff) | |
| download | bcfg2-29f98cdba4d7babc9fa8c0d479059060edc9aa2b.tar.gz bcfg2-29f98cdba4d7babc9fa8c0d479059060edc9aa2b.tar.bz2 bcfg2-29f98cdba4d7babc9fa8c0d479059060edc9aa2b.zip | |
Encryption: disable more bogus pylint messages
Diffstat (limited to 'src/lib/Bcfg2/Server/Encryption.py')
| -rwxr-xr-x | src/lib/Bcfg2/Server/Encryption.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/Server/Encryption.py b/src/lib/Bcfg2/Server/Encryption.py index ee1c1cab9..797b44ab9 100755 --- a/src/lib/Bcfg2/Server/Encryption.py +++ b/src/lib/Bcfg2/Server/Encryption.py @@ -121,11 +121,11 @@ def ssl_decrypt(data, passwd, algorithm=ALGORITHM): # base64-decode the data data = b64decode(data) salt = data[8:16] - # pylint: disable=E1101 + # pylint: disable=E1101,E1121 hashes = [md5(passwd + salt).digest()] for i in range(1, 3): hashes.append(md5(hashes[i - 1] + passwd + salt).digest()) - # pylint: enable=E1101 + # pylint: enable=E1101,E1121 key = hashes[0] + hashes[1] iv = hashes[2] @@ -151,11 +151,11 @@ def ssl_encrypt(plaintext, passwd, algorithm=ALGORITHM, salt=None): if salt is None: salt = Rand.rand_bytes(8) - # pylint: disable=E1101 + # pylint: disable=E1101,E1121 hashes = [md5(passwd + salt).digest()] for i in range(1, 3): hashes.append(md5(hashes[i - 1] + passwd + salt).digest()) - # pylint: enable=E1101 + # pylint: enable=E1101,E1121 key = hashes[0] + hashes[1] iv = hashes[2] |