Attachment #560482 for bug #674942

View | Details | Raw Unified | Return to bug 674942
Collapse All | Expand All

Lines 293-299 int bio_should_write(BIO* a) { Link Here

(-)a/SWIG/_bio.i (-2 / +2 lines)
293	}	293	}
294		294
295	/* Macros for things not defined before 1.1.0 */	295	/* Macros for things not defined before 1.1.0 */
296	#if OPENSSL_VERSION_NUMBER < 0x10100000L	296	#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
297	static BIO_METHOD *	297	static BIO_METHOD *
298	BIO_meth_new( int type, const char *name )	298	BIO_meth_new( int type, const char *name )
299	{	299	{
Lines 515-521 static long pyfd_ctrl(BIO b, int cmd, long num, void ptr) { Link Here
515	}	515	}
516		516
517	void pyfd_init(void) {	517	void pyfd_init(void) {
518	#if OPENSSL_VERSION_NUMBER >= 0x10100000L	518	#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) \|\| (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
519	methods_fdp = BIO_meth_new(	519	methods_fdp = BIO_meth_new(
520	BIO_get_new_index()\|BIO_TYPE_DESCRIPTOR\|BIO_TYPE_SOURCE_SINK,	520	BIO_get_new_index()\|BIO_TYPE_DESCRIPTOR\|BIO_TYPE_SOURCE_SINK,
521	"python file descriptor");	521	"python file descriptor");

Lines 19-25 Copyright (c) 2009-2010 Heikki Toivonen. All rights reserved. Link Here

(-)a/SWIG/_evp.i (-1 / +1 lines)
19	#include <openssl/rsa.h>	19	#include <openssl/rsa.h>
20	#include <openssl/opensslv.h>	20	#include <openssl/opensslv.h>
21		21
22	#if OPENSSL_VERSION_NUMBER < 0x10100000L	22	#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
23		23
24	HMAC_CTX *HMAC_CTX_new(void) {	24	HMAC_CTX *HMAC_CTX_new(void) {
25	HMAC_CTX *ret = PyMem_Malloc(sizeof(HMAC_CTX));	25	HMAC_CTX *ret = PyMem_Malloc(sizeof(HMAC_CTX));

Lines 512-518 int passphrase_callback(char buf, int num, int v, void arg) { Link Here

(-)a/SWIG/_lib.i (-1 / +1 lines)
512	%inline %{	512	%inline %{
513		513
514	void lib_init() {	514	void lib_init() {
515	#if OPENSSL_VERSION_NUMBER < 0x10100000L	515	#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
516	SSLeay_add_all_algorithms();	516	SSLeay_add_all_algorithms();
517	ERR_load_ERR_strings();	517	ERR_load_ERR_strings();
518	#endif	518	#endif

Lines 8-14 Link Here

(-)a/SWIG/_lib11_compat.i (-1 / +1 lines)
8	*/	8	*/
9		9
10	%{	10	%{
11	#if OPENSSL_VERSION_NUMBER < 0x10100000L	11	#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
12		12
13	#include <string.h>	13	#include <string.h>
14	#include <openssl/engine.h>	14	#include <openssl/engine.h>

Lines 27-33 typedef unsigned __int64 uint64_t; Link Here

(-)a/SWIG/_ssl.i (-2 / +2 lines)
27	#endif	27	#endif
28	%}	28	%}
29		29
30	#if OPENSSL_VERSION_NUMBER >= 0x10100005L	30	#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100005L) \|\| (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
31	%include <openssl/safestack.h>	31	%include <openssl/safestack.h>
32	#endif	32	#endif
33		33
Lines 261-267 void ssl_init(PyObject ssl_err, PyObject ssl_timeout_err) { Link Here
261	}	261	}
262		262
263	const SSL_METHOD *tlsv1_method(void) {	263	const SSL_METHOD *tlsv1_method(void) {
264	#if OPENSSL_VERSION_NUMBER >= 0x10100000L	264	#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) \|\| (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
265	PyErr_WarnEx(PyExc_DeprecationWarning,	265	PyErr_WarnEx(PyExc_DeprecationWarning,
266	"Function TLSv1_method has been deprecated.", 1);	266	"Function TLSv1_method has been deprecated.", 1);
267	#endif	267	#endif




#include <pythread.h>
#include <openssl/crypto.h>

#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
#define CRYPTO_num_locks()      (CRYPTO_NUM_LOCKS)
static PyThread_type_lock lock_cs[CRYPTO_num_locks()];
static long lock_count[CRYPTO_num_locks()];

#endif

void threading_locking_callback(int mode, int type, const char *file, int line) {
#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
        if (mode & CRYPTO_LOCK) {
                PyThread_acquire_lock(lock_cs[type], WAIT_LOCK);
                lock_count[type]++;

}

unsigned long threading_id_callback(void) {
#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
    return (unsigned long)PyThread_get_thread_ident();
#else
    return (unsigned long)0;


%inline %{
void threading_init(void) {
#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
    int i;
    if (!thread_mode) {
        for (i=0; i<CRYPTO_num_locks(); i++) {

}

void threading_cleanup(void) {
#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
    int i;
    if (thread_mode) {
        CRYPTO_set_locking_callback(NULL);
- 

Return to bug 674942

Lines 5-11 Link Here

(-)a/SWIG/_threads.i (-6 / +5 lines)
5	#include <pythread.h>	5	#include <pythread.h>
6	#include <openssl/crypto.h>	6	#include <openssl/crypto.h>
7		7
8	#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L	8	#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L \|\| (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
9	#define CRYPTO_num_locks() (CRYPTO_NUM_LOCKS)	9	#define CRYPTO_num_locks() (CRYPTO_NUM_LOCKS)
10	static PyThread_type_lock lock_cs[CRYPTO_num_locks()];	10	static PyThread_type_lock lock_cs[CRYPTO_num_locks()];
11	static long lock_count[CRYPTO_num_locks()];	11	static long lock_count[CRYPTO_num_locks()];
Lines 13-19 static int thread_mode = 0; Link Here
13	#endif	13	#endif
14		14
15	void threading_locking_callback(int mode, int type, const char *file, int line) {	15	void threading_locking_callback(int mode, int type, const char *file, int line) {
16	#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L	16	#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L \|\| (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
17	if (mode & CRYPTO_LOCK) {	17	if (mode & CRYPTO_LOCK) {
18	PyThread_acquire_lock(lock_cs[type], WAIT_LOCK);	18	PyThread_acquire_lock(lock_cs[type], WAIT_LOCK);
19	lock_count[type]++;	19	lock_count[type]++;
Lines 25-31 void threading_locking_callback(int mode, int type, const char *file, int line) Link Here
25	}	25	}
26		26
27	unsigned long threading_id_callback(void) {	27	unsigned long threading_id_callback(void) {
28	#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L	28	#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L \|\| (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
29	return (unsigned long)PyThread_get_thread_ident();	29	return (unsigned long)PyThread_get_thread_ident();
30	#else	30	#else
31	return (unsigned long)0;	31	return (unsigned long)0;
Lines 35-41 unsigned long threading_id_callback(void) { Link Here
35		35
36	%inline %{	36	%inline %{
37	void threading_init(void) {	37	void threading_init(void) {
38	#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L	38	#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L \|\| (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
39	int i;	39	int i;
40	if (!thread_mode) {	40	if (!thread_mode) {
41	for (i=0; i<CRYPTO_num_locks(); i++) {	41	for (i=0; i<CRYPTO_num_locks(); i++) {
Lines 50-56 void threading_init(void) { Link Here
50	}	50	}
51		51
52	void threading_cleanup(void) {	52	void threading_cleanup(void) {
53	#if defined(THREADING) && OPENSSL_VERSION_NUMBER < 0x10100000L	53	#if defined(THREADING) && (OPENSSL_VERSION_NUMBER < 0x10100000L \|\| (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL))
54	int i;	54	int i;
55	if (thread_mode) {	55	if (thread_mode) {
56	CRYPTO_set_locking_callback(NULL);	56	CRYPTO_set_locking_callback(NULL);
57	-