Skip to content

Python 3 compatibility: fix byte index access #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Python 3 compatibility: fix byte index access #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77e2a90
fix: byte check on python3
alinradut Dec 2, 2024
9b0427d
chore: add hmac_salt line to readme
alinradut Dec 2, 2024
d3da583
Merge branch 'RNCryptor:master' into master
alinradut Feb 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ Usage

# encrypt_with_keys and decrypt_with keys functions
encryption_salt = '...' # 8 random bytes
hmac_salt = '...' # 8 random bytes
encryption_key = rncryptor.make_key(password, encryption_salt)
hmac_key = rncryptor.make_key(password, hmac_salt)
encrypted_data = rncryptor.encrypt_with_keys(data, hmac_key, encryption_key)
Expand Down
8 changes: 4 additions & 4 deletions rncryptor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,12 @@ def decrypt(self, data, password):
# data doesn't even match the required header + hmac length
raise DecryptionError("Invalid length")

version = data[0]
version = data[:1]
if not version == b'\x03':
# required version is version 3
raise DecryptionError("Unsupported version")

options = data[1]
options = data[1:2]

if not options == b'\x01':
# when using keys options should be `0`
Expand Down Expand Up @@ -153,13 +153,13 @@ def decrypt_with_keys(self, data, hmac_key, encryption_key):
# data doesn't even match the required header + hmac length
raise DecryptionError("Invalid length")

version = data[0]
version = data[:1]

if not version == b'\x03':
# required version is version 3
raise DecryptionError("Unsupported version")

options = data[1]
options = data[1:2]

if not options == b'\x00':
# when using keys options should be `0`
Expand Down