ObjOpenSSL  Check-in [ed3f707a5c]

Overview
Comment:Fix compilation with OpenSSL 1.1
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: ed3f707a5cad8d13441d03e409a5acd66ae12bb897d25a607f47a686619cc9c3
User & Date: js on 2017-08-01 18:49:39
Other Links: manifest | tags
Context
2017-08-01
19:03
Fix compilation with GCC check-in: b9937d8663 user: js tags: trunk
18:49
Fix compilation with OpenSSL 1.1 check-in: ed3f707a5c user: js tags: trunk
2017-07-22
23:34
SSLSocket: Re-add verifyPeerCertificate check-in: ecf34717f0 user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified src/SSLSocket.m from [1e01bcd98b] to [ab1d4e1a5d].

︙︙
111
112
113
114
115
116
117


118
119
120
121
122
123
124
125


126
127
128
129
130
131
132

{
	int m;

	if (self != [SSLSocket class])
		return;

	CRYPTO_set_id_callback(&get_thread_id);



	/* Generate number of mutexes needed */
	m = CRYPTO_num_locks();
	ssl_mutexes = malloc(m * sizeof(of_mutex_t));
	for (m--; m >= 0; m--)
		of_mutex_new(&ssl_mutexes[m]);

	CRYPTO_set_locking_callback(&locking_callback);



	SSL_library_init();

	if ((ctx = SSL_CTX_new(SSLv23_method())) == NULL)
		@throw [OFInitializationFailedException
		    exceptionWithClass: self];









>
>








>
>








111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136

{
	int m;

	if (self != [SSLSocket class])
		return;

	CRYPTO_set_id_callback(&get_thread_id);
	/* OpenSSL >= 1.1 defines the line above to a nop */
	(void)get_thread_id;

	/* Generate number of mutexes needed */
	m = CRYPTO_num_locks();
	ssl_mutexes = malloc(m * sizeof(of_mutex_t));
	for (m--; m >= 0; m--)
		of_mutex_new(&ssl_mutexes[m]);

	CRYPTO_set_locking_callback(&locking_callback);
	/* OpenSSL >= 1.1 defines the line above to a nop */
	(void)locking_callback;

	SSL_library_init();

	if ((ctx = SSL_CTX_new(SSLv23_method())) == NULL)
		@throw [OFInitializationFailedException
		    exceptionWithClass: self];
︙︙