aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/tools/python3/Lib/ssl.py
diff options
context:
space:
mode:
authorshadchin <shadchin@yandex-team.com>2024-09-17 19:54:19 +0300
committershadchin <shadchin@yandex-team.com>2024-09-17 20:04:48 +0300
commitad73802f079a708231d906dd7273a632db735851 (patch)
treed8b2b9f0b31430e69b777af21f63b432f4b92cc4 /contrib/tools/python3/Lib/ssl.py
parent7c4e4744ae44dd94daa179458190817615f9e8a1 (diff)
downloadydb-ad73802f079a708231d906dd7273a632db735851.tar.gz
Update Python 3 to 3.12.6
commit_hash:43ed87a61b9efe3a87682fda1f0bff6f7b422cc9
Diffstat (limited to 'contrib/tools/python3/Lib/ssl.py')
-rw-r--r--contrib/tools/python3/Lib/ssl.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/contrib/tools/python3/Lib/ssl.py b/contrib/tools/python3/Lib/ssl.py
index 9c1fea6d36..2a115987d9 100644
--- a/contrib/tools/python3/Lib/ssl.py
+++ b/contrib/tools/python3/Lib/ssl.py
@@ -527,18 +527,17 @@ class SSLContext(_SSLContext):
self._set_alpn_protocols(protos)
def _load_windows_store_certs(self, storename, purpose):
- certs = bytearray()
try:
for cert, encoding, trust in enum_certificates(storename):
# CA certs are never PKCS#7 encoded
if encoding == "x509_asn":
if trust is True or purpose.oid in trust:
- certs.extend(cert)
+ try:
+ self.load_verify_locations(cadata=cert)
+ except SSLError as exc:
+ warnings.warn(f"Bad certificate in Windows certificate store: {exc!s}")
except PermissionError:
warnings.warn("unable to enumerate Windows certificate store")
- if certs:
- self.load_verify_locations(cadata=certs)
- return certs
def load_default_certs(self, purpose=Purpose.SERVER_AUTH):
if not isinstance(purpose, _ASN1Object):