nufnuf/PBinCLI
1
0
Fork 0
forked from r4sas/PBinCLI
Code Issues Pull Requests Projects Releases Wiki Activity

get encryption options from paste (closes #22)

Browse Source 
Signed-off-by: r4sas <r4sas@i2pmail.org>
This commit is contained in:
R4SAS 2020-06-04 15:29:04 +00:00
parent 70328903fa
commit 49362c70a6
Signed by untrusted user: r4sas
GPG Key ID: 66F6C87B98EBCFE2
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pbincli/format.py
View File

@ -26,9 +26,7 @@ except ImportError:
CIPHER_ITERATION_COUNT = 100000 CIPHER_ITERATION_COUNT = 100000
CIPHER_SALT_BYTES = 8 CIPHER_SALT_BYTES = 8
CIPHER_BLOCK_BITS = 256 CIPHER_BLOCK_BITS = 256
CIPHER_BLOCK_BYTES = int(CIPHER_BLOCK_BITS/8) CIPHER_TAG_BITS = 128
CIPHER_TAG_BITS = int(CIPHER_BLOCK_BITS/2)
CIPHER_TAG_BYTES = int(CIPHER_TAG_BITS/8)
class Paste: class Paste:
@ -39,9 +37,13 @@ class Paste:
self._text = '' self._text = ''
self._attachment = '' self._attachment = ''
self._attachment_name = '' self._attachment_name = ''
self._key = get_random_bytes(CIPHER_BLOCK_BYTES)
self._password = '' self._password = ''
self._debug = debug self._debug = debug
self._iteration_count = CIPHER_ITERATION_COUNT
self._salt_bytes = CIPHER_SALT_BYTES
self._block_bits = CIPHER_BLOCK_BITS
self._tag_bits = CIPHER_TAG_BITS
self._key = get_random_bytes(int(self._block_bits / 8))
def setVersion(self, version): def setVersion(self, version):
@ -125,8 +127,8 @@ class Paste:
return PBKDF2( return PBKDF2(
self._key + self._password.encode(), self._key + self._password.encode(),
salt, salt,
dkLen = CIPHER_BLOCK_BYTES, dkLen = int(self._block_bits / 8),
count = CIPHER_ITERATION_COUNT, count = self._iteration_count,
prf = lambda password, salt: HMAC.new( prf = lambda password, salt: HMAC.new(
password, password,
salt, salt,
@ -135,10 +137,10 @@ class Paste:
@classmethod @classmethod
def __initializeCipher(self, key, iv, adata): def __initializeCipher(self, key, iv, adata, tagsize):
from pbincli.utils import json_encode from pbincli.utils import json_encode
cipher = AES.new(key, AES.MODE_GCM, nonce=iv, mac_len=CIPHER_TAG_BYTES) cipher = AES.new(key, AES.MODE_GCM, nonce=iv, mac_len=tagsize)
cipher.update(json_encode(adata)) cipher.update(json_encode(adata))
return cipher return cipher
@ -193,16 +195,22 @@ class Paste:
from json import loads as json_decode from json import loads as json_decode
iv = b64decode(self._data['adata'][0][0]) iv = b64decode(self._data['adata'][0][0])
salt = b64decode(self._data['adata'][0][1]) salt = b64decode(self._data['adata'][0][1])
self._iteration_count = self._data['adata'][0][2]
self._block_bits = self._data['adata'][0][3]
self._tag_bits = self._data['adata'][0][4]
cipher_tag_bytes = int(self._tag_bits / 8)
key = self.__deriveKey(salt) key = self.__deriveKey(salt)
# Get compression type from received paste # Get compression type from received paste
self._compression = self._data['adata'][0][7] self._compression = self._data['adata'][0][7]
cipher = self.__initializeCipher(key, iv, self._data['adata']) cipher = self.__initializeCipher(key, iv, self._data['adata'], int(self._tag_bits /8 ))
# Cut the cipher text into message and tag # Cut the cipher text into message and tag
cipher_text_tag = b64decode(self._data['ct']) cipher_text_tag = b64decode(self._data['ct'])
cipher_text = cipher_text_tag[:-CIPHER_TAG_BYTES] cipher_text = cipher_text_tag[:-cipher_tag_bytes]
cipher_tag = cipher_text_tag[-CIPHER_TAG_BYTES:] cipher_tag = cipher_text_tag[-cipher_tag_bytes:]
cipher_message = json_decode(self.__decompress(cipher.decrypt_and_verify(cipher_text, cipher_tag)).decode()) cipher_message = json_decode(self.__decompress(cipher.decrypt_and_verify(cipher_text, cipher_tag)).decode())
self._text = cipher_message['paste'].encode() self._text = cipher_message['paste'].encode()
@ -253,8 +261,8 @@ class Paste:
def _encryptV2(self): def _encryptV2(self):
from pbincli.utils import json_encode from pbincli.utils import json_encode
iv = get_random_bytes(CIPHER_TAG_BYTES) # 16 bytes iv = get_random_bytes(int(self._tag_bits / 8))
salt = get_random_bytes(CIPHER_SALT_BYTES) # 8 bytes salt = get_random_bytes(self._salt_bytes)
key = self.__deriveKey(salt) key = self.__deriveKey(salt)
# prepare encryption authenticated data and message # prepare encryption authenticated data and message
@ -262,9 +270,9 @@ class Paste:
[ [
b64encode(iv).decode(), b64encode(iv).decode(),
b64encode(salt).decode(), b64encode(salt).decode(),
CIPHER_ITERATION_COUNT, self._iteration_count,
CIPHER_BLOCK_BITS, self._block_bits,
CIPHER_TAG_BITS, self._tag_bits,
'aes', 'aes',
'gcm', 'gcm',
self._compression self._compression
@ -278,7 +286,7 @@ class Paste:
cipher_message['attachment'] = self._attachment cipher_message['attachment'] = self._attachment
cipher_message['attachment_name'] = self._attachment_name cipher_message['attachment_name'] = self._attachment_name
cipher = self.__initializeCipher(key, iv, adata) cipher = self.__initializeCipher(key, iv, adata, int(self._tag_bits /8 ))
ciphertext, tag = cipher.encrypt_and_digest(self.__compress(json_encode(cipher_message))) ciphertext, tag = cipher.encrypt_and_digest(self.__compress(json_encode(cipher_message)))
if self._debug: print("PBKDF2 Key:\t{}\nCipherText:\t{}\nCipherTag:\t{}" if self._debug: print("PBKDF2 Key:\t{}\nCipherText:\t{}\nCipherTag:\t{}"