Use local references

Author: jedisct1

reference-implementation/certificates.py

@@ -6,7 +6,7 @@
 from dataclasses import dataclass, replace
 from typing import Iterable, Sequence
 
-from .constants import (
+from constants import (
     AEAD_ID_XCHACHA20_DJB_POLY1305,
     CERT_MAGIC,
     CLIENT_MAGIC_SIZE,
@@ -22,8 +22,8 @@
     XWING_CIPHERTEXT_SIZE,
     XWING_PUBLIC_KEY_SIZE,
 )
-from .crypto import _require_size, ed25519_sign, ed25519_verify
-from .errors import CertificateError
+from crypto import _require_size, ed25519_sign, ed25519_verify
+from errors import CertificateError
 
 
 def resolver_pk_len_for_es_version(es_version: bytes) -> int:

reference-implementation/crypto.py

@@ -12,8 +12,8 @@
 from cryptography.hazmat.primitives.poly1305 import Poly1305
 from cryptography.hazmat.primitives.serialization import Encoding, PublicFormat
 
-from .constants import NONCE_SIZE, PADDING_BLOCK_SIZE, RESOLVER_NONCE_SIZE, TAG_SIZE
-from .errors import CertificateError, DecryptionError, PaddingError
+from constants import NONCE_SIZE, PADDING_BLOCK_SIZE, RESOLVER_NONCE_SIZE, TAG_SIZE
+from errors import CertificateError, DecryptionError, PaddingError
 
 
 def _require_size(name: str, value: bytes, size: int) -> None:

reference-implementation/dnscrypt.py

@@ -1,16 +1,16 @@
 """Readable reference implementation for DNSCrypt v2 and PQDNSCrypt.
 
 This module is a compatibility facade. The implementation is split by topic in
-the neighboring modules, but importing `reference.dnscrypt` exposes the same
-simple API used by the tests and examples.
+the neighboring modules, but importing `dnscrypt` exposes the same simple API
+used by the tests and examples.
 """
 
-from .certificates import *
-from .constants import *
-from .crypto import *
-from .errors import *
-from .packets import *
-from .pq import *
-from .transport import *
-from .types import *
+from certificates import *
+from constants import *
+from crypto import *
+from errors import *
+from packets import *
+from pq import *
+from transport import *
+from protocol_types import *
 

reference-implementation/packets.py

@@ -5,8 +5,8 @@
 import os
 from typing import Sequence
 
-from .certificates import client_pk_len_for_es_version
-from .constants import (
+from certificates import client_pk_len_for_es_version
+from constants import (
     CLIENT_MAGIC_SIZE,
     CLIENT_NONCE_SIZE,
     ES_VERSION_XCHACHA20POLY1305,
@@ -18,7 +18,7 @@
     RESOLVER_NONCE_SIZE,
     TAG_SIZE,
 )
-from .crypto import (
+from crypto import (
     _require_size,
     box_xchacha20_shared_key,
     pad_7816_4,
@@ -28,8 +28,8 @@
     xchacha20_djb_poly1305_open,
     xchacha20_djb_poly1305_seal,
 )
-from .errors import CertificateError, DecryptionError
-from .types import DecryptedQuery, PreparedQuery, ResolverCertificate
+from errors import CertificateError, DecryptionError
+from protocol_types import DecryptedQuery, PreparedQuery, ResolverCertificate
 
 
 def encrypt_dnscrypt_query(
@@ -92,7 +92,7 @@ def decrypt_dnscrypt_query(
     if certificate.es_version == ES_VERSION_XCHACHA20POLY1305:
         shared_key = box_xchacha20_shared_key(match.resolver_sk, client_pk)
     elif certificate.es_version == ES_VERSION_XWING:
-        from .pq import pq_shared_key, xwing_decapsulate
+        from pq import pq_shared_key, xwing_decapsulate
 
         kem_ss = xwing_decapsulate(encrypted_kem=client_pk, secret_seed=match.resolver_sk)
         shared_key = pq_shared_key(certificate, kem_ss, client_pk)

reference-implementation/pq.py

@@ -9,8 +9,8 @@
 from cryptography.hazmat.primitives.asymmetric import mlkem, x25519
 from cryptography.hazmat.primitives.serialization import Encoding, PublicFormat
 
-from .certificates import DNSCryptCertificate, parse_pq_profile_extension
-from .constants import (
+from certificates import DNSCryptCertificate, parse_pq_profile_extension
+from constants import (
     CLIENT_NONCE_SIZE,
     ES_VERSION_XWING,
     MIN_UDP_QUERY_LEN,
@@ -27,7 +27,7 @@
     XWING_MLKEM_PUBLIC_KEY_SIZE,
     XWING_PUBLIC_KEY_SIZE,
 )
-from .crypto import (
+from crypto import (
     _require_size,
     hkdf_sha256,
     pad_7816_4,
@@ -36,9 +36,9 @@
     xchacha20_djb_poly1305_open,
     xchacha20_djb_poly1305_seal,
 )
-from .errors import CertificateError, DecryptionError
-from .packets import decrypt_dnscrypt_response, encrypt_dnscrypt_response
-from .types import (
+from errors import CertificateError, DecryptionError
+from packets import decrypt_dnscrypt_response, encrypt_dnscrypt_response
+from protocol_types import (
     DecryptedQuery,
     IssuedPQTicket,
     OpenedTicket,

reference-implementation/types.py …ference-implementation/protocol_types.pyreference-implementation/types.py renamed to reference-implementation/protocol_types.py reference-implementation/types.py renamed to reference-implementation/protocol_types.py

@@ -5,7 +5,7 @@
 from dataclasses import dataclass
 import ipaddress
 
-from .certificates import DNSCryptCertificate
+from certificates import DNSCryptCertificate
 
 
 @dataclass(frozen=True)

reference-implementation/test_dnscrypt.py

@@ -1,7 +1,7 @@
 import hashlib
 import unittest
 
-from reference import dnscrypt as d
+import dnscrypt as d
 
 
 DNS_QUERY = bytes.fromhex(

reference-implementation/transport.py

@@ -4,8 +4,8 @@
 
 import ipaddress
 
-from .constants import ANON_MAGIC
-from .types import AnonymizedDNSCryptQuery
+from constants import ANON_MAGIC
+from protocol_types import AnonymizedDNSCryptQuery
 
 
 def tcp_packet(packet: bytes) -> bytes: