cpython-lru_cache-weakref: Modules/

annotate Modules/_ssl.c @ 64166:d0e9febfa00a 3.1

Merged revisions 84172 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84172 | martin.v.loewis | 2010-08-18 18:12:23 +0200 (Mi, 18 Aug 2010) | 2 lines Restore GIL in nis_cat in case of error. ........

author	Martin v. Löwis <martin@v.loewis.de>
date	Thu, 19 Aug 2010 09:03:03 +0000
parents	c4bbda2d4c49
children	988718e9f93d

rev	line source
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	1 /* SSL socket module
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	2
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	3 SSL support based on patches by Brian E Gallew and Laszlo Kovacs.
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	4 Re-worked a bit by Bill Janssen to add server-side support and
43869 b59825d9db8f get SSL support to work again Bill Janssen <janssen@parc.com> parents: 43400 diff changeset	5 certificate decoding. Chris Stawarz contributed some non-blocking
b59825d9db8f get SSL support to work again Bill Janssen <janssen@parc.com> parents: 43400 diff changeset	6 patches.
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	7
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	8 This module is imported by ssl.py. It should not be used
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	9 directly.
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	10
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	11 XXX should partial writes be enabled, SSL_MODE_ENABLE_PARTIAL_WRITE?
60901 fc97784e5cc2 Merged revisions 80394 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60818 diff changeset	12
fc97784e5cc2 Merged revisions 80394 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60818 diff changeset	13 XXX integrate several "shutdown modes" as suggested in
fc97784e5cc2 Merged revisions 80394 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60818 diff changeset	14 http://bugs.python.org/issue8108#msg102867 ?
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	15 */
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	16
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	17 #include "Python.h"
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	18
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	19 #ifdef WITH_THREAD
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	20 #include "pythread.h"
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	21 #define PySSL_BEGIN_ALLOW_THREADS { \
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	22 PyThreadState *_save = NULL; \
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	23 if (_ssl_locks_count>0) {_save = PyEval_SaveThread();}
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	24 #define PySSL_BLOCK_THREADS if (_ssl_locks_count>0){PyEval_RestoreThread(_save)};
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	25 #define PySSL_UNBLOCK_THREADS if (_ssl_locks_count>0){_save = PyEval_SaveThread()};
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	26 #define PySSL_END_ALLOW_THREADS if (_ssl_locks_count>0){PyEval_RestoreThread(_save);} \
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	27 }
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	28
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	29 #else /* no WITH_THREAD */
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	30
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	31 #define PySSL_BEGIN_ALLOW_THREADS
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	32 #define PySSL_BLOCK_THREADS
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	33 #define PySSL_UNBLOCK_THREADS
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	34 #define PySSL_END_ALLOW_THREADS
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	35
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	36 #endif
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	37
23190 0bc3a41d4e40 Forward port of patch # 500311: Work around for buggy https servers. Martin v. Löwis <martin@v.loewis.de> parents: 21959 diff changeset	38 enum py_ssl_error {
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	39 /* these mirror ssl.h */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	40 PY_SSL_ERROR_NONE,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	41 PY_SSL_ERROR_SSL,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	42 PY_SSL_ERROR_WANT_READ,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	43 PY_SSL_ERROR_WANT_WRITE,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	44 PY_SSL_ERROR_WANT_X509_LOOKUP,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	45 PY_SSL_ERROR_SYSCALL, /* look at error stack/return value/errno */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	46 PY_SSL_ERROR_ZERO_RETURN,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	47 PY_SSL_ERROR_WANT_CONNECT,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	48 /* start of non ssl.h errorcodes */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	49 PY_SSL_ERROR_EOF, /* special case of SSL_ERROR_SYSCALL */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	50 PY_SSL_ERROR_NO_SOCKET, /* socket has been GC'd */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	51 PY_SSL_ERROR_INVALID_ERROR_CODE
23190 0bc3a41d4e40 Forward port of patch # 500311: Work around for buggy https servers. Martin v. Löwis <martin@v.loewis.de> parents: 21959 diff changeset	52 };
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	53
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	54 enum py_ssl_server_or_client {
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	55 PY_SSL_CLIENT,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	56 PY_SSL_SERVER
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	57 };
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	58
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	59 enum py_ssl_cert_requirements {
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	60 PY_SSL_CERT_NONE,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	61 PY_SSL_CERT_OPTIONAL,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	62 PY_SSL_CERT_REQUIRED
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	63 };
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	64
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	65 enum py_ssl_version {
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	66 PY_SSL_VERSION_SSL2,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	67 PY_SSL_VERSION_SSL3,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	68 PY_SSL_VERSION_SSL23,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	69 PY_SSL_VERSION_TLS1
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	70 };
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	71
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	72 /* Include symbols from _socket module */
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	73 #include "socketmodule.h"
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	74
53816 911df82bc25d add a replacement API for PyCObject, PyCapsule #5630 Benjamin Peterson <benjamin@python.org> parents: 51922 diff changeset	75 static PySocketModule_APIObject PySocketModule;
911df82bc25d add a replacement API for PyCObject, PyCapsule #5630 Benjamin Peterson <benjamin@python.org> parents: 51922 diff changeset	76
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	77 #if defined(HAVE_POLL_H)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	78 #include <poll.h>
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	79 #elif defined(HAVE_SYS_POLL_H)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	80 #include <sys/poll.h>
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	81 #endif
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	82
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	83 /* Include OpenSSL header files */
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	84 #include "openssl/rsa.h"
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	85 #include "openssl/crypto.h"
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	86 #include "openssl/x509.h"
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	87 #include "openssl/x509v3.h"
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	88 #include "openssl/pem.h"
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	89 #include "openssl/ssl.h"
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	90 #include "openssl/err.h"
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	91 #include "openssl/rand.h"
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	92
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	93 /* SSL error object */
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	94 static PyObject *PySSLErrorObject;
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	95
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	96 #ifdef WITH_THREAD
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	97
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	98 /* serves as a flag to see whether we've initialized the SSL thread support. */
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	99 /* 0 means no, greater than 0 means yes */
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	100
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	101 static unsigned int _ssl_locks_count = 0;
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	102
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	103 #endif /* def WITH_THREAD */
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	104
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	105 /* SSL socket object */
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	106
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	107 #define X509_NAME_MAXLEN 256
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	108
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	109 /* RAND_* APIs got added to OpenSSL in 0.9.5 */
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	110 #if OPENSSL_VERSION_NUMBER >= 0x0090500fL
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	111 # define HAVE_OPENSSL_RAND 1
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	112 #else
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	113 # undef HAVE_OPENSSL_RAND
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	114 #endif
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	115
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	116 typedef struct {
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	117 PyObject_HEAD
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	118 PyObject Socket; / weakref to socket on which we're layered */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	119 SSL_CTX* ctx;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	120 SSL* ssl;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	121 X509* peer_cert;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	122 int shutdown_seen_zero;
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	123
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	124 } PySSLObject;
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	125
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24086 diff changeset	126 static PyTypeObject PySSL_Type;
1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24086 diff changeset	127 static PyObject PySSL_SSLwrite(PySSLObject self, PyObject *args);
1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24086 diff changeset	128 static PyObject PySSL_SSLread(PySSLObject self, PyObject *args);
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	129 static int check_socket_and_wait_for_timeout(PySocketSockObject *s,
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	130 int writing);
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	131 static PyObject PySSL_peercert(PySSLObject self, PyObject *args);
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	132 static PyObject PySSL_cipher(PySSLObject self);
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	133
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	134 #define PySSLObject_Check(v) (Py_TYPE(v) == &PySSL_Type)
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	135
32599 598a5ce63322 [Patch #945642] Fix non-blocking SSL sockets, which blocked on reads/writes in Python 2.3. Andrew M. Kuchling <amk@amk.ca> parents: 31790 diff changeset	136 typedef enum {
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	137 SOCKET_IS_NONBLOCKING,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	138 SOCKET_IS_BLOCKING,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	139 SOCKET_HAS_TIMED_OUT,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	140 SOCKET_HAS_BEEN_CLOSED,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	141 SOCKET_TOO_LARGE_FOR_SELECT,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	142 SOCKET_OPERATION_OK
32599 598a5ce63322 [Patch #945642] Fix non-blocking SSL sockets, which blocked on reads/writes in Python 2.3. Andrew M. Kuchling <amk@amk.ca> parents: 31790 diff changeset	143 } timeout_state;
598a5ce63322 [Patch #945642] Fix non-blocking SSL sockets, which blocked on reads/writes in Python 2.3. Andrew M. Kuchling <amk@amk.ca> parents: 31790 diff changeset	144
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	145 /* Wrap error strings with filename and line # */
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	146 #define STRINGIFY1(x) #x
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	147 #define STRINGIFY2(x) STRINGIFY1(x)
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	148 #define ERRSTR1(x,y,z) (x ":" y ": " z)
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	149 #define ERRSTR(x) ERRSTR1("_ssl.c", STRINGIFY2(__LINE__), x)
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	150
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	151 /* XXX It might be helpful to augment the error message generated
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	152 below with the name of the SSL function that generated the error.
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	153 I expect it's obvious most of the time.
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	154 */
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	155
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	156 static PyObject *
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	157 PySSL_SetError(PySSLObject obj, int ret, char filename, int lineno)
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	158 {
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	159 PyObject *v;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	160 char buf[2048];
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	161 char *errstr;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	162 int err;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	163 enum py_ssl_error p = PY_SSL_ERROR_NONE;
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	164
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	165 assert(ret <= 0);
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	166
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	167 if (obj->ssl != NULL) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	168 err = SSL_get_error(obj->ssl, ret);
23190 0bc3a41d4e40 Forward port of patch # 500311: Work around for buggy https servers. Martin v. Löwis <martin@v.loewis.de> parents: 21959 diff changeset	169
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	170 switch (err) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	171 case SSL_ERROR_ZERO_RETURN:
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	172 errstr = "TLS/SSL connection has been closed";
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	173 p = PY_SSL_ERROR_ZERO_RETURN;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	174 break;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	175 case SSL_ERROR_WANT_READ:
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	176 errstr = "The operation did not complete (read)";
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	177 p = PY_SSL_ERROR_WANT_READ;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	178 break;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	179 case SSL_ERROR_WANT_WRITE:
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	180 p = PY_SSL_ERROR_WANT_WRITE;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	181 errstr = "The operation did not complete (write)";
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	182 break;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	183 case SSL_ERROR_WANT_X509_LOOKUP:
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	184 p = PY_SSL_ERROR_WANT_X509_LOOKUP;
61537 330273ec6028 Merged revisions 81116 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61246 diff changeset	185 errstr = "The operation did not complete (X509 lookup)";
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	186 break;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	187 case SSL_ERROR_WANT_CONNECT:
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	188 p = PY_SSL_ERROR_WANT_CONNECT;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	189 errstr = "The operation did not complete (connect)";
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	190 break;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	191 case SSL_ERROR_SYSCALL:
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	192 {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	193 unsigned long e = ERR_get_error();
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	194 if (e == 0) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	195 PySocketSockObject *s
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	196 = (PySocketSockObject *) PyWeakref_GetObject(obj->Socket);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	197 if (ret == 0 \|\| (((PyObject *)s) == Py_None)) {
61537 330273ec6028 Merged revisions 81116 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61246 diff changeset	198 p = PY_SSL_ERROR_EOF;
330273ec6028 Merged revisions 81116 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61246 diff changeset	199 errstr = "EOF occurred in violation of protocol";
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	200 } else if (ret == -1) {
61537 330273ec6028 Merged revisions 81116 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61246 diff changeset	201 /* underlying BIO reported an I/O error */
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	202 Py_INCREF(s);
61646 8b6401ae1262 Merged revisions 81242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61537 diff changeset	203 ERR_clear_error();
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	204 v = s->errorhandler();
b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	205 Py_DECREF(s);
b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	206 return v;
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	207 } else { /* possible? */
61537 330273ec6028 Merged revisions 81116 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61246 diff changeset	208 p = PY_SSL_ERROR_SYSCALL;
330273ec6028 Merged revisions 81116 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61246 diff changeset	209 errstr = "Some I/O error occurred";
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	210 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	211 } else {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	212 p = PY_SSL_ERROR_SYSCALL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	213 /* XXX Protected by global interpreter lock */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	214 errstr = ERR_error_string(e, NULL);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	215 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	216 break;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	217 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	218 case SSL_ERROR_SSL:
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	219 {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	220 unsigned long e = ERR_get_error();
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	221 p = PY_SSL_ERROR_SSL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	222 if (e != 0)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	223 /* XXX Protected by global interpreter lock */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	224 errstr = ERR_error_string(e, NULL);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	225 else { /* possible? */
61537 330273ec6028 Merged revisions 81116 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61246 diff changeset	226 errstr = "A failure in the SSL library occurred";
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	227 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	228 break;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	229 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	230 default:
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	231 p = PY_SSL_ERROR_INVALID_ERROR_CODE;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	232 errstr = "Invalid error code";
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	233 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	234 } else {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	235 errstr = ERR_error_string(ERR_peek_last_error(), NULL);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	236 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	237 PyOS_snprintf(buf, sizeof(buf), "_ssl.c:%d: %s", lineno, errstr);
61646 8b6401ae1262 Merged revisions 81242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61537 diff changeset	238 ERR_clear_error();
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	239 v = Py_BuildValue("(is)", p, buf);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	240 if (v != NULL) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	241 PyErr_SetObject(PySSLErrorObject, v);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	242 Py_DECREF(v);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	243 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	244 return NULL;
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	245 }
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	246
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	247 static PyObject *
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	248 _setSSLError (char errstr, int errcode, char filename, int lineno) {
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	249
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	250 char buf[2048];
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	251 PyObject *v;
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	252
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	253 if (errstr == NULL) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	254 errcode = ERR_peek_last_error();
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	255 errstr = ERR_error_string(errcode, NULL);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	256 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	257 PyOS_snprintf(buf, sizeof(buf), "_ssl.c:%d: %s", lineno, errstr);
61646 8b6401ae1262 Merged revisions 81242 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61537 diff changeset	258 ERR_clear_error();
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	259 v = Py_BuildValue("(is)", errcode, buf);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	260 if (v != NULL) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	261 PyErr_SetObject(PySSLErrorObject, v);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	262 Py_DECREF(v);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	263 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	264 return NULL;
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	265 }
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	266
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	267 static PySSLObject *
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	268 newPySSLObject(PySocketSockObject Sock, char key_file, char *cert_file,
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	269 enum py_ssl_server_or_client socket_type,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	270 enum py_ssl_cert_requirements certreq,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	271 enum py_ssl_version proto_version,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	272 char *cacerts_file)
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	273 {
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	274 PySSLObject *self;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	275 char *errstr = NULL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	276 int ret;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	277 int verification_mode;
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	278
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	279 self = PyObject_New(PySSLObject, &PySSL_Type); /* Create new object */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	280 if (self == NULL)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	281 return NULL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	282 self->peer_cert = NULL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	283 self->ssl = NULL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	284 self->ctx = NULL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	285 self->Socket = NULL;
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	286
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	287 /* Make sure the SSL error state is initialized */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	288 (void) ERR_get_state();
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	289 ERR_clear_error();
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	290
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	291 if ((key_file && !cert_file) \|\| (!key_file && cert_file)) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	292 errstr = ERRSTR("Both the key & certificate files "
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	293 "must be specified");
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	294 goto fail;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	295 }
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	296
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	297 if ((socket_type == PY_SSL_SERVER) &&
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	298 ((key_file == NULL) \|\| (cert_file == NULL))) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	299 errstr = ERRSTR("Both the key & certificate files "
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	300 "must be specified for server-side operation");
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	301 goto fail;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	302 }
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	303
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	304 PySSL_BEGIN_ALLOW_THREADS
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	305 if (proto_version == PY_SSL_VERSION_TLS1)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	306 self->ctx = SSL_CTX_new(TLSv1_method()); /* Set up context */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	307 else if (proto_version == PY_SSL_VERSION_SSL3)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	308 self->ctx = SSL_CTX_new(SSLv3_method()); /* Set up context */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	309 else if (proto_version == PY_SSL_VERSION_SSL2)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	310 self->ctx = SSL_CTX_new(SSLv2_method()); /* Set up context */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	311 else if (proto_version == PY_SSL_VERSION_SSL23)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	312 self->ctx = SSL_CTX_new(SSLv23_method()); /* Set up context */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	313 PySSL_END_ALLOW_THREADS
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	314
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	315 if (self->ctx == NULL) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	316 errstr = ERRSTR("Invalid SSL protocol variant specified.");
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	317 goto fail;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	318 }
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	319
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	320 if (certreq != PY_SSL_CERT_NONE) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	321 if (cacerts_file == NULL) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	322 errstr = ERRSTR("No root certificates specified for "
61537 330273ec6028 Merged revisions 81116 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61246 diff changeset	323 "verification of other-side certificates.");
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	324 goto fail;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	325 } else {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	326 PySSL_BEGIN_ALLOW_THREADS
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	327 ret = SSL_CTX_load_verify_locations(self->ctx,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	328 cacerts_file,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	329 NULL);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	330 PySSL_END_ALLOW_THREADS
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	331 if (ret != 1) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	332 _setSSLError(NULL, 0, __FILE__, __LINE__);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	333 goto fail;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	334 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	335 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	336 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	337 if (key_file) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	338 PySSL_BEGIN_ALLOW_THREADS
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	339 ret = SSL_CTX_use_PrivateKey_file(self->ctx, key_file,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	340 SSL_FILETYPE_PEM);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	341 PySSL_END_ALLOW_THREADS
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	342 if (ret != 1) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	343 _setSSLError(NULL, ret, __FILE__, __LINE__);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	344 goto fail;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	345 }
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	346
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	347 PySSL_BEGIN_ALLOW_THREADS
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	348 ret = SSL_CTX_use_certificate_chain_file(self->ctx,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	349 cert_file);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	350 PySSL_END_ALLOW_THREADS
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	351 if (ret != 1) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	352 /*
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	353 fprintf(stderr, "ret is %d, errcode is %lu, %lu, with file \"%s\"\n",
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	354 ret, ERR_peek_error(), ERR_peek_last_error(), cert_file);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	355 */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	356 if (ERR_peek_last_error() != 0) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	357 _setSSLError(NULL, ret, __FILE__, __LINE__);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	358 goto fail;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	359 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	360 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	361 }
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	362
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	363 /* ssl compatibility */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	364 SSL_CTX_set_options(self->ctx, SSL_OP_ALL);
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	365
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	366 verification_mode = SSL_VERIFY_NONE;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	367 if (certreq == PY_SSL_CERT_OPTIONAL)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	368 verification_mode = SSL_VERIFY_PEER;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	369 else if (certreq == PY_SSL_CERT_REQUIRED)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	370 verification_mode = (SSL_VERIFY_PEER \|
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	371 SSL_VERIFY_FAIL_IF_NO_PEER_CERT);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	372 SSL_CTX_set_verify(self->ctx, verification_mode,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	373 NULL); /* set verify lvl */
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	374
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	375 PySSL_BEGIN_ALLOW_THREADS
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	376 self->ssl = SSL_new(self->ctx); /* New ssl struct */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	377 PySSL_END_ALLOW_THREADS
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	378 SSL_set_fd(self->ssl, Sock->sock_fd); /* Set the socket for SSL */
60464 837f3bb1575f Merged revisions 79912 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60038 diff changeset	379 #ifdef SSL_MODE_AUTO_RETRY
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	380 SSL_set_mode(self->ssl, SSL_MODE_AUTO_RETRY);
60464 837f3bb1575f Merged revisions 79912 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60038 diff changeset	381 #endif
27557 5eefec94a784 SF patch 676472 by Geoff Talvola, reviewed by Ben Laurie. Guido van Rossum <guido@python.org> parents: 27430 diff changeset	382
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	383 /* If the socket is in non-blocking mode or timeout mode, set the BIO
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	384 * to non-blocking mode (blocking is the default)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	385 */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	386 if (Sock->sock_timeout >= 0.0) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	387 /* Set both the read and write BIO's to non-blocking mode */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	388 BIO_set_nbio(SSL_get_rbio(self->ssl), 1);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	389 BIO_set_nbio(SSL_get_wbio(self->ssl), 1);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	390 }
27557 5eefec94a784 SF patch 676472 by Geoff Talvola, reviewed by Ben Laurie. Guido van Rossum <guido@python.org> parents: 27430 diff changeset	391
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	392 PySSL_BEGIN_ALLOW_THREADS
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	393 if (socket_type == PY_SSL_CLIENT)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	394 SSL_set_connect_state(self->ssl);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	395 else
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	396 SSL_set_accept_state(self->ssl);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	397 PySSL_END_ALLOW_THREADS
24398 c7ed925c75b3 Patch #575827: allow threads inside SSL creation. Martin v. Löwis <martin@v.loewis.de> parents: 24280 diff changeset	398
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	399 self->Socket = PyWeakref_NewRef((PyObject *) Sock, Py_None);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	400 return self;
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	401 fail:
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	402 if (errstr)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	403 PyErr_SetString(PySSLErrorObject, errstr);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	404 Py_DECREF(self);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	405 return NULL;
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	406 }
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	407
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	408 static PyObject *
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	409 PySSL_sslwrap(PyObject self, PyObject args)
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	410 {
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	411 PySocketSockObject *Sock;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	412 int server_side = 0;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	413 int verification_mode = PY_SSL_CERT_NONE;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	414 int protocol = PY_SSL_VERSION_SSL23;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	415 char *key_file = NULL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	416 char *cert_file = NULL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	417 char *cacerts_file = NULL;
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	418
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	419 if (!PyArg_ParseTuple(args, "O!i\|zziiz:sslwrap",
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	420 PySocketModule.Sock_Type,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	421 &Sock,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	422 &server_side,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	423 &key_file, &cert_file,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	424 &verification_mode, &protocol,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	425 &cacerts_file))
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	426 return NULL;
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	427
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	428 /*
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	429 fprintf(stderr,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	430 "server_side is %d, keyfile %p, certfile %p, verify_mode %d, "
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	431 "protocol %d, certs %p\n",
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	432 server_side, key_file, cert_file, verification_mode,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	433 protocol, cacerts_file);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	434 */
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	435
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	436 return (PyObject *) newPySSLObject(Sock, key_file, cert_file,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	437 server_side, verification_mode,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	438 protocol, cacerts_file);
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	439 }
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	440
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23295 diff changeset	441 PyDoc_STRVAR(ssl_doc,
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	442 "sslwrap(socket, server_side, [keyfile, certfile, certs_mode, protocol,\n"
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	443 " cacertsfile]) -> sslobject");
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	444
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	445 /* SSL object methods */
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	446
43869 b59825d9db8f get SSL support to work again Bill Janssen <janssen@parc.com> parents: 43400 diff changeset	447 static PyObject PySSL_SSLdo_handshake(PySSLObject self)
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	448 {
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	449 int ret;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	450 int err;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	451 int sockstate, nonblocking;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	452 PySocketSockObject *sock
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	453 = (PySocketSockObject *) PyWeakref_GetObject(self->Socket);
60936 5ed34f3f6c35 Merged revisions 80454 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60901 diff changeset	454
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	455 if (((PyObject*)sock) == Py_None) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	456 _setSSLError("Underlying socket connection gone",
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	457 PY_SSL_ERROR_NO_SOCKET, __FILE__, __LINE__);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	458 return NULL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	459 }
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	460 Py_INCREF(sock);
60936 5ed34f3f6c35 Merged revisions 80454 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60901 diff changeset	461
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	462 /* just in case the blocking state of the socket has been changed */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	463 nonblocking = (sock->sock_timeout >= 0.0);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	464 BIO_set_nbio(SSL_get_rbio(self->ssl), nonblocking);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	465 BIO_set_nbio(SSL_get_wbio(self->ssl), nonblocking);
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	466
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	467 /* Actually negotiate SSL connection */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	468 /* XXX If SSL_do_handshake() returns 0, it's also a failure. */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	469 sockstate = 0;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	470 do {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	471 PySSL_BEGIN_ALLOW_THREADS
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	472 ret = SSL_do_handshake(self->ssl);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	473 err = SSL_get_error(self->ssl, ret);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	474 PySSL_END_ALLOW_THREADS
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	475 if (PyErr_CheckSignals())
b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	476 goto error;
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	477 if (err == SSL_ERROR_WANT_READ) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	478 sockstate = check_socket_and_wait_for_timeout(sock, 0);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	479 } else if (err == SSL_ERROR_WANT_WRITE) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	480 sockstate = check_socket_and_wait_for_timeout(sock, 1);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	481 } else {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	482 sockstate = SOCKET_OPERATION_OK;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	483 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	484 if (sockstate == SOCKET_HAS_TIMED_OUT) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	485 PyErr_SetString(PySSLErrorObject,
61537 330273ec6028 Merged revisions 81116 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61246 diff changeset	486 ERRSTR("The handshake operation timed out"));
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	487 goto error;
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	488 } else if (sockstate == SOCKET_HAS_BEEN_CLOSED) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	489 PyErr_SetString(PySSLErrorObject,
61537 330273ec6028 Merged revisions 81116 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61246 diff changeset	490 ERRSTR("Underlying socket has been closed."));
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	491 goto error;
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	492 } else if (sockstate == SOCKET_TOO_LARGE_FOR_SELECT) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	493 PyErr_SetString(PySSLErrorObject,
61537 330273ec6028 Merged revisions 81116 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61246 diff changeset	494 ERRSTR("Underlying socket too large for select()."));
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	495 goto error;
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	496 } else if (sockstate == SOCKET_IS_NONBLOCKING) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	497 break;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	498 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	499 } while (err == SSL_ERROR_WANT_READ \|\| err == SSL_ERROR_WANT_WRITE);
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	500 Py_DECREF(sock);
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	501 if (ret < 1)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	502 return PySSL_SetError(self, ret, __FILE__, __LINE__);
43869 b59825d9db8f get SSL support to work again Bill Janssen <janssen@parc.com> parents: 43400 diff changeset	503
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	504 if (self->peer_cert)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	505 X509_free (self->peer_cert);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	506 PySSL_BEGIN_ALLOW_THREADS
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	507 self->peer_cert = SSL_get_peer_certificate(self->ssl);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	508 PySSL_END_ALLOW_THREADS
43869 b59825d9db8f get SSL support to work again Bill Janssen <janssen@parc.com> parents: 43400 diff changeset	509
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	510 Py_INCREF(Py_None);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	511 return Py_None;
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	512
b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	513 error:
b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	514 Py_DECREF(sock);
b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	515 return NULL;
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	516 }
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	517
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	518 static PyObject *
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	519 _create_tuple_for_attribute (ASN1_OBJECT name, ASN1_STRING value) {
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	520
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	521 char namebuf[X509_NAME_MAXLEN];
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	522 int buflen;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	523 PyObject *name_obj;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	524 PyObject *value_obj;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	525 PyObject *attr;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	526 unsigned char *valuebuf = NULL;
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	527
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	528 buflen = OBJ_obj2txt(namebuf, sizeof(namebuf), name, 0);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	529 if (buflen < 0) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	530 _setSSLError(NULL, 0, __FILE__, __LINE__);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	531 goto fail;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	532 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	533 name_obj = PyUnicode_FromStringAndSize(namebuf, buflen);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	534 if (name_obj == NULL)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	535 goto fail;
43948 8e0c4c710375 Make read() and certificate() return bytes instead of bytearray instances. Guido van Rossum <guido@python.org> parents: 43869 diff changeset	536
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	537 buflen = ASN1_STRING_to_UTF8(&valuebuf, value);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	538 if (buflen < 0) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	539 _setSSLError(NULL, 0, __FILE__, __LINE__);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	540 Py_DECREF(name_obj);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	541 goto fail;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	542 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	543 value_obj = PyUnicode_DecodeUTF8((char *) valuebuf,
61537 330273ec6028 Merged revisions 81116 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61246 diff changeset	544 buflen, "strict");
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	545 OPENSSL_free(valuebuf);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	546 if (value_obj == NULL) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	547 Py_DECREF(name_obj);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	548 goto fail;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	549 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	550 attr = PyTuple_New(2);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	551 if (attr == NULL) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	552 Py_DECREF(name_obj);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	553 Py_DECREF(value_obj);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	554 goto fail;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	555 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	556 PyTuple_SET_ITEM(attr, 0, name_obj);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	557 PyTuple_SET_ITEM(attr, 1, value_obj);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	558 return attr;
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	559
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	560 fail:
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	561 return NULL;
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	562 }
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	563
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	564 static PyObject *
43292 876b7ef4775d Merged revisions 57778-58052 via svnmerge from Thomas Wouters <thomas@python.org> parents: 42954 diff changeset	565 _create_tuple_for_X509_NAME (X509_NAME *xname)
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	566 {
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	567 PyObject dn = NULL; / tuple which represents the "distinguished name" */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	568 PyObject rdn = NULL; / tuple to hold a "relative distinguished name" */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	569 PyObject *rdnt;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	570 PyObject attr = NULL; / tuple to hold an attribute */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	571 int entry_count = X509_NAME_entry_count(xname);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	572 X509_NAME_ENTRY *entry;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	573 ASN1_OBJECT *name;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	574 ASN1_STRING *value;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	575 int index_counter;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	576 int rdn_level = -1;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	577 int retcode;
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	578
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	579 dn = PyList_New(0);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	580 if (dn == NULL)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	581 return NULL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	582 /* now create another tuple to hold the top-level RDN */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	583 rdn = PyList_New(0);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	584 if (rdn == NULL)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	585 goto fail0;
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	586
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	587 for (index_counter = 0;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	588 index_counter < entry_count;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	589 index_counter++)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	590 {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	591 entry = X509_NAME_get_entry(xname, index_counter);
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	592
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	593 /* check to see if we've gotten to a new RDN */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	594 if (rdn_level >= 0) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	595 if (rdn_level != entry->set) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	596 /* yes, new RDN */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	597 /* add old RDN to DN */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	598 rdnt = PyList_AsTuple(rdn);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	599 Py_DECREF(rdn);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	600 if (rdnt == NULL)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	601 goto fail0;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	602 retcode = PyList_Append(dn, rdnt);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	603 Py_DECREF(rdnt);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	604 if (retcode < 0)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	605 goto fail0;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	606 /* create new RDN */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	607 rdn = PyList_New(0);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	608 if (rdn == NULL)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	609 goto fail0;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	610 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	611 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	612 rdn_level = entry->set;
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	613
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	614 /* now add this attribute to the current RDN */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	615 name = X509_NAME_ENTRY_get_object(entry);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	616 value = X509_NAME_ENTRY_get_data(entry);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	617 attr = _create_tuple_for_attribute(name, value);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	618 /*
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	619 fprintf(stderr, "RDN level %d, attribute %s: %s\n",
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	620 entry->set,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	621 PyBytes_AS_STRING(PyTuple_GET_ITEM(attr, 0)),
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	622 PyBytes_AS_STRING(PyTuple_GET_ITEM(attr, 1)));
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	623 */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	624 if (attr == NULL)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	625 goto fail1;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	626 retcode = PyList_Append(rdn, attr);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	627 Py_DECREF(attr);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	628 if (retcode < 0)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	629 goto fail1;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	630 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	631 /* now, there's typically a dangling RDN */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	632 if ((rdn != NULL) && (PyList_Size(rdn) > 0)) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	633 rdnt = PyList_AsTuple(rdn);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	634 Py_DECREF(rdn);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	635 if (rdnt == NULL)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	636 goto fail0;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	637 retcode = PyList_Append(dn, rdnt);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	638 Py_DECREF(rdnt);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	639 if (retcode < 0)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	640 goto fail0;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	641 }
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	642
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	643 /* convert list to tuple */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	644 rdnt = PyList_AsTuple(dn);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	645 Py_DECREF(dn);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	646 if (rdnt == NULL)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	647 return NULL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	648 return rdnt;
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	649
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	650 fail1:
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	651 Py_XDECREF(rdn);
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	652
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	653 fail0:
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	654 Py_XDECREF(dn);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	655 return NULL;
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	656 }
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	657
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	658 static PyObject *
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	659 _get_peer_alt_names (X509 *certificate) {
43948 8e0c4c710375 Make read() and certificate() return bytes instead of bytearray instances. Guido van Rossum <guido@python.org> parents: 43869 diff changeset	660
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	661 /* this code follows the procedure outlined in
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	662 OpenSSL's crypto/x509v3/v3_prn.c:X509v3_EXT_print()
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	663 function to extract the STACK_OF(GENERAL_NAME),
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	664 then iterates through the stack to add the
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	665 names. */
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	666
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	667 int i, j;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	668 PyObject *peer_alt_names = Py_None;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	669 PyObject v, t;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	670 X509_EXTENSION *ext = NULL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	671 GENERAL_NAMES *names = NULL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	672 GENERAL_NAME *name;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	673 X509V3_EXT_METHOD *method;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	674 BIO *biobuf = NULL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	675 char buf[2048];
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	676 char *vptr;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	677 int len;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	678 /* Issue #2973: ASN1_item_d2i() API changed in OpenSSL 0.9.6m */
59279 951c97e2878d Merged revisions 78598 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 54917 diff changeset	679 #if OPENSSL_VERSION_NUMBER >= 0x009060dfL
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	680 const unsigned char *p;
59279 951c97e2878d Merged revisions 78598 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 54917 diff changeset	681 #else
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	682 unsigned char *p;
59279 951c97e2878d Merged revisions 78598 via svnmerge from Victor Stinner <victor.stinner@haypocalc.com> parents: 54917 diff changeset	683 #endif
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	684
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	685 if (certificate == NULL)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	686 return peer_alt_names;
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	687
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	688 /* get a memory buffer */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	689 biobuf = BIO_new(BIO_s_mem());
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	690
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	691 i = 0;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	692 while ((i = X509_get_ext_by_NID(
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	693 certificate, NID_subject_alt_name, i)) >= 0) {
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	694
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	695 if (peer_alt_names == Py_None) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	696 peer_alt_names = PyList_New(0);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	697 if (peer_alt_names == NULL)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	698 goto fail;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	699 }
43948 8e0c4c710375 Make read() and certificate() return bytes instead of bytearray instances. Guido van Rossum <guido@python.org> parents: 43869 diff changeset	700
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	701 /* now decode the altName */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	702 ext = X509_get_ext(certificate, i);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	703 if(!(method = X509V3_EXT_get(ext))) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	704 PyErr_SetString
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	705 (PySSLErrorObject,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	706 ERRSTR("No method for internalizing subjectAltName!"));
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	707 goto fail;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	708 }
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	709
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	710 p = ext->value->data;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	711 if (method->it)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	712 names = (GENERAL_NAMES*)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	713 (ASN1_item_d2i(NULL,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	714 &p,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	715 ext->value->length,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	716 ASN1_ITEM_ptr(method->it)));
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	717 else
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	718 names = (GENERAL_NAMES*)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	719 (method->d2i(NULL,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	720 &p,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	721 ext->value->length));
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	722
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	723 for(j = 0; j < sk_GENERAL_NAME_num(names); j++) {
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	724
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	725 /* get a rendering of each name in the set of names */
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	726
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	727 name = sk_GENERAL_NAME_value(names, j);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	728 if (name->type == GEN_DIRNAME) {
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	729
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	730 /* we special-case DirName as a tuple of
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	731 tuples of attributes */
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	732
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	733 t = PyTuple_New(2);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	734 if (t == NULL) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	735 goto fail;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	736 }
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	737
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	738 v = PyUnicode_FromString("DirName");
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	739 if (v == NULL) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	740 Py_DECREF(t);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	741 goto fail;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	742 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	743 PyTuple_SET_ITEM(t, 0, v);
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	744
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	745 v = _create_tuple_for_X509_NAME (name->d.dirn);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	746 if (v == NULL) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	747 Py_DECREF(t);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	748 goto fail;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	749 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	750 PyTuple_SET_ITEM(t, 1, v);
43948 8e0c4c710375 Make read() and certificate() return bytes instead of bytearray instances. Guido van Rossum <guido@python.org> parents: 43869 diff changeset	751
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	752 } else {
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	753
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	754 /* for everything else, we use the OpenSSL print form */
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	755
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	756 (void) BIO_reset(biobuf);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	757 GENERAL_NAME_print(biobuf, name);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	758 len = BIO_gets(biobuf, buf, sizeof(buf)-1);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	759 if (len < 0) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	760 _setSSLError(NULL, 0, __FILE__, __LINE__);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	761 goto fail;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	762 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	763 vptr = strchr(buf, ':');
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	764 if (vptr == NULL)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	765 goto fail;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	766 t = PyTuple_New(2);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	767 if (t == NULL)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	768 goto fail;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	769 v = PyUnicode_FromStringAndSize(buf, (vptr - buf));
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	770 if (v == NULL) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	771 Py_DECREF(t);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	772 goto fail;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	773 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	774 PyTuple_SET_ITEM(t, 0, v);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	775 v = PyUnicode_FromStringAndSize((vptr + 1),
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	776 (len - (vptr - buf + 1)));
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	777 if (v == NULL) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	778 Py_DECREF(t);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	779 goto fail;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	780 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	781 PyTuple_SET_ITEM(t, 1, v);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	782 }
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	783
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	784 /* and add that rendering to the list */
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	785
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	786 if (PyList_Append(peer_alt_names, t) < 0) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	787 Py_DECREF(t);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	788 goto fail;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	789 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	790 Py_DECREF(t);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	791 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	792 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	793 BIO_free(biobuf);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	794 if (peer_alt_names != Py_None) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	795 v = PyList_AsTuple(peer_alt_names);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	796 Py_DECREF(peer_alt_names);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	797 return v;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	798 } else {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	799 return peer_alt_names;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	800 }
43948 8e0c4c710375 Make read() and certificate() return bytes instead of bytearray instances. Guido van Rossum <guido@python.org> parents: 43869 diff changeset	801
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	802
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	803 fail:
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	804 if (biobuf != NULL)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	805 BIO_free(biobuf);
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	806
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	807 if (peer_alt_names != Py_None) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	808 Py_XDECREF(peer_alt_names);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	809 }
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	810
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	811 return NULL;
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	812 }
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	813
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	814 static PyObject *
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	815 _decode_certificate (X509 *certificate, int verbose) {
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	816
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	817 PyObject *retval = NULL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	818 BIO *biobuf = NULL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	819 PyObject *peer;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	820 PyObject *peer_alt_names = NULL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	821 PyObject *issuer;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	822 PyObject *version;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	823 PyObject *sn_obj;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	824 ASN1_INTEGER *serialNumber;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	825 char buf[2048];
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	826 int len;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	827 ASN1_TIME notBefore, notAfter;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	828 PyObject pnotBefore, pnotAfter;
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	829
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	830 retval = PyDict_New();
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	831 if (retval == NULL)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	832 return NULL;
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	833
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	834 peer = _create_tuple_for_X509_NAME(
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	835 X509_get_subject_name(certificate));
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	836 if (peer == NULL)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	837 goto fail0;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	838 if (PyDict_SetItemString(retval, (const char *) "subject", peer) < 0) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	839 Py_DECREF(peer);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	840 goto fail0;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	841 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	842 Py_DECREF(peer);
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	843
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	844 if (verbose) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	845 issuer = _create_tuple_for_X509_NAME(
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	846 X509_get_issuer_name(certificate));
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	847 if (issuer == NULL)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	848 goto fail0;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	849 if (PyDict_SetItemString(retval, (const char *)"issuer", issuer) < 0) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	850 Py_DECREF(issuer);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	851 goto fail0;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	852 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	853 Py_DECREF(issuer);
43948 8e0c4c710375 Make read() and certificate() return bytes instead of bytearray instances. Guido van Rossum <guido@python.org> parents: 43869 diff changeset	854
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	855 version = PyLong_FromLong(X509_get_version(certificate) + 1);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	856 if (PyDict_SetItemString(retval, "version", version) < 0) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	857 Py_DECREF(version);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	858 goto fail0;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	859 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	860 Py_DECREF(version);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	861 }
43948 8e0c4c710375 Make read() and certificate() return bytes instead of bytearray instances. Guido van Rossum <guido@python.org> parents: 43869 diff changeset	862
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	863 /* get a memory buffer */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	864 biobuf = BIO_new(BIO_s_mem());
43948 8e0c4c710375 Make read() and certificate() return bytes instead of bytearray instances. Guido van Rossum <guido@python.org> parents: 43869 diff changeset	865
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	866 if (verbose) {
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	867
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	868 (void) BIO_reset(biobuf);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	869 serialNumber = X509_get_serialNumber(certificate);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	870 /* should not exceed 20 octets, 160 bits, so buf is big enough */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	871 i2a_ASN1_INTEGER(biobuf, serialNumber);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	872 len = BIO_gets(biobuf, buf, sizeof(buf)-1);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	873 if (len < 0) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	874 _setSSLError(NULL, 0, __FILE__, __LINE__);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	875 goto fail1;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	876 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	877 sn_obj = PyUnicode_FromStringAndSize(buf, len);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	878 if (sn_obj == NULL)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	879 goto fail1;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	880 if (PyDict_SetItemString(retval, "serialNumber", sn_obj) < 0) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	881 Py_DECREF(sn_obj);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	882 goto fail1;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	883 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	884 Py_DECREF(sn_obj);
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	885
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	886 (void) BIO_reset(biobuf);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	887 notBefore = X509_get_notBefore(certificate);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	888 ASN1_TIME_print(biobuf, notBefore);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	889 len = BIO_gets(biobuf, buf, sizeof(buf)-1);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	890 if (len < 0) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	891 _setSSLError(NULL, 0, __FILE__, __LINE__);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	892 goto fail1;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	893 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	894 pnotBefore = PyUnicode_FromStringAndSize(buf, len);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	895 if (pnotBefore == NULL)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	896 goto fail1;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	897 if (PyDict_SetItemString(retval, "notBefore", pnotBefore) < 0) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	898 Py_DECREF(pnotBefore);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	899 goto fail1;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	900 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	901 Py_DECREF(pnotBefore);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	902 }
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	903
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	904 (void) BIO_reset(biobuf);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	905 notAfter = X509_get_notAfter(certificate);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	906 ASN1_TIME_print(biobuf, notAfter);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	907 len = BIO_gets(biobuf, buf, sizeof(buf)-1);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	908 if (len < 0) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	909 _setSSLError(NULL, 0, __FILE__, __LINE__);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	910 goto fail1;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	911 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	912 pnotAfter = PyUnicode_FromStringAndSize(buf, len);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	913 if (pnotAfter == NULL)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	914 goto fail1;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	915 if (PyDict_SetItemString(retval, "notAfter", pnotAfter) < 0) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	916 Py_DECREF(pnotAfter);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	917 goto fail1;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	918 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	919 Py_DECREF(pnotAfter);
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	920
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	921 /* Now look for subjectAltName */
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	922
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	923 peer_alt_names = _get_peer_alt_names(certificate);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	924 if (peer_alt_names == NULL)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	925 goto fail1;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	926 else if (peer_alt_names != Py_None) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	927 if (PyDict_SetItemString(retval, "subjectAltName",
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	928 peer_alt_names) < 0) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	929 Py_DECREF(peer_alt_names);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	930 goto fail1;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	931 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	932 Py_DECREF(peer_alt_names);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	933 }
43948 8e0c4c710375 Make read() and certificate() return bytes instead of bytearray instances. Guido van Rossum <guido@python.org> parents: 43869 diff changeset	934
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	935 BIO_free(biobuf);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	936 return retval;
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	937
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	938 fail1:
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	939 if (biobuf != NULL)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	940 BIO_free(biobuf);
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	941 fail0:
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	942 Py_XDECREF(retval);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	943 return NULL;
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	944 }
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	945
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	946
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	947 static PyObject *
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	948 PySSL_test_decode_certificate (PyObject mod, PyObject args) {
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	949
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	950 PyObject *retval = NULL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	951 char *filename = NULL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	952 X509 *x=NULL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	953 BIO *cert;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	954 int verbose = 1;
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	955
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	956 if (!PyArg_ParseTuple(args, "s\|i:test_decode_certificate",
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	957 &filename, &verbose))
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	958 return NULL;
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	959
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	960 if ((cert=BIO_new(BIO_s_file())) == NULL) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	961 PyErr_SetString(PySSLErrorObject,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	962 "Can't malloc memory to read file");
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	963 goto fail0;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	964 }
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	965
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	966 if (BIO_read_filename(cert,filename) <= 0) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	967 PyErr_SetString(PySSLErrorObject,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	968 "Can't open file");
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	969 goto fail0;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	970 }
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	971
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	972 x = PEM_read_bio_X509_AUX(cert,NULL, NULL, NULL);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	973 if (x == NULL) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	974 PyErr_SetString(PySSLErrorObject,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	975 "Error decoding PEM-encoded file");
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	976 goto fail0;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	977 }
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	978
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	979 retval = _decode_certificate(x, verbose);
63694 c4bbda2d4c49 Merged revisions 83677 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 62489 diff changeset	980 X509_free(x);
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	981
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	982 fail0:
43948 8e0c4c710375 Make read() and certificate() return bytes instead of bytearray instances. Guido van Rossum <guido@python.org> parents: 43869 diff changeset	983
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	984 if (cert != NULL) BIO_free(cert);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	985 return retval;
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	986 }
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	987
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	988
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	989 static PyObject *
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	990 PySSL_peercert(PySSLObject self, PyObject args)
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	991 {
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	992 PyObject *retval = NULL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	993 int len;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	994 int verification;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	995 PyObject *binary_mode = Py_None;
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	996
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	997 if (!PyArg_ParseTuple(args, "\|O:peer_certificate", &binary_mode))
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	998 return NULL;
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	999
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1000 if (!self->peer_cert)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1001 Py_RETURN_NONE;
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1002
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1003 if (PyObject_IsTrue(binary_mode)) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1004 /* return cert in DER-encoded format */
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1005
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1006 unsigned char *bytes_buf = NULL;
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1007
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1008 bytes_buf = NULL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1009 len = i2d_X509(self->peer_cert, &bytes_buf);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1010 if (len < 0) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1011 PySSL_SetError(self, len, __FILE__, __LINE__);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1012 return NULL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1013 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1014 /* this is actually an immutable bytes sequence */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1015 retval = PyBytes_FromStringAndSize
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1016 ((const char *) bytes_buf, len);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1017 OPENSSL_free(bytes_buf);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1018 return retval;
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1019
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1020 } else {
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1021
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1022 verification = SSL_CTX_get_verify_mode(self->ctx);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1023 if ((verification & SSL_VERIFY_PEER) == 0)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1024 return PyDict_New();
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1025 else
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1026 return _decode_certificate (self->peer_cert, 0);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1027 }
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1028 }
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1029
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1030 PyDoc_STRVAR(PySSL_peercert_doc,
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1031 "peer_certificate([der=False]) -> certificate\n\
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1032 \n\
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1033 Returns the certificate for the peer. If no certificate was provided,\n\
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1034 returns None. If a certificate was provided, but not validated, returns\n\
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1035 an empty dictionary. Otherwise returns a dict containing information\n\
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1036 about the peer certificate.\n\
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1037 \n\
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1038 If the optional argument is True, returns a DER-encoded copy of the\n\
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1039 peer certificate, or None if no certificate was provided. This will\n\
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1040 return the certificate even if it wasn't validated.");
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1041
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1042 static PyObject PySSL_cipher (PySSLObject self) {
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1043
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1044 PyObject retval, v;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1045 SSL_CIPHER *current;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1046 char *cipher_name;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1047 char *cipher_protocol;
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1048
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1049 if (self->ssl == NULL)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1050 return Py_None;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1051 current = SSL_get_current_cipher(self->ssl);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1052 if (current == NULL)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1053 return Py_None;
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1054
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1055 retval = PyTuple_New(3);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1056 if (retval == NULL)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1057 return NULL;
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1058
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1059 cipher_name = (char *) SSL_CIPHER_get_name(current);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1060 if (cipher_name == NULL) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1061 PyTuple_SET_ITEM(retval, 0, Py_None);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1062 } else {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1063 v = PyUnicode_FromString(cipher_name);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1064 if (v == NULL)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1065 goto fail0;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1066 PyTuple_SET_ITEM(retval, 0, v);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1067 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1068 cipher_protocol = SSL_CIPHER_get_version(current);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1069 if (cipher_protocol == NULL) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1070 PyTuple_SET_ITEM(retval, 1, Py_None);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1071 } else {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1072 v = PyUnicode_FromString(cipher_protocol);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1073 if (v == NULL)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1074 goto fail0;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1075 PyTuple_SET_ITEM(retval, 1, v);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1076 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1077 v = PyLong_FromLong(SSL_CIPHER_get_bits(current, NULL));
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1078 if (v == NULL)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1079 goto fail0;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1080 PyTuple_SET_ITEM(retval, 2, v);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1081 return retval;
43948 8e0c4c710375 Make read() and certificate() return bytes instead of bytearray instances. Guido van Rossum <guido@python.org> parents: 43869 diff changeset	1082
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1083 fail0:
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1084 Py_DECREF(retval);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1085 return NULL;
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1086 }
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1087
44206 ce280a04f55e Reverting revision 59394. We'll sort this out later. Guido van Rossum <guido@python.org> parents: 44205 diff changeset	1088 static void PySSL_dealloc(PySSLObject *self)
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1089 {
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1090 if (self->peer_cert) /* Possible not to have one? */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1091 X509_free (self->peer_cert);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1092 if (self->ssl)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1093 SSL_free(self->ssl);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1094 if (self->ctx)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1095 SSL_CTX_free(self->ctx);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1096 Py_XDECREF(self->Socket);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1097 PyObject_Del(self);
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1098 }
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1099
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1100 /* If the socket has a timeout, do a select()/poll() on the socket.
27430 1ae0b142370e Support socket timeout in SSL, by Geoff Talvola. Guido van Rossum <guido@python.org> parents: 24471 diff changeset	1101 The argument writing indicates the direction.
32599 598a5ce63322 [Patch #945642] Fix non-blocking SSL sockets, which blocked on reads/writes in Python 2.3. Andrew M. Kuchling <amk@amk.ca> parents: 31790 diff changeset	1102 Returns one of the possibilities in the timeout_state enum (above).
27430 1ae0b142370e Support socket timeout in SSL, by Geoff Talvola. Guido van Rossum <guido@python.org> parents: 24471 diff changeset	1103 */
32599 598a5ce63322 [Patch #945642] Fix non-blocking SSL sockets, which blocked on reads/writes in Python 2.3. Andrew M. Kuchling <amk@amk.ca> parents: 31790 diff changeset	1104
27430 1ae0b142370e Support socket timeout in SSL, by Geoff Talvola. Guido van Rossum <guido@python.org> parents: 24471 diff changeset	1105 static int
32599 598a5ce63322 [Patch #945642] Fix non-blocking SSL sockets, which blocked on reads/writes in Python 2.3. Andrew M. Kuchling <amk@amk.ca> parents: 31790 diff changeset	1106 check_socket_and_wait_for_timeout(PySocketSockObject *s, int writing)
27430 1ae0b142370e Support socket timeout in SSL, by Geoff Talvola. Guido van Rossum <guido@python.org> parents: 24471 diff changeset	1107 {
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1108 fd_set fds;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1109 struct timeval tv;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1110 int rc;
27430 1ae0b142370e Support socket timeout in SSL, by Geoff Talvola. Guido van Rossum <guido@python.org> parents: 24471 diff changeset	1111
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1112 /* Nothing to do unless we're in timeout mode (not non-blocking) */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1113 if (s->sock_timeout < 0.0)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1114 return SOCKET_IS_BLOCKING;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1115 else if (s->sock_timeout == 0.0)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1116 return SOCKET_IS_NONBLOCKING;
27430 1ae0b142370e Support socket timeout in SSL, by Geoff Talvola. Guido van Rossum <guido@python.org> parents: 24471 diff changeset	1117
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1118 /* Guard against closed socket */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1119 if (s->sock_fd < 0)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1120 return SOCKET_HAS_BEEN_CLOSED;
27430 1ae0b142370e Support socket timeout in SSL, by Geoff Talvola. Guido van Rossum <guido@python.org> parents: 24471 diff changeset	1121
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1122 /* Prefer poll, if available, since you can poll() any fd
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1123 * which can't be done with select(). */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1124 #ifdef HAVE_POLL
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1125 {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1126 struct pollfd pollfd;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1127 int timeout;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1128
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1129 pollfd.fd = s->sock_fd;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1130 pollfd.events = writing ? POLLOUT : POLLIN;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1131
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1132 /* s->sock_timeout is in seconds, timeout in ms */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1133 timeout = (int)(s->sock_timeout * 1000 + 0.5);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1134 PySSL_BEGIN_ALLOW_THREADS
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1135 rc = poll(&pollfd, 1, timeout);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1136 PySSL_END_ALLOW_THREADS
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1137
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1138 goto normal_return;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1139 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1140 #endif
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1141
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1142 /* Guard against socket too large for select*/
36476 c073dffbe70e Introduce Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE. Martin v. Löwis <martin@v.loewis.de> parents: 36452 diff changeset	1143 #ifndef Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1144 if (s->sock_fd >= FD_SETSIZE)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1145 return SOCKET_TOO_LARGE_FOR_SELECT;
36476 c073dffbe70e Introduce Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE. Martin v. Löwis <martin@v.loewis.de> parents: 36452 diff changeset	1146 #endif
36452 7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36451 diff changeset	1147
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1148 /* Construct the arguments to select */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1149 tv.tv_sec = (int)s->sock_timeout;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1150 tv.tv_usec = (int)((s->sock_timeout - tv.tv_sec) * 1e6);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1151 FD_ZERO(&fds);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1152 FD_SET(s->sock_fd, &fds);
27430 1ae0b142370e Support socket timeout in SSL, by Geoff Talvola. Guido van Rossum <guido@python.org> parents: 24471 diff changeset	1153
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1154 /* See if the socket is ready */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1155 PySSL_BEGIN_ALLOW_THREADS
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1156 if (writing)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1157 rc = select(s->sock_fd+1, NULL, &fds, NULL, &tv);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1158 else
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1159 rc = select(s->sock_fd+1, &fds, NULL, NULL, &tv);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1160 PySSL_END_ALLOW_THREADS
27430 1ae0b142370e Support socket timeout in SSL, by Geoff Talvola. Guido van Rossum <guido@python.org> parents: 24471 diff changeset	1161
43869 b59825d9db8f get SSL support to work again Bill Janssen <janssen@parc.com> parents: 43400 diff changeset	1162 #ifdef HAVE_POLL
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1163 normal_return:
43869 b59825d9db8f get SSL support to work again Bill Janssen <janssen@parc.com> parents: 43400 diff changeset	1164 #endif
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1165 /* Return SOCKET_TIMED_OUT on timeout, SOCKET_OPERATION_OK otherwise
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1166 (when we are able to write or when there's something to read) */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1167 return rc == 0 ? SOCKET_HAS_TIMED_OUT : SOCKET_OPERATION_OK;
27430 1ae0b142370e Support socket timeout in SSL, by Geoff Talvola. Guido van Rossum <guido@python.org> parents: 24471 diff changeset	1168 }
1ae0b142370e Support socket timeout in SSL, by Geoff Talvola. Guido van Rossum <guido@python.org> parents: 24471 diff changeset	1169
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1170 static PyObject PySSL_SSLwrite(PySSLObject self, PyObject *args)
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1171 {
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1172 char *data;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1173 int len;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1174 int count;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1175 int sockstate;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1176 int err;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1177 int nonblocking;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1178 PySocketSockObject *sock
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1179 = (PySocketSockObject *) PyWeakref_GetObject(self->Socket);
44305 19f894ae864a update to fix leak in SSL code Bill Janssen <janssen@parc.com> parents: 44206 diff changeset	1180
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1181 if (((PyObject*)sock) == Py_None) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1182 _setSSLError("Underlying socket connection gone",
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1183 PY_SSL_ERROR_NO_SOCKET, __FILE__, __LINE__);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1184 return NULL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1185 }
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1186 Py_INCREF(sock);
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1187
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1188 if (!PyArg_ParseTuple(args, "y#:write", &data, &count)) {
b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1189 Py_DECREF(sock);
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1190 return NULL;
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1191 }
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1192
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1193 /* just in case the blocking state of the socket has been changed */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1194 nonblocking = (sock->sock_timeout >= 0.0);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1195 BIO_set_nbio(SSL_get_rbio(self->ssl), nonblocking);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1196 BIO_set_nbio(SSL_get_wbio(self->ssl), nonblocking);
43869 b59825d9db8f get SSL support to work again Bill Janssen <janssen@parc.com> parents: 43400 diff changeset	1197
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1198 sockstate = check_socket_and_wait_for_timeout(sock, 1);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1199 if (sockstate == SOCKET_HAS_TIMED_OUT) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1200 PyErr_SetString(PySSLErrorObject,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1201 "The write operation timed out");
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1202 goto error;
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1203 } else if (sockstate == SOCKET_HAS_BEEN_CLOSED) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1204 PyErr_SetString(PySSLErrorObject,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1205 "Underlying socket has been closed.");
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1206 goto error;
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1207 } else if (sockstate == SOCKET_TOO_LARGE_FOR_SELECT) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1208 PyErr_SetString(PySSLErrorObject,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1209 "Underlying socket too large for select().");
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1210 goto error;
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1211 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1212 do {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1213 err = 0;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1214 PySSL_BEGIN_ALLOW_THREADS
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1215 len = SSL_write(self->ssl, data, count);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1216 err = SSL_get_error(self->ssl, len);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1217 PySSL_END_ALLOW_THREADS
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1218 if (PyErr_CheckSignals())
b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1219 goto error;
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1220 if (err == SSL_ERROR_WANT_READ) {
61537 330273ec6028 Merged revisions 81116 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61246 diff changeset	1221 sockstate = check_socket_and_wait_for_timeout(sock, 0);
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1222 } else if (err == SSL_ERROR_WANT_WRITE) {
61537 330273ec6028 Merged revisions 81116 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61246 diff changeset	1223 sockstate = check_socket_and_wait_for_timeout(sock, 1);
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1224 } else {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1225 sockstate = SOCKET_OPERATION_OK;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1226 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1227 if (sockstate == SOCKET_HAS_TIMED_OUT) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1228 PyErr_SetString(PySSLErrorObject,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1229 "The write operation timed out");
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1230 goto error;
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1231 } else if (sockstate == SOCKET_HAS_BEEN_CLOSED) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1232 PyErr_SetString(PySSLErrorObject,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1233 "Underlying socket has been closed.");
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1234 goto error;
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1235 } else if (sockstate == SOCKET_IS_NONBLOCKING) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1236 break;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1237 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1238 } while (err == SSL_ERROR_WANT_READ \|\| err == SSL_ERROR_WANT_WRITE);
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1239
b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1240 Py_DECREF(sock);
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1241 if (len > 0)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1242 return PyLong_FromLong(len);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1243 else
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1244 return PySSL_SetError(self, len, __FILE__, __LINE__);
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1245
b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1246 error:
b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1247 Py_DECREF(sock);
b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1248 return NULL;
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1249 }
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1250
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23295 diff changeset	1251 PyDoc_STRVAR(PySSL_SSLwrite_doc,
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1252 "write(s) -> len\n\
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1253 \n\
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1254 Writes the string s into the SSL object. Returns the number\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23295 diff changeset	1255 of bytes written.");
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1256
43869 b59825d9db8f get SSL support to work again Bill Janssen <janssen@parc.com> parents: 43400 diff changeset	1257 static PyObject PySSL_SSLpending(PySSLObject self)
b59825d9db8f get SSL support to work again Bill Janssen <janssen@parc.com> parents: 43400 diff changeset	1258 {
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1259 int count = 0;
43869 b59825d9db8f get SSL support to work again Bill Janssen <janssen@parc.com> parents: 43400 diff changeset	1260
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1261 PySSL_BEGIN_ALLOW_THREADS
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1262 count = SSL_pending(self->ssl);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1263 PySSL_END_ALLOW_THREADS
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1264 if (count < 0)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1265 return PySSL_SetError(self, count, __FILE__, __LINE__);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1266 else
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1267 return PyLong_FromLong(count);
43869 b59825d9db8f get SSL support to work again Bill Janssen <janssen@parc.com> parents: 43400 diff changeset	1268 }
b59825d9db8f get SSL support to work again Bill Janssen <janssen@parc.com> parents: 43400 diff changeset	1269
b59825d9db8f get SSL support to work again Bill Janssen <janssen@parc.com> parents: 43400 diff changeset	1270 PyDoc_STRVAR(PySSL_SSLpending_doc,
b59825d9db8f get SSL support to work again Bill Janssen <janssen@parc.com> parents: 43400 diff changeset	1271 "pending() -> count\n\
b59825d9db8f get SSL support to work again Bill Janssen <janssen@parc.com> parents: 43400 diff changeset	1272 \n\
b59825d9db8f get SSL support to work again Bill Janssen <janssen@parc.com> parents: 43400 diff changeset	1273 Returns the number of already decrypted bytes available for read,\n\
b59825d9db8f get SSL support to work again Bill Janssen <janssen@parc.com> parents: 43400 diff changeset	1274 pending on the connection.\n");
b59825d9db8f get SSL support to work again Bill Janssen <janssen@parc.com> parents: 43400 diff changeset	1275
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1276 static PyObject PySSL_SSLread(PySSLObject self, PyObject *args)
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1277 {
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1278 PyObject *dest = NULL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1279 Py_buffer buf;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1280 int buf_passed = 0;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1281 int count = -1;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1282 char *mem;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1283 /* XXX this should use Py_ssize_t */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1284 int len = 1024;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1285 int sockstate;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1286 int err;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1287 int nonblocking;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1288 PySocketSockObject *sock
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1289 = (PySocketSockObject *) PyWeakref_GetObject(self->Socket);
44305 19f894ae864a update to fix leak in SSL code Bill Janssen <janssen@parc.com> parents: 44206 diff changeset	1290
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1291 if (((PyObject*)sock) == Py_None) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1292 _setSSLError("Underlying socket connection gone",
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1293 PY_SSL_ERROR_NO_SOCKET, __FILE__, __LINE__);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1294 return NULL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1295 }
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1296 Py_INCREF(sock);
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1297
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1298 if (!PyArg_ParseTuple(args, "\|Oi:read", &dest, &count))
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1299 goto error;
b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1300
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1301 if ((dest == NULL) \|\| (dest == Py_None)) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1302 if (!(dest = PyByteArray_FromStringAndSize((char *) 0, len)))
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1303 goto error;
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1304 mem = PyByteArray_AS_STRING(dest);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1305 } else if (PyLong_Check(dest)) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1306 len = PyLong_AS_LONG(dest);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1307 if (!(dest = PyByteArray_FromStringAndSize((char *) 0, len)))
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1308 goto error;
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1309 mem = PyByteArray_AS_STRING(dest);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1310 } else {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1311 if (PyObject_GetBuffer(dest, &buf, PyBUF_CONTIG) < 0)
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1312 goto error;
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1313 mem = buf.buf;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1314 len = buf.len;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1315 if ((count > 0) && (count <= len))
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1316 len = count;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1317 buf_passed = 1;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1318 }
43869 b59825d9db8f get SSL support to work again Bill Janssen <janssen@parc.com> parents: 43400 diff changeset	1319
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1320 /* just in case the blocking state of the socket has been changed */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1321 nonblocking = (sock->sock_timeout >= 0.0);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1322 BIO_set_nbio(SSL_get_rbio(self->ssl), nonblocking);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1323 BIO_set_nbio(SSL_get_wbio(self->ssl), nonblocking);
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42847 diff changeset	1324
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1325 /* first check if there are bytes ready to be read */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1326 PySSL_BEGIN_ALLOW_THREADS
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1327 count = SSL_pending(self->ssl);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1328 PySSL_END_ALLOW_THREADS
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1329
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1330 if (!count) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1331 sockstate = check_socket_and_wait_for_timeout(sock, 0);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1332 if (sockstate == SOCKET_HAS_TIMED_OUT) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1333 PyErr_SetString(PySSLErrorObject,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1334 "The read operation timed out");
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1335 goto error;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1336 } else if (sockstate == SOCKET_TOO_LARGE_FOR_SELECT) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1337 PyErr_SetString(PySSLErrorObject,
61537 330273ec6028 Merged revisions 81116 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61246 diff changeset	1338 "Underlying socket too large for select().");
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1339 goto error;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1340 } else if (sockstate == SOCKET_HAS_BEEN_CLOSED) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1341 count = 0;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1342 goto done;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1343 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1344 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1345 do {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1346 err = 0;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1347 PySSL_BEGIN_ALLOW_THREADS
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1348 count = SSL_read(self->ssl, mem, len);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1349 err = SSL_get_error(self->ssl, count);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1350 PySSL_END_ALLOW_THREADS
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1351 if (PyErr_CheckSignals())
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1352 goto error;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1353 if (err == SSL_ERROR_WANT_READ) {
61537 330273ec6028 Merged revisions 81116 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61246 diff changeset	1354 sockstate = check_socket_and_wait_for_timeout(sock, 0);
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1355 } else if (err == SSL_ERROR_WANT_WRITE) {
61537 330273ec6028 Merged revisions 81116 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61246 diff changeset	1356 sockstate = check_socket_and_wait_for_timeout(sock, 1);
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1357 } else if ((err == SSL_ERROR_ZERO_RETURN) &&
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1358 (SSL_get_shutdown(self->ssl) ==
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1359 SSL_RECEIVED_SHUTDOWN))
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1360 {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1361 count = 0;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1362 goto done;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1363 } else {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1364 sockstate = SOCKET_OPERATION_OK;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1365 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1366 if (sockstate == SOCKET_HAS_TIMED_OUT) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1367 PyErr_SetString(PySSLErrorObject,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1368 "The read operation timed out");
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1369 goto error;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1370 } else if (sockstate == SOCKET_IS_NONBLOCKING) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1371 break;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1372 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1373 } while (err == SSL_ERROR_WANT_READ \|\| err == SSL_ERROR_WANT_WRITE);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1374 if (count <= 0) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1375 PySSL_SetError(self, count, __FILE__, __LINE__);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1376 goto error;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1377 }
43948 8e0c4c710375 Make read() and certificate() return bytes instead of bytearray instances. Guido van Rossum <guido@python.org> parents: 43869 diff changeset	1378 done:
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1379 Py_DECREF(sock);
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1380 if (!buf_passed) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1381 PyObject *res = PyBytes_FromStringAndSize(mem, count);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1382 Py_DECREF(dest);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1383 return res;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1384 } else {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1385 PyBuffer_Release(&buf);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1386 return PyLong_FromLong(count);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1387 }
51922 b421441ee679 Merged revisions 70072 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51271 diff changeset	1388 error:
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1389 Py_DECREF(sock);
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1390 if (!buf_passed) {
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1391 Py_XDECREF(dest);
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1392 } else {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1393 PyBuffer_Release(&buf);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1394 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1395 return NULL;
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1396 }
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1397
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23295 diff changeset	1398 PyDoc_STRVAR(PySSL_SSLread_doc,
43869 b59825d9db8f get SSL support to work again Bill Janssen <janssen@parc.com> parents: 43400 diff changeset	1399 "read([len]) -> string\n\
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1400 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23295 diff changeset	1401 Read up to len bytes from the SSL socket.");
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1402
48681 3c8ef3466923 clean up ssl.py; expose unwrap and add test for it Bill Janssen <janssen@parc.com> parents: 48660 diff changeset	1403 static PyObject PySSL_SSLshutdown(PySSLObject self)
3c8ef3466923 clean up ssl.py; expose unwrap and add test for it Bill Janssen <janssen@parc.com> parents: 48660 diff changeset	1404 {
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1405 int err, ssl_err, sockstate, nonblocking;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1406 int zeros = 0;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1407 PySocketSockObject *sock
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1408 = (PySocketSockObject *) PyWeakref_GetObject(self->Socket);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1409
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1410 /* Guard against closed socket */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1411 if ((((PyObject*)sock) == Py_None) \|\| (sock->sock_fd < 0)) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1412 _setSSLError("Underlying socket connection gone",
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1413 PY_SSL_ERROR_NO_SOCKET, __FILE__, __LINE__);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1414 return NULL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1415 }
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1416 Py_INCREF(sock);
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1417
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1418 /* Just in case the blocking state of the socket has been changed */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1419 nonblocking = (sock->sock_timeout >= 0.0);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1420 BIO_set_nbio(SSL_get_rbio(self->ssl), nonblocking);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1421 BIO_set_nbio(SSL_get_wbio(self->ssl), nonblocking);
48681 3c8ef3466923 clean up ssl.py; expose unwrap and add test for it Bill Janssen <janssen@parc.com> parents: 48660 diff changeset	1422
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1423 while (1) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1424 PySSL_BEGIN_ALLOW_THREADS
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1425 /* Disable read-ahead so that unwrap can work correctly.
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1426 * Otherwise OpenSSL might read in too much data,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1427 * eating clear text data that happens to be
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1428 * transmitted after the SSL shutdown.
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1429 * Should be safe to call repeatedly everytime this
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1430 * function is used and the shutdown_seen_zero != 0
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1431 * condition is met.
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1432 */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1433 if (self->shutdown_seen_zero)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1434 SSL_set_read_ahead(self->ssl, 0);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1435 err = SSL_shutdown(self->ssl);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1436 PySSL_END_ALLOW_THREADS
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1437 /* If err == 1, a secure shutdown with SSL_shutdown() is complete */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1438 if (err > 0)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1439 break;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1440 if (err == 0) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1441 /* Don't loop endlessly; instead preserve legacy
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1442 behaviour of trying SSL_shutdown() only twice.
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1443 This looks necessary for OpenSSL < 0.9.8m */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1444 if (++zeros > 1)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1445 break;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1446 /* Shutdown was sent, now try receiving */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1447 self->shutdown_seen_zero = 1;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1448 continue;
48681 3c8ef3466923 clean up ssl.py; expose unwrap and add test for it Bill Janssen <janssen@parc.com> parents: 48660 diff changeset	1449 }
3c8ef3466923 clean up ssl.py; expose unwrap and add test for it Bill Janssen <janssen@parc.com> parents: 48660 diff changeset	1450
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1451 /* Possibly retry shutdown until timeout or failure */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1452 ssl_err = SSL_get_error(self->ssl, err);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1453 if (ssl_err == SSL_ERROR_WANT_READ)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1454 sockstate = check_socket_and_wait_for_timeout(sock, 0);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1455 else if (ssl_err == SSL_ERROR_WANT_WRITE)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1456 sockstate = check_socket_and_wait_for_timeout(sock, 1);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1457 else
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1458 break;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1459 if (sockstate == SOCKET_HAS_TIMED_OUT) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1460 if (ssl_err == SSL_ERROR_WANT_READ)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1461 PyErr_SetString(PySSLErrorObject,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1462 "The read operation timed out");
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1463 else
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1464 PyErr_SetString(PySSLErrorObject,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1465 "The write operation timed out");
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1466 goto error;
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1467 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1468 else if (sockstate == SOCKET_TOO_LARGE_FOR_SELECT) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1469 PyErr_SetString(PySSLErrorObject,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1470 "Underlying socket too large for select().");
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1471 goto error;
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1472 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1473 else if (sockstate != SOCKET_OPERATION_OK)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1474 /* Retain the SSL error code */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1475 break;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1476 }
60901 fc97784e5cc2 Merged revisions 80394 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60818 diff changeset	1477
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1478 if (err < 0) {
b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1479 Py_DECREF(sock);
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1480 return PySSL_SetError(self, err, __FILE__, __LINE__);
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1481 }
b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1482 else
b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1483 /* It's already INCREF'ed */
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1484 return (PyObject *) sock;
62481 b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1485
b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1486 error:
b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1487 Py_DECREF(sock);
b8b0a15f8a7c Merged revisions 82204 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61646 diff changeset	1488 return NULL;
48681 3c8ef3466923 clean up ssl.py; expose unwrap and add test for it Bill Janssen <janssen@parc.com> parents: 48660 diff changeset	1489 }
3c8ef3466923 clean up ssl.py; expose unwrap and add test for it Bill Janssen <janssen@parc.com> parents: 48660 diff changeset	1490
3c8ef3466923 clean up ssl.py; expose unwrap and add test for it Bill Janssen <janssen@parc.com> parents: 48660 diff changeset	1491 PyDoc_STRVAR(PySSL_SSLshutdown_doc,
3c8ef3466923 clean up ssl.py; expose unwrap and add test for it Bill Janssen <janssen@parc.com> parents: 48660 diff changeset	1492 "shutdown(s) -> socket\n\
3c8ef3466923 clean up ssl.py; expose unwrap and add test for it Bill Janssen <janssen@parc.com> parents: 48660 diff changeset	1493 \n\
3c8ef3466923 clean up ssl.py; expose unwrap and add test for it Bill Janssen <janssen@parc.com> parents: 48660 diff changeset	1494 Does the SSL shutdown handshake with the remote end, and returns\n\
3c8ef3466923 clean up ssl.py; expose unwrap and add test for it Bill Janssen <janssen@parc.com> parents: 48660 diff changeset	1495 the underlying socket object.");
3c8ef3466923 clean up ssl.py; expose unwrap and add test for it Bill Janssen <janssen@parc.com> parents: 48660 diff changeset	1496
3c8ef3466923 clean up ssl.py; expose unwrap and add test for it Bill Janssen <janssen@parc.com> parents: 48660 diff changeset	1497
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1498 static PyMethodDef PySSLMethods[] = {
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1499 {"do_handshake", (PyCFunction)PySSL_SSLdo_handshake, METH_NOARGS},
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1500 {"write", (PyCFunction)PySSL_SSLwrite, METH_VARARGS,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1501 PySSL_SSLwrite_doc},
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1502 {"read", (PyCFunction)PySSL_SSLread, METH_VARARGS,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1503 PySSL_SSLread_doc},
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1504 {"pending", (PyCFunction)PySSL_SSLpending, METH_NOARGS,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1505 PySSL_SSLpending_doc},
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1506 {"peer_certificate", (PyCFunction)PySSL_peercert, METH_VARARGS,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1507 PySSL_peercert_doc},
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1508 {"cipher", (PyCFunction)PySSL_cipher, METH_NOARGS},
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1509 {"shutdown", (PyCFunction)PySSL_SSLshutdown, METH_NOARGS,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1510 PySSL_SSLshutdown_doc},
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1511 {NULL, NULL}
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1512 };
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1513
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24086 diff changeset	1514 static PyTypeObject PySSL_Type = {
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1515 PyVarObject_HEAD_INIT(NULL, 0)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1516 "ssl.SSLContext", /tp_name/
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1517 sizeof(PySSLObject), /tp_basicsize/
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1518 0, /tp_itemsize/
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1519 /* methods */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1520 (destructor)PySSL_dealloc, /tp_dealloc/
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1521 0, /tp_print/
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1522 0, /tp_getattr/
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1523 0, /tp_setattr/
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1524 0, /tp_reserved/
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1525 0, /tp_repr/
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1526 0, /tp_as_number/
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1527 0, /tp_as_sequence/
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1528 0, /tp_as_mapping/
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1529 0, /tp_hash/
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1530 0, /tp_call/
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1531 0, /tp_str/
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1532 0, /tp_getattro/
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1533 0, /tp_setattro/
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1534 0, /tp_as_buffer/
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1535 Py_TPFLAGS_DEFAULT, /tp_flags/
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1536 0, /tp_doc/
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1537 0, /tp_traverse/
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1538 0, /tp_clear/
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1539 0, /tp_richcompare/
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1540 0, /tp_weaklistoffset/
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1541 0, /tp_iter/
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1542 0, /tp_iternext/
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1543 PySSLMethods, /tp_methods/
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1544 };
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1545
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1546 #ifdef HAVE_OPENSSL_RAND
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1547
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1548 /* helper routines for seeding the SSL PRNG */
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1549 static PyObject *
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1550 PySSL_RAND_add(PyObject self, PyObject args)
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1551 {
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1552 char *buf;
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1553 int len;
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1554 double entropy;
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1555
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1556 if (!PyArg_ParseTuple(args, "s#d:RAND_add", &buf, &len, &entropy))
61537 330273ec6028 Merged revisions 81116 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61246 diff changeset	1557 return NULL;
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1558 RAND_add(buf, len, entropy);
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1559 Py_INCREF(Py_None);
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1560 return Py_None;
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1561 }
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1562
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23295 diff changeset	1563 PyDoc_STRVAR(PySSL_RAND_add_doc,
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1564 "RAND_add(string, entropy)\n\
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1565 \n\
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1566 Mix string into the OpenSSL PRNG state. entropy (a float) is a lower\n\
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1567 bound on the entropy contained in string. See RFC 1750.");
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1568
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1569 static PyObject *
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1570 PySSL_RAND_status(PyObject *self)
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1571 {
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43948 diff changeset	1572 return PyLong_FromLong(RAND_status());
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1573 }
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1574
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23295 diff changeset	1575 PyDoc_STRVAR(PySSL_RAND_status_doc,
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1576 "RAND_status() -> 0 or 1\n\
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1577 \n\
43869 b59825d9db8f get SSL support to work again Bill Janssen <janssen@parc.com> parents: 43400 diff changeset	1578 Returns 1 if the OpenSSL PRNG has been seeded with enough data and 0 if not.\n\
b59825d9db8f get SSL support to work again Bill Janssen <janssen@parc.com> parents: 43400 diff changeset	1579 It is necessary to seed the PRNG with RAND_add() on some platforms before\n\
b59825d9db8f get SSL support to work again Bill Janssen <janssen@parc.com> parents: 43400 diff changeset	1580 using the ssl() function.");
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1581
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1582 static PyObject *
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1583 PySSL_RAND_egd(PyObject self, PyObject arg)
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1584 {
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1585 int bytes;
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1586
43869 b59825d9db8f get SSL support to work again Bill Janssen <janssen@parc.com> parents: 43400 diff changeset	1587 if (!PyUnicode_Check(arg))
61537 330273ec6028 Merged revisions 81116 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61246 diff changeset	1588 return PyErr_Format(PyExc_TypeError,
330273ec6028 Merged revisions 81116 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61246 diff changeset	1589 "RAND_egd() expected string, found %s",
330273ec6028 Merged revisions 81116 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61246 diff changeset	1590 Py_TYPE(arg)->tp_name);
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 48413 diff changeset	1591 bytes = RAND_egd(_PyUnicode_AsString(arg));
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1592 if (bytes == -1) {
61537 330273ec6028 Merged revisions 81116 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61246 diff changeset	1593 PyErr_SetString(PySSLErrorObject,
330273ec6028 Merged revisions 81116 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61246 diff changeset	1594 "EGD connection failed or EGD did not return "
330273ec6028 Merged revisions 81116 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61246 diff changeset	1595 "enough data to seed the PRNG");
330273ec6028 Merged revisions 81116 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61246 diff changeset	1596 return NULL;
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1597 }
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43948 diff changeset	1598 return PyLong_FromLong(bytes);
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1599 }
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1600
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23295 diff changeset	1601 PyDoc_STRVAR(PySSL_RAND_egd_doc,
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1602 "RAND_egd(path) -> bytes\n\
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1603 \n\
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1604 Queries the entropy gather daemon (EGD) on the socket named by 'path'.\n\
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1605 Returns number of bytes read. Raises SSLError if connection to EGD\n\
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1606 fails or if it does provide enough data to seed PRNG.");
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1607
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1608 #endif
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1609
48681 3c8ef3466923 clean up ssl.py; expose unwrap and add test for it Bill Janssen <janssen@parc.com> parents: 48660 diff changeset	1610
3c8ef3466923 clean up ssl.py; expose unwrap and add test for it Bill Janssen <janssen@parc.com> parents: 48660 diff changeset	1611
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1612 /* List of functions exported by this module. */
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1613
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1614 static PyMethodDef PySSL_methods[] = {
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1615 {"sslwrap", PySSL_sslwrap,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1616 METH_VARARGS, ssl_doc},
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1617 {"_test_decode_cert", PySSL_test_decode_certificate,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1618 METH_VARARGS},
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1619 #ifdef HAVE_OPENSSL_RAND
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1620 {"RAND_add", PySSL_RAND_add, METH_VARARGS,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1621 PySSL_RAND_add_doc},
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1622 {"RAND_egd", PySSL_RAND_egd, METH_O,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1623 PySSL_RAND_egd_doc},
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1624 {"RAND_status", (PyCFunction)PySSL_RAND_status, METH_NOARGS,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1625 PySSL_RAND_status_doc},
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1626 #endif
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1627 {NULL, NULL} /* Sentinel */
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1628 };
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1629
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1630
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1631 #ifdef WITH_THREAD
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1632
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1633 /* an implementation of OpenSSL threading operations in terms
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1634 of the Python C thread library */
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1635
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1636 static PyThread_type_lock *_ssl_locks = NULL;
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1637
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1638 static unsigned long _ssl_thread_id_function (void) {
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1639 return PyThread_get_thread_ident();
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1640 }
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1641
43869 b59825d9db8f get SSL support to work again Bill Janssen <janssen@parc.com> parents: 43400 diff changeset	1642 static void _ssl_thread_locking_function
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1643 (int mode, int n, const char *file, int line) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1644 /* this function is needed to perform locking on shared data
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1645 structures. (Note that OpenSSL uses a number of global data
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1646 structures that will be implicitly shared whenever multiple
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1647 threads use OpenSSL.) Multi-threaded applications will
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1648 crash at random if it is not set.
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1649
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1650 locking_function() must be able to handle up to
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1651 CRYPTO_num_locks() different mutex locks. It sets the n-th
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1652 lock if mode & CRYPTO_LOCK, and releases it otherwise.
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1653
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1654 file and line are the file number of the function setting the
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1655 lock. They can be useful for debugging.
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1656 */
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1657
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1658 if ((_ssl_locks == NULL) \|\|
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1659 (n < 0) \|\| ((unsigned)n >= _ssl_locks_count))
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1660 return;
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1661
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1662 if (mode & CRYPTO_LOCK) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1663 PyThread_acquire_lock(_ssl_locks[n], 1);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1664 } else {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1665 PyThread_release_lock(_ssl_locks[n]);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1666 }
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1667 }
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1668
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1669 static int _setup_ssl_threads(void) {
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1670
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1671 unsigned int i;
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1672
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1673 if (_ssl_locks == NULL) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1674 _ssl_locks_count = CRYPTO_num_locks();
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1675 _ssl_locks = (PyThread_type_lock *)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1676 malloc(sizeof(PyThread_type_lock) * _ssl_locks_count);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1677 if (_ssl_locks == NULL)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1678 return 0;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1679 memset(_ssl_locks, 0,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1680 sizeof(PyThread_type_lock) * _ssl_locks_count);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1681 for (i = 0; i < _ssl_locks_count; i++) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1682 _ssl_locks[i] = PyThread_allocate_lock();
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1683 if (_ssl_locks[i] == NULL) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1684 unsigned int j;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1685 for (j = 0; j < i; j++) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1686 PyThread_free_lock(_ssl_locks[j]);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1687 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1688 free(_ssl_locks);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1689 return 0;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1690 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1691 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1692 CRYPTO_set_locking_callback(_ssl_thread_locking_function);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1693 CRYPTO_set_id_callback(_ssl_thread_id_function);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1694 }
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1695 return 1;
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1696 }
1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1697
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1698 #endif /* def HAVE_THREAD */
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1699
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23295 diff changeset	1700 PyDoc_STRVAR(module_doc,
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1701 "Implementation module for SSL socket operations. See the socket module\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23295 diff changeset	1702 for documentation.");
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1703
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	1704
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	1705 static struct PyModuleDef _sslmodule = {
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1706 PyModuleDef_HEAD_INIT,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1707 "_ssl",
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1708 module_doc,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1709 -1,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1710 PySSL_methods,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1711 NULL,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1712 NULL,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1713 NULL,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1714 NULL
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	1715 };
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	1716
24471 f66b3a3509c7 Excise DL_EXPORT/DL_IMPORT from Modules/. Required adding a prototype Mark Hammond <mhammond@skippinet.com.au>* parents: 24398 diff changeset	1717 PyMODINIT_FUNC
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	1718 PyInit__ssl(void)
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1719 {
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1720 PyObject m, d;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1721 PySocketModule_APIObject *socket_api;
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1722
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1723 if (PyType_Ready(&PySSL_Type) < 0)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1724 return NULL;
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1725
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1726 m = PyModule_Create(&_sslmodule);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1727 if (m == NULL)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1728 return NULL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1729 d = PyModule_GetDict(m);
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1730
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1731 /* Load _socket module and its C API */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1732 socket_api = PySocketModule_ImportModuleAndAPI();
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1733 if (!socket_api)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1734 return NULL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1735 PySocketModule = *socket_api;
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1736
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1737 /* Init OpenSSL */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1738 SSL_load_error_strings();
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1739 SSL_library_init();
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1740 #ifdef WITH_THREAD
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1741 /* note that this will start threading if not already started */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1742 if (!_setup_ssl_threads()) {
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1743 return NULL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1744 }
43400 1bac386c17cc Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from Thomas Wouters <thomas@python.org> parents: 43292 diff changeset	1745 #endif
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1746 OpenSSL_add_all_algorithms();
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1747
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1748 /* Add symbols to module dict */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1749 PySSLErrorObject = PyErr_NewException("ssl.SSLError",
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1750 PySocketModule.error,
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1751 NULL);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1752 if (PySSLErrorObject == NULL)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1753 return NULL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1754 if (PyDict_SetItemString(d, "SSLError", PySSLErrorObject) != 0)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1755 return NULL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1756 if (PyDict_SetItemString(d, "SSLType",
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1757 (PyObject *)&PySSL_Type) != 0)
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1758 return NULL;
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1759 PyModule_AddIntConstant(m, "SSL_ERROR_ZERO_RETURN",
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1760 PY_SSL_ERROR_ZERO_RETURN);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1761 PyModule_AddIntConstant(m, "SSL_ERROR_WANT_READ",
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1762 PY_SSL_ERROR_WANT_READ);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1763 PyModule_AddIntConstant(m, "SSL_ERROR_WANT_WRITE",
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1764 PY_SSL_ERROR_WANT_WRITE);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1765 PyModule_AddIntConstant(m, "SSL_ERROR_WANT_X509_LOOKUP",
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1766 PY_SSL_ERROR_WANT_X509_LOOKUP);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1767 PyModule_AddIntConstant(m, "SSL_ERROR_SYSCALL",
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1768 PY_SSL_ERROR_SYSCALL);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1769 PyModule_AddIntConstant(m, "SSL_ERROR_SSL",
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1770 PY_SSL_ERROR_SSL);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1771 PyModule_AddIntConstant(m, "SSL_ERROR_WANT_CONNECT",
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1772 PY_SSL_ERROR_WANT_CONNECT);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1773 /* non ssl.h errorcodes */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1774 PyModule_AddIntConstant(m, "SSL_ERROR_EOF",
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1775 PY_SSL_ERROR_EOF);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1776 PyModule_AddIntConstant(m, "SSL_ERROR_INVALID_ERROR_CODE",
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1777 PY_SSL_ERROR_INVALID_ERROR_CODE);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1778 /* cert requirements */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1779 PyModule_AddIntConstant(m, "CERT_NONE",
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1780 PY_SSL_CERT_NONE);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1781 PyModule_AddIntConstant(m, "CERT_OPTIONAL",
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1782 PY_SSL_CERT_OPTIONAL);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1783 PyModule_AddIntConstant(m, "CERT_REQUIRED",
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1784 PY_SSL_CERT_REQUIRED);
23190 0bc3a41d4e40 Forward port of patch # 500311: Work around for buggy https servers. Martin v. Löwis <martin@v.loewis.de> parents: 21959 diff changeset	1785
61246 50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1786 /* protocol versions */
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1787 PyModule_AddIntConstant(m, "PROTOCOL_SSLv2",
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1788 PY_SSL_VERSION_SSL2);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1789 PyModule_AddIntConstant(m, "PROTOCOL_SSLv3",
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1790 PY_SSL_VERSION_SSL3);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1791 PyModule_AddIntConstant(m, "PROTOCOL_SSLv23",
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1792 PY_SSL_VERSION_SSL23);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1793 PyModule_AddIntConstant(m, "PROTOCOL_TLSv1",
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1794 PY_SSL_VERSION_TLS1);
50a4ec37361d Merged revisions 80790 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61018 diff changeset	1795 return m;
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1796 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/_ssl.c @ 64166:d0e9febfa00a 3.1