Skip to content

feat(python): use secrets module #98

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
Rotzbua wants to merge 1 commit into
base: main
Choose a base branch
from
+28 −28
Open

feat(python): use secrets module #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions python/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ Use
.. code-block:: python

import http_ece
import os, base64
from secrets import token_bytes

key = os.urandom(16)
salt = os.urandom(16)
data = os.urandom(100)
key = token_bytes(16)
salt = token_bytes(16)
data = token_bytes(100)

encrypted = http_ece.encrypt(data, salt=salt, key=key)
decrypted = http_ece.decrypt(encrypted, salt=salt, key=key)
Expand Down
4 changes: 2 additions & 2 deletions python/http_ece/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import functools
import os
import struct
from secrets import token_bytes

from cryptography.exceptions import InvalidTag
from cryptography.hazmat.backends import default_backend
Expand Down Expand Up @@ -389,7 +389,7 @@ def compose_aes128gcm(salt, content, rs, keyid):
raise ECEException("Invalid version")

if salt is None:
salt = os.urandom(16)
salt = token_bytes(16)

key_, nonce_ = derive_key(
"encrypt",
Expand Down
44 changes: 22 additions & 22 deletions python/http_ece/tests/test_ece.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import base64
import json
import os
import struct
import unittest
from pathlib import Path
from secrets import token_bytes

import pytest
from cryptography.hazmat.backends import default_backend
Expand Down Expand Up @@ -55,8 +55,8 @@ def setUp(self):
self.dh = self.private_key.public_key().public_bytes(
Encoding.X962, PublicFormat.UncompressedPoint
)
self.m_key = os.urandom(16)
self.m_salt = os.urandom(16)
self.m_key = token_bytes(16)
self.m_salt = token_bytes(16)

def test_derive_key_invalid_mode(self):
with pytest.raises(ECEException, match="unknown 'mode' specified: invalid"):
Expand Down Expand Up @@ -125,13 +125,13 @@ def test_derive_key_no_secret(self):

def test_iv_bad_counter(self):
with pytest.raises(ECEException, match="Counter too big"):
ece.iv(os.urandom(8), pow(2, 64) + 1)
ece.iv(token_bytes(8), pow(2, 64) + 1)


class TestEceChecking(unittest.TestCase):
def setUp(self):
self.m_key = os.urandom(16)
self.m_input = os.urandom(5)
self.m_key = token_bytes(16)
self.m_input = token_bytes(5)
# This header is specific to the padding tests, but can be used
# elsewhere
self.m_header = b"\xaa\xd2\x05}3S\xb7\xff7\xbd\xe4*\xe1\xd5\x0f\xda"
Expand All @@ -147,7 +147,7 @@ def test_encrypt_small_rs(self):
)

def test_decrypt_small_rs(self):
header = os.urandom(16) + struct.pack("!L", 2) + b"\0"
header = token_bytes(16) + struct.pack("!L", 2) + b"\0"
with pytest.raises(ECEException, match="Record size too small"):
ece.decrypt(
header + self.m_input,
Expand Down Expand Up @@ -175,7 +175,7 @@ def test_decrypt_bad_version(self):
def test_decrypt_bad_header(self):
with pytest.raises(ECEException, match="Could not parse the content header"):
ece.decrypt(
os.urandom(4),
token_bytes(4),
version="aes128gcm",
key=self.m_key,
)
Expand All @@ -186,7 +186,7 @@ def test_encrypt_long_keyid(self):
self.m_input,
version="aes128gcm",
key=self.m_key,
keyid=b64e(os.urandom(192)), # 256 bytes
keyid=b64e(token_bytes(192)), # 256 bytes
)

def test_overlong_padding(self):
Expand All @@ -196,7 +196,7 @@ def test_overlong_padding(self):
b"\xe5\xd6\x94\xb7e\xf0\xcd\x15\x9b(\x01\xa5",
version="aes128gcm",
key=b"d\xc7\x0ed\xa7%U\x14Q\xf2\x08\xdf\xba\xa0\xb9r",
keyid=b64e(os.urandom(192)), # 256 bytes
keyid=b64e(token_bytes(192)), # 256 bytes
)

def test_bad_early_delimiter(self):
Expand All @@ -209,7 +209,7 @@ def test_bad_early_delimiter(self):
b"\xef\x0cg\x1b\xe0\x14I~\xdc",
version="aes128gcm",
key=b"d\xc7\x0ed\xa7%U\x14Q\xf2\x08\xdf\xba\xa0\xb9r",
keyid=b64e(os.urandom(192)), # 256 bytes
keyid=b64e(token_bytes(192)), # 256 bytes
)

def test_bad_final_delimiter(self):
Expand All @@ -219,7 +219,7 @@ def test_bad_final_delimiter(self):
b"\xe4P\x1b\x8dI\xdb\xc6y#MG\xc2W\x16",
version="aes128gcm",
key=b"d\xc7\x0ed\xa7%U\x14Q\xf2\x08\xdf\xba\xa0\xb9r",
keyid=b64e(os.urandom(192)), # 256 bytes
keyid=b64e(token_bytes(192)), # 256 bytes
)

def test_damage(self):
Expand All @@ -229,7 +229,7 @@ def test_damage(self):
b"\xe0\xd6.K\xe5\xf9]%\xe3\x86q\xe0}",
version="aes128gcm",
key=b"d\xc7\x0ed\xa7%U\x14Q\xf2\x08\xdf\xba\xa0\xb9r",
keyid=b64e(os.urandom(192)), # 256 bytes
keyid=b64e(token_bytes(192)), # 256 bytes
)


Expand All @@ -250,8 +250,8 @@ def _rsoverhead(self, version):
return 18

def _generate_input(self, minLen=0):
length = struct.unpack("!B", os.urandom(1))[0] + minLen
return os.urandom(length)
length = struct.unpack("!B", token_bytes(1))[0] + minLen
return token_bytes(length)

def encrypt_decrypt(self, input, encrypt_params, decrypt_params=None, version=None):
"""Run and encrypt/decrypt cycle on some test data
Expand All @@ -271,7 +271,7 @@ def encrypt_decrypt(self, input, encrypt_params, decrypt_params=None, version=No
if "key" in encrypt_params:
logbuf("Key", encrypt_params["key"])
if version != "aes128gcm":
salt = os.urandom(16)
salt = token_bytes(16)
decrypt_rs_default = 4096
else:
salt = None
Expand Down Expand Up @@ -307,26 +307,26 @@ def encrypt_decrypt(self, input, encrypt_params, decrypt_params=None, version=No

def use_explicit_key(self, version=None):
params = {
"key": os.urandom(16),
"key": token_bytes(16),
}
self.encrypt_decrypt(self._generate_input(), params, version=version)

def auth_secret(self, version):
params = {"key": os.urandom(16), "auth_secret": os.urandom(16)}
params = {"key": token_bytes(16), "auth_secret": token_bytes(16)}
self.encrypt_decrypt(self._generate_input(), params, version=version)

def exactly_one_record(self, version=None):
input = self._generate_input(1)
params = {"key": os.urandom(16), "rs": len(input) + self._rsoverhead(version)}
params = {"key": token_bytes(16), "rs": len(input) + self._rsoverhead(version)}
self.encrypt_decrypt(input, params, version=version)

def detect_truncation(self, version):
if version == "aes128gcm":
return

input = self._generate_input(2)
key = os.urandom(16)
salt = os.urandom(16)
key = token_bytes(16)
salt = token_bytes(16)

rs = len(input) + self._rsoverhead(version) - 1
encrypted = ece.encrypt(input, salt=salt, key=key, rs=rs, version=version)
Expand Down Expand Up @@ -370,7 +370,7 @@ def is_uncompressed(k):

logec("sender", ephemeral_key)

auth_secret = os.urandom(16)
auth_secret = token_bytes(16)

if version != "aes128gcm":
decrypt_dh = pubbytes(ephemeral_key)
Expand Down
Loading