mirror of
https://github.com/python/cpython.git
synced 2024-12-01 11:15:56 +01:00
ed03b4121e
Merged revisions 57392-57619 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r57395 | georg.brandl | 2007-08-24 19:23:23 +0200 (Fri, 24 Aug 2007) | 2 lines Bug #1011: fix rfc822.Message.getheader docs. ........ r57397 | georg.brandl | 2007-08-24 19:38:49 +0200 (Fri, 24 Aug 2007) | 2 lines Patch #1006: port test_winreg to unittest. ........ r57398 | georg.brandl | 2007-08-24 19:46:54 +0200 (Fri, 24 Aug 2007) | 2 lines Fix #1012: wrong URL to :mod:`site` in install/index.rst. ........ r57399 | georg.brandl | 2007-08-24 20:07:52 +0200 (Fri, 24 Aug 2007) | 2 lines Patch #1008: port test_signal to unittest. ........ r57400 | georg.brandl | 2007-08-24 20:22:54 +0200 (Fri, 24 Aug 2007) | 2 lines Port test_frozen to unittest. ........ r57401 | georg.brandl | 2007-08-24 20:27:43 +0200 (Fri, 24 Aug 2007) | 2 lines Document new utility functions in test_support. ........ r57402 | georg.brandl | 2007-08-24 20:30:06 +0200 (Fri, 24 Aug 2007) | 2 lines Remove test_rgbimg output file, there is no test_rgbimg.py. ........ r57403 | georg.brandl | 2007-08-24 20:35:27 +0200 (Fri, 24 Aug 2007) | 2 lines Remove output file for test_ossaudiodev, also properly close the dsp object. ........ r57404 | georg.brandl | 2007-08-24 20:46:27 +0200 (Fri, 24 Aug 2007) | 2 lines Convert test_linuxaudiodev to unittest. Fix a wrong finally clause in test_ossaudiodev. ........ r57406 | collin.winter | 2007-08-24 21:13:58 +0200 (Fri, 24 Aug 2007) | 1 line Convert test_pkg to use unittest. ........ r57408 | georg.brandl | 2007-08-24 21:22:34 +0200 (Fri, 24 Aug 2007) | 2 lines Catch the correct errors. ........ r57409 | georg.brandl | 2007-08-24 21:33:53 +0200 (Fri, 24 Aug 2007) | 2 lines Port test_class to unittest. Patch #1671298. ........ r57415 | collin.winter | 2007-08-24 23:09:42 +0200 (Fri, 24 Aug 2007) | 1 line Make test_structmembers pass when run with regrtests's -R flag. ........ r57455 | nick.coghlan | 2007-08-25 06:32:07 +0200 (Sat, 25 Aug 2007) | 1 line Revert misguided attempt at fixing incompatibility between -m and -i switches (better fix coming soon) ........ r57456 | nick.coghlan | 2007-08-25 06:35:54 +0200 (Sat, 25 Aug 2007) | 1 line Revert compile.c changes that shouldn't have been included in previous checkin ........ r57461 | nick.coghlan | 2007-08-25 12:50:41 +0200 (Sat, 25 Aug 2007) | 1 line Fix bug 1764407 - the -i switch now does the right thing when using the -m switch ........ r57464 | guido.van.rossum | 2007-08-25 17:08:43 +0200 (Sat, 25 Aug 2007) | 4 lines Server-side SSL and certificate validation, by Bill Janssen. While cleaning up Bill's C style, I may have cleaned up some code he didn't touch as well (in _ssl.c). ........ r57465 | neal.norwitz | 2007-08-25 18:41:36 +0200 (Sat, 25 Aug 2007) | 3 lines Try to get this to build with Visual Studio by moving all the variable declarations to the beginning of a scope. ........ r57466 | neal.norwitz | 2007-08-25 18:54:38 +0200 (Sat, 25 Aug 2007) | 1 line Fix test so it is skipped properly if there is no SSL support. ........ r57467 | neal.norwitz | 2007-08-25 18:58:09 +0200 (Sat, 25 Aug 2007) | 2 lines Fix a few more variables to try to get this to compile with Visual Studio. ........ r57473 | neal.norwitz | 2007-08-25 19:25:17 +0200 (Sat, 25 Aug 2007) | 1 line Try to get this test to pass for systems that do not have SO_REUSEPORT ........ r57482 | gregory.p.smith | 2007-08-26 02:26:00 +0200 (Sun, 26 Aug 2007) | 7 lines keep setup.py from listing unneeded hash modules (_md5, _sha*) as missing when they were not built because _hashlib with openssl provided their functionality instead. don't build bsddb185 if bsddb was built. ........ r57483 | neal.norwitz | 2007-08-26 03:08:16 +0200 (Sun, 26 Aug 2007) | 1 line Fix typo in docstring (missing c in reacquire) ........ r57484 | neal.norwitz | 2007-08-26 03:42:03 +0200 (Sun, 26 Aug 2007) | 2 lines Spell check (also americanify behaviour, it's almost 3 times as common) ........ r57503 | neal.norwitz | 2007-08-26 08:29:57 +0200 (Sun, 26 Aug 2007) | 4 lines Reap children before the test starts so hopefully SocketServer won't find any old children left around which causes an exception in collect_children() and the test to fail. ........ r57510 | neal.norwitz | 2007-08-26 20:50:39 +0200 (Sun, 26 Aug 2007) | 1 line Fail gracefully if the cert files cannot be created ........ r57513 | guido.van.rossum | 2007-08-26 21:35:09 +0200 (Sun, 26 Aug 2007) | 4 lines Bill Janssen wrote: Here's a patch which makes test_ssl a better player in the buildbots environment. I deep-ended on "try-except-else" clauses. ........ r57518 | neal.norwitz | 2007-08-26 23:40:16 +0200 (Sun, 26 Aug 2007) | 1 line Get the test passing by commenting out some writes (should they be removed?) ........ r57522 | neal.norwitz | 2007-08-27 00:16:23 +0200 (Mon, 27 Aug 2007) | 3 lines Catch IOError for when the device file doesn't exist or the user doesn't have permission to write to the device. ........ r57524 | neal.norwitz | 2007-08-27 00:20:03 +0200 (Mon, 27 Aug 2007) | 5 lines Another patch from Bill Janssen that: 1) Fixes the bug that two class names are initial-lower-case. 2) Replaces the poll waiting for the server to become ready with a threading.Event signal. ........ r57536 | neal.norwitz | 2007-08-27 02:58:33 +0200 (Mon, 27 Aug 2007) | 1 line Stop using string.join (from the module) to ease upgrade to py3k ........ r57537 | neal.norwitz | 2007-08-27 03:03:18 +0200 (Mon, 27 Aug 2007) | 1 line Make a utility function for handling (printing) an error ........ r57538 | neal.norwitz | 2007-08-27 03:15:33 +0200 (Mon, 27 Aug 2007) | 4 lines If we can't create a certificate, print a warning, but don't fail the test. Modified patch from what Bill Janssen sent on python-3000. ........ r57539 | facundo.batista | 2007-08-27 03:15:34 +0200 (Mon, 27 Aug 2007) | 7 lines Ignore test failures caused by 'resource temporarily unavailable' exceptions raised in the test server thread, since SimpleXMLRPCServer does not gracefully handle them. Changed number of requests handled by tests server thread to one (was 2) because no tests require more than one request. [GSoC - Alan McIntyre] ........ r57561 | guido.van.rossum | 2007-08-27 19:19:42 +0200 (Mon, 27 Aug 2007) | 8 lines > Regardless, building a fixed test certificate and checking it in sounds like > the better option. Then the openssl command in the test code can be turned > into a comment describing how the test data was pregenerated. Here's a patch that does that. Bill ........ r57568 | guido.van.rossum | 2007-08-27 20:42:23 +0200 (Mon, 27 Aug 2007) | 26 lines > Some of the code sets the error string in this directly before > returning NULL, and other pieces of the code call PySSL_SetError, > which creates the error string. I think some of the places which set > the string directly probably shouldn't; instead, they should call > PySSL_SetError to cons up the error name directly from the err code. > However, PySSL_SetError only works after the construction of an ssl > object, which means it can't be used there... I'll take a longer look > at it and see if there's a reasonable fix. Here's a patch which addresses this. It also fixes the indentation in PySSL_SetError, bringing it into line with PEP 7, fixes a compile warning about one of the OpenSSL macros, and makes the namespace a bit more consistent. I've tested it on FC 7 and OS X 10.4. % ./python ./Lib/test/regrtest.py -R :1: -u all test_ssl test_ssl beginning 6 repetitions 123456 ...... 1 test OK. [29244 refs] % [GvR: slightly edited to enforce 79-char line length, even if it required violating the style guide.] ........ r57570 | guido.van.rossum | 2007-08-27 21:11:11 +0200 (Mon, 27 Aug 2007) | 2 lines Patch 10124 by Bill Janssen, docs for the new ssl code. ........ r57574 | guido.van.rossum | 2007-08-27 22:51:00 +0200 (Mon, 27 Aug 2007) | 3 lines Patch # 1739906 by Christian Heimes -- add reduce to functools (importing it from __builtin__). ........ r57575 | guido.van.rossum | 2007-08-27 22:52:10 +0200 (Mon, 27 Aug 2007) | 2 lines News about functools.reduce. ........ r57611 | georg.brandl | 2007-08-28 10:29:08 +0200 (Tue, 28 Aug 2007) | 2 lines Document rev. 57574. ........ r57612 | sean.reifschneider | 2007-08-28 11:07:54 +0200 (Tue, 28 Aug 2007) | 2 lines Adding basic imputil documentation. ........ r57614 | georg.brandl | 2007-08-28 12:48:18 +0200 (Tue, 28 Aug 2007) | 2 lines Fix some glitches. ........ r57616 | lars.gustaebel | 2007-08-28 14:31:09 +0200 (Tue, 28 Aug 2007) | 5 lines TarFile.__init__() no longer fails if no name argument is passed and the fileobj argument has no usable name attribute (e.g. StringIO). (will backport to 2.5) ........ r57619 | thomas.wouters | 2007-08-28 17:28:19 +0200 (Tue, 28 Aug 2007) | 22 lines Improve extended slicing support in builtin types and classes. Specifically: - Specialcase extended slices that amount to a shallow copy the same way as is done for simple slices, in the tuple, string and unicode case. - Specialcase step-1 extended slices to optimize the common case for all involved types. - For lists, allow extended slice assignment of differing lengths as long as the step is 1. (Previously, 'l[:2:1] = []' failed even though 'l[:2] = []' and 'l[:2:None] = []' do not.) - Implement extended slicing for buffer, array, structseq, mmap and UserString.UserString. - Implement slice-object support (but not non-step-1 slice assignment) for UserString.MutableString. - Add tests for all new functionality. ........
1054 lines
27 KiB
C
1054 lines
27 KiB
C
/* SSL socket module
|
|
|
|
SSL support based on patches by Brian E Gallew and Laszlo Kovacs.
|
|
|
|
This module is imported by socket.py. It should *not* be used
|
|
directly.
|
|
|
|
*/
|
|
|
|
#include "Python.h"
|
|
|
|
enum py_ssl_error {
|
|
/* these mirror ssl.h */
|
|
PY_SSL_ERROR_NONE,
|
|
PY_SSL_ERROR_SSL,
|
|
PY_SSL_ERROR_WANT_READ,
|
|
PY_SSL_ERROR_WANT_WRITE,
|
|
PY_SSL_ERROR_WANT_X509_LOOKUP,
|
|
PY_SSL_ERROR_SYSCALL, /* look at error stack/return value/errno */
|
|
PY_SSL_ERROR_ZERO_RETURN,
|
|
PY_SSL_ERROR_WANT_CONNECT,
|
|
/* start of non ssl.h errorcodes */
|
|
PY_SSL_ERROR_EOF, /* special case of SSL_ERROR_SYSCALL */
|
|
PY_SSL_ERROR_INVALID_ERROR_CODE
|
|
};
|
|
|
|
enum py_ssl_server_or_client {
|
|
PY_SSL_CLIENT,
|
|
PY_SSL_SERVER
|
|
};
|
|
|
|
enum py_ssl_cert_requirements {
|
|
PY_SSL_CERT_NONE,
|
|
PY_SSL_CERT_OPTIONAL,
|
|
PY_SSL_CERT_REQUIRED
|
|
};
|
|
|
|
enum py_ssl_version {
|
|
PY_SSL_VERSION_SSL2,
|
|
PY_SSL_VERSION_SSL3,
|
|
PY_SSL_VERSION_SSL23,
|
|
PY_SSL_VERSION_TLS1,
|
|
};
|
|
|
|
/* Include symbols from _socket module */
|
|
#include "socketmodule.h"
|
|
|
|
#if defined(HAVE_POLL_H)
|
|
#include <poll.h>
|
|
#elif defined(HAVE_SYS_POLL_H)
|
|
#include <sys/poll.h>
|
|
#endif
|
|
|
|
/* Include OpenSSL header files */
|
|
#include "openssl/rsa.h"
|
|
#include "openssl/crypto.h"
|
|
#include "openssl/x509.h"
|
|
#include "openssl/pem.h"
|
|
#include "openssl/ssl.h"
|
|
#include "openssl/err.h"
|
|
#include "openssl/rand.h"
|
|
|
|
/* SSL error object */
|
|
static PyObject *PySSLErrorObject;
|
|
|
|
/* SSL socket object */
|
|
|
|
#define X509_NAME_MAXLEN 256
|
|
|
|
/* RAND_* APIs got added to OpenSSL in 0.9.5 */
|
|
#if OPENSSL_VERSION_NUMBER >= 0x0090500fL
|
|
# define HAVE_OPENSSL_RAND 1
|
|
#else
|
|
# undef HAVE_OPENSSL_RAND
|
|
#endif
|
|
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
PySocketSockObject *Socket; /* Socket on which we're layered */
|
|
SSL_CTX* ctx;
|
|
SSL* ssl;
|
|
X509* peer_cert;
|
|
char server[X509_NAME_MAXLEN];
|
|
char issuer[X509_NAME_MAXLEN];
|
|
|
|
} PySSLObject;
|
|
|
|
static PyTypeObject PySSL_Type;
|
|
static PyObject *PySSL_SSLwrite(PySSLObject *self, PyObject *args);
|
|
static PyObject *PySSL_SSLread(PySSLObject *self, PyObject *args);
|
|
static int check_socket_and_wait_for_timeout(PySocketSockObject *s,
|
|
int writing);
|
|
static PyObject *PySSL_peercert(PySSLObject *self);
|
|
|
|
|
|
#define PySSLObject_Check(v) (Py_Type(v) == &PySSL_Type)
|
|
|
|
typedef enum {
|
|
SOCKET_IS_NONBLOCKING,
|
|
SOCKET_IS_BLOCKING,
|
|
SOCKET_HAS_TIMED_OUT,
|
|
SOCKET_HAS_BEEN_CLOSED,
|
|
SOCKET_TOO_LARGE_FOR_SELECT,
|
|
SOCKET_OPERATION_OK
|
|
} timeout_state;
|
|
|
|
/* Wrap error strings with filename and line # */
|
|
#define STRINGIFY1(x) #x
|
|
#define STRINGIFY2(x) STRINGIFY1(x)
|
|
#define ERRSTR1(x,y,z) (x ":" y ": " z)
|
|
#define ERRSTR(x) ERRSTR1("_ssl.c", STRINGIFY2(__LINE__), x)
|
|
|
|
/* XXX It might be helpful to augment the error message generated
|
|
below with the name of the SSL function that generated the error.
|
|
I expect it's obvious most of the time.
|
|
*/
|
|
|
|
static PyObject *
|
|
PySSL_SetError(PySSLObject *obj, int ret, char *filename, int lineno)
|
|
{
|
|
PyObject *v;
|
|
char buf[2048];
|
|
char *errstr;
|
|
int err;
|
|
enum py_ssl_error p = PY_SSL_ERROR_NONE;
|
|
|
|
assert(ret <= 0);
|
|
|
|
if ((obj != NULL) && (obj->ssl != NULL)) {
|
|
err = SSL_get_error(obj->ssl, ret);
|
|
|
|
switch (err) {
|
|
case SSL_ERROR_ZERO_RETURN:
|
|
errstr = "TLS/SSL connection has been closed";
|
|
p = PY_SSL_ERROR_ZERO_RETURN;
|
|
break;
|
|
case SSL_ERROR_WANT_READ:
|
|
errstr = "The operation did not complete (read)";
|
|
p = PY_SSL_ERROR_WANT_READ;
|
|
break;
|
|
case SSL_ERROR_WANT_WRITE:
|
|
p = PY_SSL_ERROR_WANT_WRITE;
|
|
errstr = "The operation did not complete (write)";
|
|
break;
|
|
case SSL_ERROR_WANT_X509_LOOKUP:
|
|
p = PY_SSL_ERROR_WANT_X509_LOOKUP;
|
|
errstr =
|
|
"The operation did not complete (X509 lookup)";
|
|
break;
|
|
case SSL_ERROR_WANT_CONNECT:
|
|
p = PY_SSL_ERROR_WANT_CONNECT;
|
|
errstr = "The operation did not complete (connect)";
|
|
break;
|
|
case SSL_ERROR_SYSCALL:
|
|
{
|
|
unsigned long e = ERR_get_error();
|
|
if (e == 0) {
|
|
if (ret == 0 || !obj->Socket) {
|
|
p = PY_SSL_ERROR_EOF;
|
|
errstr =
|
|
"EOF occurred in violation of protocol";
|
|
} else if (ret == -1) {
|
|
/* underlying BIO reported an I/O error */
|
|
return obj->Socket->errorhandler();
|
|
} else { /* possible? */
|
|
p = PY_SSL_ERROR_SYSCALL;
|
|
errstr = "Some I/O error occurred";
|
|
}
|
|
} else {
|
|
p = PY_SSL_ERROR_SYSCALL;
|
|
/* XXX Protected by global interpreter lock */
|
|
errstr = ERR_error_string(e, NULL);
|
|
}
|
|
break;
|
|
}
|
|
case SSL_ERROR_SSL:
|
|
{
|
|
unsigned long e = ERR_get_error();
|
|
p = PY_SSL_ERROR_SSL;
|
|
if (e != 0)
|
|
/* XXX Protected by global interpreter lock */
|
|
errstr = ERR_error_string(e, NULL);
|
|
else { /* possible? */
|
|
errstr =
|
|
"A failure in the SSL library occurred";
|
|
}
|
|
break;
|
|
}
|
|
default:
|
|
p = PY_SSL_ERROR_INVALID_ERROR_CODE;
|
|
errstr = "Invalid error code";
|
|
}
|
|
} else {
|
|
errstr = ERR_error_string(ERR_peek_last_error(), NULL);
|
|
}
|
|
PyOS_snprintf(buf, sizeof(buf), "_ssl.c:%d: %s", lineno, errstr);
|
|
v = Py_BuildValue("(is)", p, buf);
|
|
if (v != NULL) {
|
|
PyErr_SetObject(PySSLErrorObject, v);
|
|
Py_DECREF(v);
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
static PySSLObject *
|
|
newPySSLObject(PySocketSockObject *Sock, char *key_file, char *cert_file,
|
|
enum py_ssl_server_or_client socket_type,
|
|
enum py_ssl_cert_requirements certreq,
|
|
enum py_ssl_version proto_version,
|
|
char *cacerts_file)
|
|
{
|
|
PySSLObject *self;
|
|
char *errstr = NULL;
|
|
int ret;
|
|
int err;
|
|
int sockstate;
|
|
int verification_mode;
|
|
|
|
self = PyObject_New(PySSLObject, &PySSL_Type); /* Create new object */
|
|
if (self == NULL)
|
|
return NULL;
|
|
memset(self->server, '\0', sizeof(char) * X509_NAME_MAXLEN);
|
|
memset(self->issuer, '\0', sizeof(char) * X509_NAME_MAXLEN);
|
|
self->peer_cert = NULL;
|
|
self->ssl = NULL;
|
|
self->ctx = NULL;
|
|
self->Socket = NULL;
|
|
|
|
if ((key_file && !cert_file) || (!key_file && cert_file)) {
|
|
errstr = ERRSTR("Both the key & certificate files "
|
|
"must be specified");
|
|
goto fail;
|
|
}
|
|
|
|
if ((socket_type == PY_SSL_SERVER) &&
|
|
((key_file == NULL) || (cert_file == NULL))) {
|
|
errstr = ERRSTR("Both the key & certificate files "
|
|
"must be specified for server-side operation");
|
|
goto fail;
|
|
}
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
if (proto_version == PY_SSL_VERSION_TLS1)
|
|
self->ctx = SSL_CTX_new(TLSv1_method()); /* Set up context */
|
|
else if (proto_version == PY_SSL_VERSION_SSL3)
|
|
self->ctx = SSL_CTX_new(SSLv3_method()); /* Set up context */
|
|
else if (proto_version == PY_SSL_VERSION_SSL2)
|
|
self->ctx = SSL_CTX_new(SSLv2_method()); /* Set up context */
|
|
else
|
|
self->ctx = SSL_CTX_new(SSLv23_method()); /* Set up context */
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (self->ctx == NULL) {
|
|
errstr = ERRSTR("Invalid SSL protocol variant specified.");
|
|
goto fail;
|
|
}
|
|
|
|
if (certreq != PY_SSL_CERT_NONE) {
|
|
if (cacerts_file == NULL) {
|
|
errstr = ERRSTR("No root certificates specified for "
|
|
"verification of other-side certificates.");
|
|
goto fail;
|
|
} else {
|
|
Py_BEGIN_ALLOW_THREADS
|
|
ret = SSL_CTX_load_verify_locations(self->ctx,
|
|
cacerts_file,
|
|
NULL);
|
|
Py_END_ALLOW_THREADS
|
|
if (ret != 1) {
|
|
PySSL_SetError(NULL, 0, __FILE__, __LINE__);
|
|
goto fail;
|
|
}
|
|
}
|
|
}
|
|
if (key_file) {
|
|
Py_BEGIN_ALLOW_THREADS
|
|
ret = SSL_CTX_use_PrivateKey_file(self->ctx, key_file,
|
|
SSL_FILETYPE_PEM);
|
|
Py_END_ALLOW_THREADS
|
|
if (ret != 1) {
|
|
PySSL_SetError(NULL, 0, __FILE__, __LINE__);
|
|
goto fail;
|
|
}
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
ret = SSL_CTX_use_certificate_chain_file(self->ctx,
|
|
cert_file);
|
|
Py_END_ALLOW_THREADS
|
|
if (ret != 1) {
|
|
PySSL_SetError(NULL, 0, __FILE__, __LINE__);
|
|
goto fail;
|
|
}
|
|
/* ssl compatibility */
|
|
SSL_CTX_set_options(self->ctx, SSL_OP_ALL);
|
|
}
|
|
|
|
verification_mode = SSL_VERIFY_NONE;
|
|
if (certreq == PY_SSL_CERT_OPTIONAL)
|
|
verification_mode = SSL_VERIFY_PEER;
|
|
else if (certreq == PY_SSL_CERT_REQUIRED)
|
|
verification_mode = (SSL_VERIFY_PEER |
|
|
SSL_VERIFY_FAIL_IF_NO_PEER_CERT);
|
|
SSL_CTX_set_verify(self->ctx, verification_mode,
|
|
NULL); /* set verify lvl */
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
self->ssl = SSL_new(self->ctx); /* New ssl struct */
|
|
Py_END_ALLOW_THREADS
|
|
SSL_set_fd(self->ssl, Sock->sock_fd); /* Set the socket for SSL */
|
|
|
|
/* If the socket is in non-blocking mode or timeout mode, set the BIO
|
|
* to non-blocking mode (blocking is the default)
|
|
*/
|
|
if (Sock->sock_timeout >= 0.0) {
|
|
/* Set both the read and write BIO's to non-blocking mode */
|
|
BIO_set_nbio(SSL_get_rbio(self->ssl), 1);
|
|
BIO_set_nbio(SSL_get_wbio(self->ssl), 1);
|
|
}
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
if (socket_type == PY_SSL_CLIENT)
|
|
SSL_set_connect_state(self->ssl);
|
|
else
|
|
SSL_set_accept_state(self->ssl);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
/* Actually negotiate SSL connection */
|
|
/* XXX If SSL_connect() returns 0, it's also a failure. */
|
|
sockstate = 0;
|
|
do {
|
|
Py_BEGIN_ALLOW_THREADS
|
|
if (socket_type == PY_SSL_CLIENT)
|
|
ret = SSL_connect(self->ssl);
|
|
else
|
|
ret = SSL_accept(self->ssl);
|
|
err = SSL_get_error(self->ssl, ret);
|
|
Py_END_ALLOW_THREADS
|
|
if(PyErr_CheckSignals()) {
|
|
goto fail;
|
|
}
|
|
if (err == SSL_ERROR_WANT_READ) {
|
|
sockstate = check_socket_and_wait_for_timeout(Sock, 0);
|
|
} else if (err == SSL_ERROR_WANT_WRITE) {
|
|
sockstate = check_socket_and_wait_for_timeout(Sock, 1);
|
|
} else {
|
|
sockstate = SOCKET_OPERATION_OK;
|
|
}
|
|
if (sockstate == SOCKET_HAS_TIMED_OUT) {
|
|
PyErr_SetString(PySSLErrorObject,
|
|
ERRSTR("The connect operation timed out"));
|
|
goto fail;
|
|
} else if (sockstate == SOCKET_HAS_BEEN_CLOSED) {
|
|
PyErr_SetString(PySSLErrorObject,
|
|
ERRSTR("Underlying socket has been closed."));
|
|
goto fail;
|
|
} else if (sockstate == SOCKET_TOO_LARGE_FOR_SELECT) {
|
|
PyErr_SetString(PySSLErrorObject,
|
|
ERRSTR("Underlying socket too large for select()."));
|
|
goto fail;
|
|
} else if (sockstate == SOCKET_IS_NONBLOCKING) {
|
|
break;
|
|
}
|
|
} while (err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE);
|
|
if (ret < 1) {
|
|
PySSL_SetError(self, ret, __FILE__, __LINE__);
|
|
goto fail;
|
|
}
|
|
self->ssl->debug = 1;
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
if ((self->peer_cert = SSL_get_peer_certificate(self->ssl))) {
|
|
X509_NAME_oneline(X509_get_subject_name(self->peer_cert),
|
|
self->server, X509_NAME_MAXLEN);
|
|
X509_NAME_oneline(X509_get_issuer_name(self->peer_cert),
|
|
self->issuer, X509_NAME_MAXLEN);
|
|
}
|
|
Py_END_ALLOW_THREADS
|
|
self->Socket = Sock;
|
|
Py_INCREF(self->Socket);
|
|
return self;
|
|
fail:
|
|
if (errstr)
|
|
PyErr_SetString(PySSLErrorObject, errstr);
|
|
Py_DECREF(self);
|
|
return NULL;
|
|
}
|
|
|
|
static PyObject *
|
|
PySSL_sslwrap(PyObject *self, PyObject *args)
|
|
{
|
|
PySocketSockObject *Sock;
|
|
int server_side = 0;
|
|
int verification_mode = PY_SSL_CERT_NONE;
|
|
int protocol = PY_SSL_VERSION_SSL23;
|
|
char *key_file = NULL;
|
|
char *cert_file = NULL;
|
|
char *cacerts_file = NULL;
|
|
|
|
if (!PyArg_ParseTuple(args, "O!i|zziiz:sslwrap",
|
|
PySocketModule.Sock_Type,
|
|
&Sock,
|
|
&server_side,
|
|
&key_file, &cert_file,
|
|
&verification_mode, &protocol,
|
|
&cacerts_file))
|
|
return NULL;
|
|
|
|
/*
|
|
fprintf(stderr,
|
|
"server_side is %d, keyfile %p, certfile %p, verify_mode %d, "
|
|
"protocol %d, certs %p\n",
|
|
server_side, key_file, cert_file, verification_mode,
|
|
protocol, cacerts_file);
|
|
*/
|
|
|
|
return (PyObject *) newPySSLObject(Sock, key_file, cert_file,
|
|
server_side, verification_mode,
|
|
protocol, cacerts_file);
|
|
}
|
|
|
|
PyDoc_STRVAR(ssl_doc,
|
|
"sslwrap(socket, server_side, [keyfile, certfile, certs_mode, protocol,\n"
|
|
" cacertsfile]) -> sslobject");
|
|
|
|
/* SSL object methods */
|
|
|
|
static PyObject *
|
|
PySSL_server(PySSLObject *self)
|
|
{
|
|
return PyUnicode_FromString(self->server);
|
|
}
|
|
|
|
static PyObject *
|
|
PySSL_issuer(PySSLObject *self)
|
|
{
|
|
return PyUnicode_FromString(self->issuer);
|
|
}
|
|
|
|
static PyObject *
|
|
_create_dict_for_X509_NAME (X509_NAME *xname)
|
|
{
|
|
PyObject *pd = PyDict_New();
|
|
int index_counter;
|
|
|
|
if (pd == NULL)
|
|
return NULL;
|
|
|
|
for (index_counter = 0;
|
|
index_counter < X509_NAME_entry_count(xname);
|
|
index_counter++)
|
|
{
|
|
char namebuf[X509_NAME_MAXLEN];
|
|
int buflen;
|
|
PyObject *name_obj;
|
|
ASN1_STRING *value;
|
|
PyObject *value_obj;
|
|
unsigned char *valuebuf = NULL;
|
|
|
|
X509_NAME_ENTRY *entry = X509_NAME_get_entry(xname,
|
|
index_counter);
|
|
|
|
ASN1_OBJECT *name = X509_NAME_ENTRY_get_object(entry);
|
|
buflen = OBJ_obj2txt(namebuf, sizeof(namebuf), name, 0);
|
|
if (buflen < 0)
|
|
goto fail0;
|
|
name_obj = PyString_FromStringAndSize(namebuf, buflen);
|
|
if (name_obj == NULL)
|
|
goto fail0;
|
|
|
|
value = X509_NAME_ENTRY_get_data(entry);
|
|
buflen = ASN1_STRING_to_UTF8(&valuebuf, value);
|
|
if (buflen < 0) {
|
|
Py_DECREF(name_obj);
|
|
goto fail0;
|
|
}
|
|
value_obj = PyUnicode_DecodeUTF8((char *) valuebuf,
|
|
buflen, "strict");
|
|
OPENSSL_free(valuebuf);
|
|
if (value_obj == NULL) {
|
|
Py_DECREF(name_obj);
|
|
goto fail0;
|
|
}
|
|
if (PyDict_SetItem(pd, name_obj, value_obj) < 0) {
|
|
Py_DECREF(name_obj);
|
|
Py_DECREF(value_obj);
|
|
goto fail0;
|
|
}
|
|
Py_DECREF(name_obj);
|
|
Py_DECREF(value_obj);
|
|
}
|
|
return pd;
|
|
|
|
fail0:
|
|
Py_XDECREF(pd);
|
|
return NULL;
|
|
}
|
|
|
|
static PyObject *
|
|
PySSL_peercert(PySSLObject *self)
|
|
{
|
|
PyObject *retval = NULL;
|
|
BIO *biobuf = NULL;
|
|
PyObject *peer;
|
|
PyObject *issuer;
|
|
PyObject *version;
|
|
char buf[2048];
|
|
int len;
|
|
ASN1_TIME *notBefore, *notAfter;
|
|
PyObject *pnotBefore, *pnotAfter;
|
|
int verification;
|
|
|
|
if (!self->peer_cert)
|
|
Py_RETURN_NONE;
|
|
|
|
retval = PyDict_New();
|
|
if (retval == NULL)
|
|
return NULL;
|
|
|
|
verification = SSL_CTX_get_verify_mode(self->ctx);
|
|
if ((verification & SSL_VERIFY_PEER) == 0)
|
|
return retval;
|
|
|
|
peer = _create_dict_for_X509_NAME(
|
|
X509_get_subject_name(self->peer_cert));
|
|
if (peer == NULL)
|
|
goto fail0;
|
|
if (PyDict_SetItemString(retval, (const char *) "subject", peer) < 0) {
|
|
Py_DECREF(peer);
|
|
goto fail0;
|
|
}
|
|
Py_DECREF(peer);
|
|
|
|
issuer = _create_dict_for_X509_NAME(
|
|
X509_get_issuer_name(self->peer_cert));
|
|
if (issuer == NULL)
|
|
goto fail0;
|
|
if (PyDict_SetItemString(retval, (const char *)"issuer", issuer) < 0) {
|
|
Py_DECREF(issuer);
|
|
goto fail0;
|
|
}
|
|
Py_DECREF(issuer);
|
|
|
|
version = PyInt_FromLong(X509_get_version(self->peer_cert));
|
|
if (PyDict_SetItemString(retval, "version", version) < 0) {
|
|
Py_DECREF(version);
|
|
goto fail0;
|
|
}
|
|
Py_DECREF(version);
|
|
|
|
/* get a memory buffer */
|
|
biobuf = BIO_new(BIO_s_mem());
|
|
|
|
notBefore = X509_get_notBefore(self->peer_cert);
|
|
ASN1_TIME_print(biobuf, notBefore);
|
|
len = BIO_gets(biobuf, buf, sizeof(buf)-1);
|
|
pnotBefore = PyString_FromStringAndSize(buf, len);
|
|
if (pnotBefore == NULL)
|
|
goto fail1;
|
|
if (PyDict_SetItemString(retval, "notBefore", pnotBefore) < 0) {
|
|
Py_DECREF(pnotBefore);
|
|
goto fail1;
|
|
}
|
|
Py_DECREF(pnotBefore);
|
|
|
|
(void) BIO_reset(biobuf);
|
|
notAfter = X509_get_notAfter(self->peer_cert);
|
|
ASN1_TIME_print(biobuf, notAfter);
|
|
len = BIO_gets(biobuf, buf, sizeof(buf)-1);
|
|
BIO_free(biobuf);
|
|
pnotAfter = PyString_FromStringAndSize(buf, len);
|
|
if (pnotAfter == NULL)
|
|
goto fail0;
|
|
if (PyDict_SetItemString(retval, "notAfter", pnotAfter) < 0) {
|
|
Py_DECREF(pnotAfter);
|
|
goto fail0;
|
|
}
|
|
Py_DECREF(pnotAfter);
|
|
return retval;
|
|
|
|
fail1:
|
|
if (biobuf != NULL)
|
|
BIO_free(biobuf);
|
|
fail0:
|
|
Py_XDECREF(retval);
|
|
return NULL;
|
|
}
|
|
|
|
static void PySSL_dealloc(PySSLObject *self)
|
|
{
|
|
if (self->peer_cert) /* Possible not to have one? */
|
|
X509_free (self->peer_cert);
|
|
if (self->ssl)
|
|
SSL_free(self->ssl);
|
|
if (self->ctx)
|
|
SSL_CTX_free(self->ctx);
|
|
Py_XDECREF(self->Socket);
|
|
PyObject_Del(self);
|
|
}
|
|
|
|
/* If the socket has a timeout, do a select()/poll() on the socket.
|
|
The argument writing indicates the direction.
|
|
Returns one of the possibilities in the timeout_state enum (above).
|
|
*/
|
|
|
|
static int
|
|
check_socket_and_wait_for_timeout(PySocketSockObject *s, int writing)
|
|
{
|
|
fd_set fds;
|
|
struct timeval tv;
|
|
int rc;
|
|
|
|
/* Nothing to do unless we're in timeout mode (not non-blocking) */
|
|
if (s->sock_timeout < 0.0)
|
|
return SOCKET_IS_BLOCKING;
|
|
else if (s->sock_timeout == 0.0)
|
|
return SOCKET_IS_NONBLOCKING;
|
|
|
|
/* Guard against closed socket */
|
|
if (s->sock_fd < 0)
|
|
return SOCKET_HAS_BEEN_CLOSED;
|
|
|
|
/* Prefer poll, if available, since you can poll() any fd
|
|
* which can't be done with select(). */
|
|
#ifdef HAVE_POLL
|
|
{
|
|
struct pollfd pollfd;
|
|
int timeout;
|
|
|
|
pollfd.fd = s->sock_fd;
|
|
pollfd.events = writing ? POLLOUT : POLLIN;
|
|
|
|
/* s->sock_timeout is in seconds, timeout in ms */
|
|
timeout = (int)(s->sock_timeout * 1000 + 0.5);
|
|
Py_BEGIN_ALLOW_THREADS
|
|
rc = poll(&pollfd, 1, timeout);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
goto normal_return;
|
|
}
|
|
#endif
|
|
|
|
/* Guard against socket too large for select*/
|
|
#ifndef Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE
|
|
if (s->sock_fd >= FD_SETSIZE)
|
|
return SOCKET_TOO_LARGE_FOR_SELECT;
|
|
#endif
|
|
|
|
/* Construct the arguments to select */
|
|
tv.tv_sec = (int)s->sock_timeout;
|
|
tv.tv_usec = (int)((s->sock_timeout - tv.tv_sec) * 1e6);
|
|
FD_ZERO(&fds);
|
|
FD_SET(s->sock_fd, &fds);
|
|
|
|
/* See if the socket is ready */
|
|
Py_BEGIN_ALLOW_THREADS
|
|
if (writing)
|
|
rc = select(s->sock_fd+1, NULL, &fds, NULL, &tv);
|
|
else
|
|
rc = select(s->sock_fd+1, &fds, NULL, NULL, &tv);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
normal_return:
|
|
/* Return SOCKET_TIMED_OUT on timeout, SOCKET_OPERATION_OK otherwise
|
|
(when we are able to write or when there's something to read) */
|
|
return rc == 0 ? SOCKET_HAS_TIMED_OUT : SOCKET_OPERATION_OK;
|
|
}
|
|
|
|
static PyObject *PySSL_SSLwrite(PySSLObject *self, PyObject *args)
|
|
{
|
|
char *data;
|
|
int len;
|
|
int count;
|
|
int sockstate;
|
|
int err;
|
|
|
|
if (!PyArg_ParseTuple(args, "s#:write", &data, &count))
|
|
return NULL;
|
|
|
|
sockstate = check_socket_and_wait_for_timeout(self->Socket, 1);
|
|
if (sockstate == SOCKET_HAS_TIMED_OUT) {
|
|
PyErr_SetString(PySSLErrorObject,
|
|
"The write operation timed out");
|
|
return NULL;
|
|
} else if (sockstate == SOCKET_HAS_BEEN_CLOSED) {
|
|
PyErr_SetString(PySSLErrorObject,
|
|
"Underlying socket has been closed.");
|
|
return NULL;
|
|
} else if (sockstate == SOCKET_TOO_LARGE_FOR_SELECT) {
|
|
PyErr_SetString(PySSLErrorObject,
|
|
"Underlying socket too large for select().");
|
|
return NULL;
|
|
}
|
|
do {
|
|
err = 0;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
len = SSL_write(self->ssl, data, count);
|
|
err = SSL_get_error(self->ssl, len);
|
|
Py_END_ALLOW_THREADS
|
|
if(PyErr_CheckSignals()) {
|
|
return NULL;
|
|
}
|
|
if (err == SSL_ERROR_WANT_READ) {
|
|
sockstate =
|
|
check_socket_and_wait_for_timeout(self->Socket, 0);
|
|
} else if (err == SSL_ERROR_WANT_WRITE) {
|
|
sockstate =
|
|
check_socket_and_wait_for_timeout(self->Socket, 1);
|
|
} else {
|
|
sockstate = SOCKET_OPERATION_OK;
|
|
}
|
|
if (sockstate == SOCKET_HAS_TIMED_OUT) {
|
|
PyErr_SetString(PySSLErrorObject,
|
|
"The write operation timed out");
|
|
return NULL;
|
|
} else if (sockstate == SOCKET_HAS_BEEN_CLOSED) {
|
|
PyErr_SetString(PySSLErrorObject,
|
|
"Underlying socket has been closed.");
|
|
return NULL;
|
|
} else if (sockstate == SOCKET_IS_NONBLOCKING) {
|
|
break;
|
|
}
|
|
} while (err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE);
|
|
if (len > 0)
|
|
return PyInt_FromLong(len);
|
|
else
|
|
return PySSL_SetError(self, len, __FILE__, __LINE__);
|
|
}
|
|
|
|
PyDoc_STRVAR(PySSL_SSLwrite_doc,
|
|
"write(s) -> len\n\
|
|
\n\
|
|
Writes the string s into the SSL object. Returns the number\n\
|
|
of bytes written.");
|
|
|
|
static PyObject *PySSL_SSLread(PySSLObject *self, PyObject *args)
|
|
{
|
|
PyObject *buf;
|
|
int count = 0;
|
|
int len = 1024;
|
|
int sockstate;
|
|
int err;
|
|
|
|
if (!PyArg_ParseTuple(args, "|i:read", &len))
|
|
return NULL;
|
|
|
|
if (!(buf = PyBytes_FromStringAndSize((char *) 0, len)))
|
|
return NULL;
|
|
|
|
/* first check if there are bytes ready to be read */
|
|
Py_BEGIN_ALLOW_THREADS
|
|
count = SSL_pending(self->ssl);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (!count) {
|
|
sockstate = check_socket_and_wait_for_timeout(self->Socket, 0);
|
|
if (sockstate == SOCKET_HAS_TIMED_OUT) {
|
|
PyErr_SetString(PySSLErrorObject,
|
|
"The read operation timed out");
|
|
Py_DECREF(buf);
|
|
return NULL;
|
|
} else if (sockstate == SOCKET_TOO_LARGE_FOR_SELECT) {
|
|
PyErr_SetString(PySSLErrorObject,
|
|
"Underlying socket too large for select().");
|
|
Py_DECREF(buf);
|
|
return NULL;
|
|
} else if (sockstate == SOCKET_HAS_BEEN_CLOSED) {
|
|
if (SSL_get_shutdown(self->ssl) !=
|
|
SSL_RECEIVED_SHUTDOWN)
|
|
{
|
|
Py_DECREF(buf);
|
|
PyErr_SetString(PySSLErrorObject,
|
|
"Socket closed without SSL shutdown handshake");
|
|
return NULL;
|
|
} else {
|
|
/* should contain a zero-length string */
|
|
_PyString_Resize(&buf, 0);
|
|
return buf;
|
|
}
|
|
}
|
|
}
|
|
do {
|
|
err = 0;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
count = SSL_read(self->ssl, PyBytes_AS_STRING(buf), len);
|
|
err = SSL_get_error(self->ssl, count);
|
|
Py_END_ALLOW_THREADS
|
|
if(PyErr_CheckSignals()) {
|
|
Py_DECREF(buf);
|
|
return NULL;
|
|
}
|
|
if (err == SSL_ERROR_WANT_READ) {
|
|
sockstate =
|
|
check_socket_and_wait_for_timeout(self->Socket, 0);
|
|
} else if (err == SSL_ERROR_WANT_WRITE) {
|
|
sockstate =
|
|
check_socket_and_wait_for_timeout(self->Socket, 1);
|
|
} else if ((err == SSL_ERROR_ZERO_RETURN) &&
|
|
(SSL_get_shutdown(self->ssl) ==
|
|
SSL_RECEIVED_SHUTDOWN))
|
|
{
|
|
_PyString_Resize(&buf, 0);
|
|
return buf;
|
|
} else {
|
|
sockstate = SOCKET_OPERATION_OK;
|
|
}
|
|
if (sockstate == SOCKET_HAS_TIMED_OUT) {
|
|
PyErr_SetString(PySSLErrorObject,
|
|
"The read operation timed out");
|
|
Py_DECREF(buf);
|
|
return NULL;
|
|
} else if (sockstate == SOCKET_IS_NONBLOCKING) {
|
|
break;
|
|
}
|
|
} while (err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE);
|
|
if (count <= 0) {
|
|
Py_DECREF(buf);
|
|
return PySSL_SetError(self, count, __FILE__, __LINE__);
|
|
}
|
|
if (count != len)
|
|
if (PyBytes_Resize(buf, count) < 0) {
|
|
Py_DECREF(buf);
|
|
return NULL;
|
|
}
|
|
return buf;
|
|
}
|
|
|
|
PyDoc_STRVAR(PySSL_SSLread_doc,
|
|
"read([len]) -> bytes\n\
|
|
\n\
|
|
Read up to len bytes from the SSL socket.");
|
|
|
|
static PyObject *PySSL_SSLshutdown(PySSLObject *self, PyObject *args)
|
|
{
|
|
int err;
|
|
|
|
/* Guard against closed socket */
|
|
if (self->Socket->sock_fd < 0) {
|
|
PyErr_SetString(PySSLErrorObject,
|
|
"Underlying socket has been closed.");
|
|
return NULL;
|
|
}
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
err = SSL_shutdown(self->ssl);
|
|
if (err == 0) {
|
|
/* we need to call it again to finish the shutdown */
|
|
err = SSL_shutdown(self->ssl);
|
|
}
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (err < 0)
|
|
return PySSL_SetError(self, err, __FILE__, __LINE__);
|
|
else {
|
|
Py_INCREF(self->Socket);
|
|
return (PyObject *) (self->Socket);
|
|
}
|
|
}
|
|
|
|
PyDoc_STRVAR(PySSL_SSLshutdown_doc,
|
|
"shutdown(s) -> socket\n\
|
|
\n\
|
|
Does the SSL shutdown handshake with the remote end, and returns\n\
|
|
the underlying socket object.");
|
|
|
|
static PyMethodDef PySSLMethods[] = {
|
|
{"write", (PyCFunction)PySSL_SSLwrite, METH_VARARGS,
|
|
PySSL_SSLwrite_doc},
|
|
{"read", (PyCFunction)PySSL_SSLread, METH_VARARGS,
|
|
PySSL_SSLread_doc},
|
|
{"server", (PyCFunction)PySSL_server, METH_NOARGS},
|
|
{"issuer", (PyCFunction)PySSL_issuer, METH_NOARGS},
|
|
{"peer_certificate", (PyCFunction)PySSL_peercert, METH_NOARGS},
|
|
{"shutdown", (PyCFunction)PySSL_SSLshutdown, METH_NOARGS,
|
|
PySSL_SSLshutdown_doc},
|
|
{NULL, NULL}
|
|
};
|
|
|
|
static PyObject *PySSL_getattr(PySSLObject *self, char *name)
|
|
{
|
|
return Py_FindMethod(PySSLMethods, (PyObject *)self, name);
|
|
}
|
|
|
|
static PyTypeObject PySSL_Type = {
|
|
PyVarObject_HEAD_INIT(NULL, 0)
|
|
"ssl.SSLContext", /*tp_name*/
|
|
sizeof(PySSLObject), /*tp_basicsize*/
|
|
0, /*tp_itemsize*/
|
|
/* methods */
|
|
(destructor)PySSL_dealloc, /*tp_dealloc*/
|
|
0, /*tp_print*/
|
|
(getattrfunc)PySSL_getattr, /*tp_getattr*/
|
|
0, /*tp_setattr*/
|
|
0, /*tp_compare*/
|
|
0, /*tp_repr*/
|
|
0, /*tp_as_number*/
|
|
0, /*tp_as_sequence*/
|
|
0, /*tp_as_mapping*/
|
|
0, /*tp_hash*/
|
|
};
|
|
|
|
#ifdef HAVE_OPENSSL_RAND
|
|
|
|
/* helper routines for seeding the SSL PRNG */
|
|
static PyObject *
|
|
PySSL_RAND_add(PyObject *self, PyObject *args)
|
|
{
|
|
char *buf;
|
|
int len;
|
|
double entropy;
|
|
|
|
if (!PyArg_ParseTuple(args, "s#d:RAND_add", &buf, &len, &entropy))
|
|
return NULL;
|
|
RAND_add(buf, len, entropy);
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyDoc_STRVAR(PySSL_RAND_add_doc,
|
|
"RAND_add(string, entropy)\n\
|
|
\n\
|
|
Mix string into the OpenSSL PRNG state. entropy (a float) is a lower\n\
|
|
bound on the entropy contained in string.");
|
|
|
|
static PyObject *
|
|
PySSL_RAND_status(PyObject *self)
|
|
{
|
|
return PyBool_FromLong(RAND_status());
|
|
}
|
|
|
|
PyDoc_STRVAR(PySSL_RAND_status_doc,
|
|
"RAND_status() -> 0 or 1\n\
|
|
\n\
|
|
Returns True if the OpenSSL PRNG has been seeded with enough data and\n\
|
|
False if not. It is necessary to seed the PRNG with RAND_add()\n\
|
|
on some platforms before using the ssl() function.");
|
|
|
|
static PyObject *
|
|
PySSL_RAND_egd(PyObject *self, PyObject *arg)
|
|
{
|
|
int bytes;
|
|
|
|
if (!PyString_Check(arg))
|
|
return PyErr_Format(PyExc_TypeError,
|
|
"RAND_egd() expected string, found %s",
|
|
Py_Type(arg)->tp_name);
|
|
bytes = RAND_egd(PyString_AS_STRING(arg));
|
|
if (bytes == -1) {
|
|
PyErr_SetString(PySSLErrorObject,
|
|
"EGD connection failed or EGD did not return "
|
|
"enough data to seed the PRNG");
|
|
return NULL;
|
|
}
|
|
return PyInt_FromLong(bytes);
|
|
}
|
|
|
|
PyDoc_STRVAR(PySSL_RAND_egd_doc,
|
|
"RAND_egd(path) -> bytes\n\
|
|
\n\
|
|
Queries the entropy gather daemon (EGD) on socket path. Returns number\n\
|
|
of bytes read. Raises ssl.sslerror if connection to EGD fails or\n\
|
|
if it does provide enough data to seed PRNG.");
|
|
|
|
#endif
|
|
|
|
/* List of functions exported by this module. */
|
|
|
|
static PyMethodDef PySSL_methods[] = {
|
|
{"sslwrap", PySSL_sslwrap,
|
|
METH_VARARGS, ssl_doc},
|
|
#ifdef HAVE_OPENSSL_RAND
|
|
{"RAND_add", PySSL_RAND_add, METH_VARARGS,
|
|
PySSL_RAND_add_doc},
|
|
{"RAND_egd", PySSL_RAND_egd, METH_O,
|
|
PySSL_RAND_egd_doc},
|
|
{"RAND_status", (PyCFunction)PySSL_RAND_status, METH_NOARGS,
|
|
PySSL_RAND_status_doc},
|
|
#endif
|
|
{NULL, NULL} /* Sentinel */
|
|
};
|
|
|
|
|
|
PyDoc_STRVAR(module_doc,
|
|
"Implementation module for SSL socket operations. See the socket module\n\
|
|
for documentation.");
|
|
|
|
PyMODINIT_FUNC
|
|
init_ssl(void)
|
|
{
|
|
PyObject *m, *d;
|
|
|
|
Py_Type(&PySSL_Type) = &PyType_Type;
|
|
|
|
m = Py_InitModule3("_ssl", PySSL_methods, module_doc);
|
|
if (m == NULL)
|
|
return;
|
|
d = PyModule_GetDict(m);
|
|
|
|
/* Load _socket module and its C API */
|
|
if (PySocketModule_ImportModuleAndAPI())
|
|
return;
|
|
|
|
/* Init OpenSSL */
|
|
SSL_load_error_strings();
|
|
SSLeay_add_ssl_algorithms();
|
|
|
|
/* Add symbols to module dict */
|
|
PySSLErrorObject = PyErr_NewException("ssl.sslerror",
|
|
PySocketModule.error,
|
|
NULL);
|
|
if (PySSLErrorObject == NULL)
|
|
return;
|
|
if (PyDict_SetItemString(d, "sslerror", PySSLErrorObject) != 0)
|
|
return;
|
|
if (PyDict_SetItemString(d, "SSLType",
|
|
(PyObject *)&PySSL_Type) != 0)
|
|
return;
|
|
PyModule_AddIntConstant(m, "SSL_ERROR_ZERO_RETURN",
|
|
PY_SSL_ERROR_ZERO_RETURN);
|
|
PyModule_AddIntConstant(m, "SSL_ERROR_WANT_READ",
|
|
PY_SSL_ERROR_WANT_READ);
|
|
PyModule_AddIntConstant(m, "SSL_ERROR_WANT_WRITE",
|
|
PY_SSL_ERROR_WANT_WRITE);
|
|
PyModule_AddIntConstant(m, "SSL_ERROR_WANT_X509_LOOKUP",
|
|
PY_SSL_ERROR_WANT_X509_LOOKUP);
|
|
PyModule_AddIntConstant(m, "SSL_ERROR_SYSCALL",
|
|
PY_SSL_ERROR_SYSCALL);
|
|
PyModule_AddIntConstant(m, "SSL_ERROR_SSL",
|
|
PY_SSL_ERROR_SSL);
|
|
PyModule_AddIntConstant(m, "SSL_ERROR_WANT_CONNECT",
|
|
PY_SSL_ERROR_WANT_CONNECT);
|
|
/* non ssl.h errorcodes */
|
|
PyModule_AddIntConstant(m, "SSL_ERROR_EOF",
|
|
PY_SSL_ERROR_EOF);
|
|
PyModule_AddIntConstant(m, "SSL_ERROR_INVALID_ERROR_CODE",
|
|
PY_SSL_ERROR_INVALID_ERROR_CODE);
|
|
/* cert requirements */
|
|
PyModule_AddIntConstant(m, "CERT_NONE",
|
|
PY_SSL_CERT_NONE);
|
|
PyModule_AddIntConstant(m, "CERT_OPTIONAL",
|
|
PY_SSL_CERT_OPTIONAL);
|
|
PyModule_AddIntConstant(m, "CERT_REQUIRED",
|
|
PY_SSL_CERT_REQUIRED);
|
|
|
|
/* protocol versions */
|
|
PyModule_AddIntConstant(m, "PROTOCOL_SSLv2",
|
|
PY_SSL_VERSION_SSL2);
|
|
PyModule_AddIntConstant(m, "PROTOCOL_SSLv3",
|
|
PY_SSL_VERSION_SSL3);
|
|
PyModule_AddIntConstant(m, "PROTOCOL_SSLv23",
|
|
PY_SSL_VERSION_SSL23);
|
|
PyModule_AddIntConstant(m, "PROTOCOL_TLSv1",
|
|
PY_SSL_VERSION_TLS1);
|
|
}
|