|
@ -1,6 +1,6 @@ |
|
|
--- a/Modules/_ssl.c
|
|
|
--- a/Modules/_ssl.c
|
|
|
+++ b/Modules/_ssl.c
|
|
|
+++ b/Modules/_ssl.c
|
|
|
@@ -201,6 +202,11 @@ static void _PySSLFixErrno(void) {
|
|
|
|
|
|
|
|
|
@@ -201,6 +201,11 @@ static void _PySSLFixErrno(void) {
|
|
|
#define TLS_method SSLv23_method |
|
|
#define TLS_method SSLv23_method |
|
|
#define TLS_client_method SSLv23_client_method |
|
|
#define TLS_client_method SSLv23_client_method |
|
|
#define TLS_server_method SSLv23_server_method |
|
|
#define TLS_server_method SSLv23_server_method |
|
@ -12,7 +12,7 @@ |
|
|
|
|
|
|
|
|
static int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne) |
|
|
static int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne) |
|
|
{ |
|
|
{ |
|
|
@@ -1677,7 +1683,7 @@ _decode_certificate(X509 *certificate) {
|
|
|
|
|
|
|
|
|
@@ -1724,7 +1729,7 @@ _decode_certificate(X509 *certificate) {
|
|
|
Py_DECREF(sn_obj); |
|
|
Py_DECREF(sn_obj); |
|
|
|
|
|
|
|
|
(void) BIO_reset(biobuf); |
|
|
(void) BIO_reset(biobuf); |
|
@ -21,7 +21,7 @@ |
|
|
ASN1_TIME_print(biobuf, notBefore); |
|
|
ASN1_TIME_print(biobuf, notBefore); |
|
|
len = BIO_gets(biobuf, buf, sizeof(buf)-1); |
|
|
len = BIO_gets(biobuf, buf, sizeof(buf)-1); |
|
|
if (len < 0) { |
|
|
if (len < 0) { |
|
|
@@ -1694,7 +1700,7 @@ _decode_certificate(X509 *certificate) {
|
|
|
|
|
|
|
|
|
@@ -1741,7 +1746,7 @@ _decode_certificate(X509 *certificate) {
|
|
|
Py_DECREF(pnotBefore); |
|
|
Py_DECREF(pnotBefore); |
|
|
|
|
|
|
|
|
(void) BIO_reset(biobuf); |
|
|
(void) BIO_reset(biobuf); |
|
@ -30,7 +30,7 @@ |
|
|
ASN1_TIME_print(biobuf, notAfter); |
|
|
ASN1_TIME_print(biobuf, notAfter); |
|
|
len = BIO_gets(biobuf, buf, sizeof(buf)-1); |
|
|
len = BIO_gets(biobuf, buf, sizeof(buf)-1); |
|
|
if (len < 0) { |
|
|
if (len < 0) { |
|
|
@@ -3235,7 +3241,7 @@ _ssl__SSLContext_impl(PyTypeObject *type, int proto_version)
|
|
|
|
|
|
|
|
|
@@ -3282,7 +3287,7 @@ _ssl__SSLContext_impl(PyTypeObject *type
|
|
|
conservative and assume it wasn't fixed until release. We do this check |
|
|
conservative and assume it wasn't fixed until release. We do this check |
|
|
at runtime to avoid problems from the dynamic linker. |
|
|
at runtime to avoid problems from the dynamic linker. |
|
|
See #25672 for more on this. */ |
|
|
See #25672 for more on this. */ |
|
@ -39,7 +39,7 @@ |
|
|
if (!(libver >= 0x10001000UL && libver < 0x1000108fUL) && |
|
|
if (!(libver >= 0x10001000UL && libver < 0x1000108fUL) && |
|
|
!(libver >= 0x10000000UL && libver < 0x100000dfUL)) { |
|
|
!(libver >= 0x10000000UL && libver < 0x100000dfUL)) { |
|
|
SSL_CTX_set_mode(self->ctx, SSL_MODE_RELEASE_BUFFERS); |
|
|
SSL_CTX_set_mode(self->ctx, SSL_MODE_RELEASE_BUFFERS); |
|
|
@@ -6403,10 +6409,10 @@ PyInit__ssl(void)
|
|
|
|
|
|
|
|
|
@@ -6450,10 +6455,10 @@ PyInit__ssl(void)
|
|
|
return NULL; |
|
|
return NULL; |
|
|
|
|
|
|
|
|
/* OpenSSL version */ |
|
|
/* OpenSSL version */ |
|
@ -52,7 +52,7 @@ |
|
|
r = PyLong_FromUnsignedLong(libver); |
|
|
r = PyLong_FromUnsignedLong(libver); |
|
|
if (r == NULL) |
|
|
if (r == NULL) |
|
|
return NULL; |
|
|
return NULL; |
|
|
@@ -6416,7 +6422,7 @@ PyInit__ssl(void)
|
|
|
|
|
|
|
|
|
@@ -6463,7 +6468,7 @@ PyInit__ssl(void)
|
|
|
r = Py_BuildValue("IIIII", major, minor, fix, patch, status); |
|
|
r = Py_BuildValue("IIIII", major, minor, fix, patch, status); |
|
|
if (r == NULL || PyModule_AddObject(m, "OPENSSL_VERSION_INFO", r)) |
|
|
if (r == NULL || PyModule_AddObject(m, "OPENSSL_VERSION_INFO", r)) |
|
|
return NULL; |
|
|
return NULL; |
|
|