Skip to content

Commit 6893b94

Browse files
reaperhulkclaude
andauthored
Import _serialization instead of serialization in x509/extensions (#15363)
x509/extensions.py only uses serialization.Encoding and serialization.PublicFormat, both defined in _serialization -- the module that exists precisely to break this cycle, and which every asymmetric module already imports. Importing the serialization package pulled its whole __init__ (and with it ssh.py and its dependency graph) into every 'import cryptography.x509'. Benchmark (release build, warm bytecode cache, python -X importtime, min of 5 warm runs): import cryptography.x509: 67.8 ms -> 53.7 ms (-21%) Claude-Session: https://claude.ai/code/session_01C5bsKENedjVD9gcLApf1x4 Co-authored-by: Claude <[email protected]>
1 parent a7582c7 commit 6893b94

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

‎src/cryptography/x509/extensions.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from cryptography import utils
1515
from cryptography.hazmat.bindings._rust import asn1
1616
from cryptography.hazmat.bindings._rust import x509 as rust_x509
17-
from cryptography.hazmat.primitives import constant_time, serialization
17+
from cryptography.hazmat.primitives import _serialization, constant_time
1818
from cryptography.hazmat.primitives.asymmetric.ec import EllipticCurvePublicKey
1919
from cryptography.hazmat.primitives.asymmetric.rsa import RSAPublicKey
2020
from cryptography.hazmat.primitives.asymmetric.types import (
@@ -53,19 +53,19 @@ def _key_identifier_from_public_key(
5353
) -> bytes:
5454
if isinstance(public_key, RSAPublicKey):
5555
data = public_key.public_bytes(
56-
serialization.Encoding.DER,
57-
serialization.PublicFormat.PKCS1,
56+
_serialization.Encoding.DER,
57+
_serialization.PublicFormat.PKCS1,
5858
)
5959
elif isinstance(public_key, EllipticCurvePublicKey):
6060
data = public_key.public_bytes(
61-
serialization.Encoding.X962,
62-
serialization.PublicFormat.UncompressedPoint,
61+
_serialization.Encoding.X962,
62+
_serialization.PublicFormat.UncompressedPoint,
6363
)
6464
else:
6565
# This is a very slow way to do this.
6666
serialized = public_key.public_bytes(
67-
serialization.Encoding.DER,
68-
serialization.PublicFormat.SubjectPublicKeyInfo,
67+
_serialization.Encoding.DER,
68+
_serialization.PublicFormat.SubjectPublicKeyInfo,
6969
)
7070
data = asn1.parse_spki_for_data(serialized)
7171

0 commit comments

Comments
 (0)