Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
09c35f78
Commit
09c35f78
authored
Jul 28, 2002
by
Martin v. Löwis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Patch #575827: allow threads inside SSL creation.
parent
6c611fae
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
4 deletions
+19
-4
Modules/_ssl.c
Modules/_ssl.c
+19
-4
No files found.
Modules/_ssl.c
View file @
09c35f78
...
...
@@ -186,47 +186,62 @@ newPySSLObject(PySocketSockObject *Sock, char *key_file, char *cert_file)
goto
fail
;
}
Py_BEGIN_ALLOW_THREADS
self
->
ctx
=
SSL_CTX_new
(
SSLv23_method
());
/* Set up context */
Py_END_ALLOW_THREADS
if
(
self
->
ctx
==
NULL
)
{
errstr
=
"SSL_CTX_new error"
;
goto
fail
;
}
if
(
key_file
)
{
if
(
SSL_CTX_use_PrivateKey_file
(
self
->
ctx
,
key_file
,
SSL_FILETYPE_PEM
)
<
1
)
{
Py_BEGIN_ALLOW_THREADS
ret
=
SSL_CTX_use_PrivateKey_file
(
self
->
ctx
,
key_file
,
SSL_FILETYPE_PEM
);
Py_END_ALLOW_THREADS
if
(
ret
<
1
)
{
errstr
=
"SSL_CTX_use_PrivateKey_file error"
;
goto
fail
;
}
if
(
SSL_CTX_use_certificate_chain_file
(
self
->
ctx
,
cert_file
)
<
1
)
{
Py_BEGIN_ALLOW_THREADS
ret
=
SSL_CTX_use_certificate_chain_file
(
self
->
ctx
,
cert_file
);
Py_END_ALLOW_THREADS
if
(
ret
<
1
)
{
errstr
=
"SSL_CTX_use_certificate_chain_file error"
;
goto
fail
;
}
}
Py_BEGIN_ALLOW_THREADS
SSL_CTX_set_verify
(
self
->
ctx
,
SSL_VERIFY_NONE
,
NULL
);
/* set verify lvl */
self
->
ssl
=
SSL_new
(
self
->
ctx
);
/* New ssl struct */
Py_END_ALLOW_THREADS
SSL_set_fd
(
self
->
ssl
,
Sock
->
sock_fd
);
/* Set the socket for SSL */
Py_BEGIN_ALLOW_THREADS
SSL_set_connect_state
(
self
->
ssl
);
/* Actually negotiate SSL connection */
/* XXX If SSL_connect() returns 0, it's also a failure. */
ret
=
SSL_connect
(
self
->
ssl
);
Py_END_ALLOW_THREADS
if
(
ret
<=
0
)
{
PySSL_SetError
(
self
,
ret
);
goto
fail
;
}
self
->
ssl
->
debug
=
1
;
Py_BEGIN_ALLOW_THREADS
if
((
self
->
server_cert
=
SSL_get_peer_certificate
(
self
->
ssl
)))
{
X509_NAME_oneline
(
X509_get_subject_name
(
self
->
server_cert
),
self
->
server
,
X509_NAME_MAXLEN
);
X509_NAME_oneline
(
X509_get_issuer_name
(
self
->
server_cert
),
self
->
issuer
,
X509_NAME_MAXLEN
);
}
Py_END_ALLOW_THREADS
self
->
Socket
=
Sock
;
Py_INCREF
(
self
->
Socket
);
return
self
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment