NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-20 19:19:22 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Python3 fixes

Browse Source
This commit is contained in:
Jeremy Stretch 2017-03-17 21:39:29 -04:00
parent 97710a4576
commit 671d53877a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
netbox/secrets/models.py
View File

@ -23,7 +23,7 @@ def generate_random_key(bits=256):
""" """
if bits % 32: if bits % 32:
raise Exception("Invalid key size ({}). Key sizes must be in increments of 32 bits.".format(bits)) raise Exception("Invalid key size ({}). Key sizes must be in increments of 32 bits.".format(bits))
return os.urandom(bits / 8) return os.urandom(int(bits / 8))
def encrypt_master_key(master_key, public_key): def encrypt_master_key(master_key, public_key):
@ -224,7 +224,7 @@ class SessionKey(models.Model):
raise InvalidSessionKey() raise InvalidSessionKey()
# Decrypt master key using provided session key # Decrypt master key using provided session key
master_key = xor_keys(session_key, self.cipher) master_key = xor_keys(session_key, bytes(self.cipher))
return master_key return master_key
@ -361,9 +361,10 @@ class Secret(CreatedUpdatedModel):
raise Exception("Must define ciphertext before unlocking.") raise Exception("Must define ciphertext before unlocking.")
# Decrypt ciphertext and remove padding # Decrypt ciphertext and remove padding
iv = self.ciphertext[0:16] iv = bytes(self.ciphertext[0:16])
ciphertext = bytes(self.ciphertext[16:])
aes = AES.new(secret_key, AES.MODE_CFB, iv) aes = AES.new(secret_key, AES.MODE_CFB, iv)
plaintext = self._unpad(aes.decrypt(self.ciphertext[16:])) plaintext = self._unpad(aes.decrypt(ciphertext))
# Verify decrypted plaintext against hash # Verify decrypted plaintext against hash
if not self.validate(plaintext): if not self.validate(plaintext):