diff options
| author | Jean-Paul Calderone <exarkun@twistedmatrix.com> | 2013-03-04 08:11:06 -0800 |
|---|---|---|
| committer | Jean-Paul Calderone <exarkun@twistedmatrix.com> | 2013-03-04 08:11:06 -0800 |
| commit | 4b5c244cc3370dc53a5adc10050ca80000db6fd0 (patch) | |
| tree | 00cd93aea8bb741377527e35b2b6a12e554b066f | |
| parent | 2beac53f0fb1960346682ed8918d4028d5038631 (diff) | |
| download | pyopenssl-4b5c244cc3370dc53a5adc10050ca80000db6fd0.tar.gz | |
Get the C implementation out of the way
| -rw-r--r-- | OpenSSL/ssl/ssl.c | 6 | ||||
| -rwxr-xr-x | setup.py | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/OpenSSL/ssl/ssl.c b/OpenSSL/ssl/ssl.c index 5725d5d..91d283e 100644 --- a/OpenSSL/ssl/ssl.c +++ b/OpenSSL/ssl/ssl.c @@ -80,7 +80,7 @@ static PyMethodDef ssl_methods[] = { #ifdef PY3 static struct PyModuleDef sslmodule = { PyModuleDef_HEAD_INIT, - "SSL", + "xSSL", ssl_doc, -1, ssl_methods @@ -93,7 +93,7 @@ static struct PyModuleDef sslmodule = { * Arguments: None * Returns: None */ -PyOpenSSL_MODINIT(SSL) { +PyOpenSSL_MODINIT(xSSL) { PyObject *module; #ifndef PY3 static void *ssl_API[ssl_API_pointers]; @@ -128,7 +128,7 @@ PyOpenSSL_MODINIT(SSL) { #ifdef PY3 module = PyModule_Create(&sslmodule); #else - module = Py_InitModule3("SSL", ssl_methods, ssl_doc); + module = Py_InitModule3("xSSL", ssl_methods, ssl_doc); #endif if (module == NULL) { PyOpenSSL_MODRETURN(NULL); @@ -31,9 +31,9 @@ xcrypto_dep = ['OpenSSL/crypto/crypto.h', 'OpenSSL/crypto/x509.h', 'OpenSSL/crypto/pkcs12.h', 'OpenSSL/crypto/netscape_spki.h', 'OpenSSL/crypto/revoked.h', 'OpenSSL/crypto/crl.h', 'OpenSSL/util.h'] -ssl_src = ['OpenSSL/ssl/connection.c', 'OpenSSL/ssl/context.c', 'OpenSSL/ssl/ssl.c', +xssl_src = ['OpenSSL/ssl/connection.c', 'OpenSSL/ssl/context.c', 'OpenSSL/ssl/ssl.c', 'OpenSSL/ssl/session.c', 'OpenSSL/util.c'] -ssl_dep = ['OpenSSL/ssl/connection.h', 'OpenSSL/ssl/context.h', 'OpenSSL/ssl/ssl.h', +xssl_dep = ['OpenSSL/ssl/connection.h', 'OpenSSL/ssl/context.h', 'OpenSSL/ssl/ssl.h', 'OpenSSL/ssl/session.h', 'OpenSSL/util.h'] IncludeDirs = None @@ -193,7 +193,7 @@ def mkExtension(name): setup(name='pyOpenSSL', version=__version__, packages = ['OpenSSL'], package_dir = {'OpenSSL': 'OpenSSL'}, - ext_modules = [mkExtension('xcrypto'), mkExtension('SSL')], + ext_modules = [mkExtension('xcrypto'), mkExtension('xSSL')], py_modules = ['OpenSSL.__init__', 'OpenSSL.tsafe', 'OpenSSL.rand', 'OpenSSL.version', 'OpenSSL.test.__init__', |