[tor-commits] [stem/master] Move hsv3_crypto helpers into test
atagar at torproject.org
atagar at torproject.org
Sun Nov 17 23:40:39 UTC 2019
commit 0a98adb448bda6815523d870209259510b933170
Author: Damian Johnson <atagar at torproject.org>
Date: Fri Oct 18 14:23:29 2019 -0700
Move hsv3_crypto helpers into test
Couple helpers are only used in a test. Colocating the helpers there.
---
stem/descriptor/hsv3_crypto.py | 48 ----------------
test/unit/descriptor/hidden_service_v3.py | 94 +++++++++++++++++++++----------
2 files changed, 63 insertions(+), 79 deletions(-)
diff --git a/stem/descriptor/hsv3_crypto.py b/stem/descriptor/hsv3_crypto.py
index 8dd769c9..69c8c185 100644
--- a/stem/descriptor/hsv3_crypto.py
+++ b/stem/descriptor/hsv3_crypto.py
@@ -1,4 +1,3 @@
-import base64
import hashlib
import struct
import os
@@ -10,19 +9,6 @@ from stem.descriptor import ed25519_exts_ref
from stem.descriptor import slow_ed25519
-def pubkeys_are_equal(pubkey1, pubkey2):
- """
- Compare the raw bytes of the two pubkeys and return True if they are the same
- """
-
- from cryptography.hazmat.primitives import serialization
-
- pubkey1_bytes = pubkey1.public_bytes(encoding = serialization.Encoding.Raw, format = serialization.PublicFormat.Raw)
- pubkey2_bytes = pubkey2.public_bytes(encoding = serialization.Encoding.Raw, format = serialization.PublicFormat.Raw)
-
- return pubkey1_bytes == pubkey2_bytes
-
-
"""
HSv3 Key blinding
@@ -75,40 +61,6 @@ class HSv3PublicBlindedKey(object):
"""
-Onion address
-
- onion_address = base32(PUBKEY | CHECKSUM | VERSION) + ".onion"
- CHECKSUM = H(".onion checksum" | PUBKEY | VERSION)[:2]
-
- - PUBKEY is the 32 bytes ed25519 master pubkey of the hidden service.
- - VERSION is an one byte version field (default value '\x03')
- - ".onion checksum" is a constant string
- - CHECKSUM is truncated to two bytes before inserting it in onion_address
-"""
-
-CHECKSUM_CONSTANT = b'.onion checksum'
-
-
-def encode_onion_address(ed25519_pub_key_bytes):
- """
- Given the public key, return the onion address
- """
-
- if not stem.prereq._is_sha3_available():
- raise ImportError('Encoding onion addresses requires python 3.6+ or the pysha3 module (https://pypi.org/project/pysha3/)')
-
- version = 3
- checksum_body = b'%s%s%d' % (CHECKSUM_CONSTANT, ed25519_pub_key_bytes, version)
- checksum = hashlib.sha3_256(checksum_body).digest()[:2]
-
- onion_address_bytes = b'%s%s%d' % (ed25519_pub_key_bytes, checksum, version)
- onion_address = base64.b32encode(onion_address_bytes) + b'.onion'
- assert(len(onion_address) == 56 + len('.onion'))
-
- return onion_address.lower()
-
-
-"""
Basic descriptor logic:
SALT = 16 bytes from H(random), changes each time we rebuld the
diff --git a/test/unit/descriptor/hidden_service_v3.py b/test/unit/descriptor/hidden_service_v3.py
index 1f61b23b..f49e2fb2 100644
--- a/test/unit/descriptor/hidden_service_v3.py
+++ b/test/unit/descriptor/hidden_service_v3.py
@@ -2,16 +2,17 @@
Unit tests for stem.descriptor.hidden_service for version 3.
"""
+import base64
import functools
+import hashlib
import unittest
import stem.client.datatype
import stem.descriptor
import stem.prereq
-import stem.descriptor.hsv3_crypto as hsv3_crypto
-
from stem.descriptor.hidden_service import (
+ CHECKSUM_CONSTANT,
REQUIRED_V3_FIELDS,
IntroductionPointV3,
HiddenServiceDescriptorV3,
@@ -48,6 +49,59 @@ with open(get_resource('hidden_service_v3_inner_layer')) as inner_layer_file:
INNER_LAYER_STR = inner_layer_file.read()
+def _pubkeys_are_equal(pubkey1, pubkey2):
+ """
+ Compare the raw bytes of the two pubkeys and return True if they are the same
+ """
+
+ from cryptography.hazmat.primitives import serialization
+
+ pubkey1_bytes = pubkey1.public_bytes(encoding = serialization.Encoding.Raw, format = serialization.PublicFormat.Raw)
+ pubkey2_bytes = pubkey2.public_bytes(encoding = serialization.Encoding.Raw, format = serialization.PublicFormat.Raw)
+
+ return pubkey1_bytes == pubkey2_bytes
+
+
+def _encode_onion_address(ed25519_pub_key_bytes):
+ """
+ Given the public key, return the onion address
+ """
+
+ if not stem.prereq._is_sha3_available():
+ raise ImportError('Encoding onion addresses requires python 3.6+ or the pysha3 module (https://pypi.org/project/pysha3/)')
+
+ version = 3
+ checksum_body = b'%s%s%d' % (CHECKSUM_CONSTANT, ed25519_pub_key_bytes, version)
+ checksum = hashlib.sha3_256(checksum_body).digest()[:2]
+
+ onion_address_bytes = b'%s%s%d' % (ed25519_pub_key_bytes, checksum, version)
+ onion_address = base64.b32encode(onion_address_bytes) + b'.onion'
+ assert(len(onion_address) == 56 + len('.onion'))
+
+ return onion_address.lower()
+
+
+def _helper_get_intro():
+ from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey
+ from cryptography.hazmat.primitives.asymmetric.x25519 import X25519PrivateKey
+
+ link_specifiers = []
+
+ link1, _ = stem.client.datatype.LinkSpecifier.pop(b'\x03\x20CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC')
+ link_specifiers.append(link1)
+
+ onion_privkey = X25519PrivateKey.generate()
+ onion_pubkey = onion_privkey.public_key()
+
+ auth_privkey = Ed25519PrivateKey.generate()
+ auth_pubkey = auth_privkey.public_key()
+
+ enc_privkey = X25519PrivateKey.generate()
+ enc_pubkey = enc_privkey.public_key()
+
+ return IntroductionPointV3(link_specifiers, onion_key=onion_pubkey, enc_key=enc_pubkey, auth_key=auth_pubkey)
+
+
class TestHiddenServiceDescriptorV3(unittest.TestCase):
def test_real_descriptor(self):
"""
@@ -218,28 +272,6 @@ class TestHiddenServiceDescriptorV3(unittest.TestCase):
self.assertRaisesWith(ValueError, "'boom.onion' isn't a valid hidden service v3 address", HiddenServiceDescriptorV3._public_key_from_address, 'boom')
self.assertRaisesWith(ValueError, 'Bad checksum (expected def7 but was 842e)', HiddenServiceDescriptorV3._public_key_from_address, '5' * 56)
- def _helper_get_intro(self):
- from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey
- from cryptography.hazmat.primitives.asymmetric.x25519 import X25519PrivateKey
-
- link_specifiers = []
-
- link1, _ = stem.client.datatype.LinkSpecifier.pop(b'\x03\x20CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC')
- link_specifiers.append(link1)
-
- onion_privkey = X25519PrivateKey.generate()
- onion_pubkey = onion_privkey.public_key()
-
- auth_privkey = Ed25519PrivateKey.generate()
- auth_pubkey = auth_privkey.public_key()
-
- enc_privkey = X25519PrivateKey.generate()
- enc_pubkey = enc_privkey.public_key()
-
- intro = IntroductionPointV3(link_specifiers, onion_key=onion_pubkey, enc_key=enc_pubkey, auth_key=auth_pubkey)
-
- return intro
-
def test_encode_decode_descriptor(self):
"""
Encode an HSv3 descriptor and then decode it and make sure you get the intended results.
@@ -261,12 +293,12 @@ class TestHiddenServiceDescriptorV3(unittest.TestCase):
public_identity_key = private_identity_key.public_key()
pubkey_bytes = public_identity_key.public_bytes(encoding = serialization.Encoding.Raw, format = serialization.PublicFormat.Raw)
- onion_address = hsv3_crypto.encode_onion_address(pubkey_bytes).decode()
+ onion_address = _encode_onion_address(pubkey_bytes).decode()
# Build the introduction points
- intro1 = self._helper_get_intro()
- intro2 = self._helper_get_intro()
- intro3 = self._helper_get_intro()
+ intro1 = _helper_get_intro()
+ intro2 = _helper_get_intro()
+ intro3 = _helper_get_intro()
intro_points = [intro1, intro2, intro3]
# TODO: replace with bytes.fromhex() when we drop python 2.x support
@@ -293,9 +325,9 @@ class TestHiddenServiceDescriptorV3(unittest.TestCase):
for original_intro in intro_points:
# Match intro points
- if hsv3_crypto.pubkeys_are_equal(desc_intro.auth_key, original_intro.auth_key):
+ if _pubkeys_are_equal(desc_intro.auth_key, original_intro.auth_key):
original_found = True
- self.assertTrue(hsv3_crypto.pubkeys_are_equal(desc_intro.enc_key, original_intro.enc_key))
- self.assertTrue(hsv3_crypto.pubkeys_are_equal(desc_intro.onion_key, original_intro.onion_key))
+ self.assertTrue(_pubkeys_are_equal(desc_intro.enc_key, original_intro.enc_key))
+ self.assertTrue(_pubkeys_are_equal(desc_intro.onion_key, original_intro.onion_key))
self.assertTrue(original_found)
More information about the tor-commits
mailing list