]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Replace usage of the obscure PEM_read_bio_X509_AUX with the more standard PEM_read_bi...
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Thu, 15 Aug 2019 12:55:59 +0000 (05:55 -0700)
committerGitHub <noreply@github.com>
Thu, 15 Aug 2019 12:55:59 +0000 (05:55 -0700)
X509_AUX is an odd, note widely used, OpenSSL extension to the X509 file format. This function doesn't actually use any of the extra metadata that it parses, so just use the standard API.

Automerge-Triggered-By: @tiran
(cherry picked from commit 40dad9545aad4ede89abbab1c1beef5303d9573e)

Co-authored-by: Alex Gaynor <alex.gaynor@gmail.com>
Modules/_ssl.c

index e8955eedfa53ad569222ac8e97f8025fb3a1f8c5..b079663cc2235befc6c998fdec58362a864499e1 100644 (file)
@@ -1789,7 +1789,7 @@ _ssl__test_decode_cert_impl(PyObject *module, PyObject *path)
         goto fail0;
     }
 
-    x = PEM_read_bio_X509_AUX(cert,NULL, NULL, NULL);
+    x = PEM_read_bio_X509(cert, NULL, NULL, NULL);
     if (x == NULL) {
         PyErr_SetString(PySSLErrorObject,
                         "Error decoding PEM-encoded file");