mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-23 09:19:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

[3.13] gh-141801: Use accessors for ASN1_STRING fields in libssl (GH-141802) (#141848)

Browse source 
gh-141801: Use accessors for ASN1_STRING fields in libssl (GH-141802)

* gh-141801: Use accessors for ASN1_STRING fields

While ASN1_STRING is currently exposed, it is better to use the
accessors. See https://github.com/openssl/openssl/issues/29117 where, if
the type were opaque, OpenSSL's X509 objects could be much more
memory-efficient.

* Update Modules/_ssl.c



* Update Modules/_ssl.c



---------
(cherry picked from commit c41fce08a5)

Co-authored-by: David Benjamin <davidben@davidben.net>
Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>
This commit is contained in:
Miss Islington (bot) 2025-11-22 19:53:14 +01:00 • committed by GitHub
parent 616117b018
commit 66e2b4ac54
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Modules/_ssl.c
View file

@ -1361,14 +1361,14 @@ _get_peer_alt_names (_sslmodulestate *state, X509 *certificate) {
}
PyTuple_SET_ITEM(t, 0, v);
if (name->d.ip->length == 4) {
unsigned char *p = name->d.ip->data;
if (ASN1_STRING_length(name->d.ip) == 4) {
const unsigned char *p = ASN1_STRING_get0_data(name->d.ip);
v = PyUnicode_FromFormat(
"%d.%d.%d.%d",
p[0], p[1], p[2], p[3]
);
} else if (name->d.ip->length == 16) {
unsigned char *p = name->d.ip->data;
} else if (ASN1_STRING_length(name->d.ip) == 16) {
const unsigned char *p = ASN1_STRING_get0_data(name->d.ip);
v = PyUnicode_FromFormat(
"%X:%X:%X:%X:%X:%X:%X:%X",
p[0] << 8 | p[1],
@ -1499,8 +1499,9 @@ _get_aia_uri(X509 *certificate, int nid) {
continue;
}
uri = ad->location->d.uniformResourceIdentifier;
ostr = PyUnicode_FromStringAndSize((char *)uri->data,
uri->length);
ostr = PyUnicode_FromStringAndSize(
(const char *)ASN1_STRING_get0_data(uri),
ASN1_STRING_length(uri));
if (ostr == NULL) {
goto fail;
}
@ -1566,8 +1567,9 @@ _get_crl_dp(X509 *certificate) {
continue;
}
uri = gn->d.uniformResourceIdentifier;
ouri = PyUnicode_FromStringAndSize((char *)uri->data,
uri->length);
ouri = PyUnicode_FromStringAndSize(
(const char *)ASN1_STRING_get0_data(uri),
ASN1_STRING_length(uri));
if (ouri == NULL)
goto done;