Attachment #558324 for bug #562050

Lines 165-171 Link Here

(-)a/src/network/configure.json (-1 / +1 lines)
165	"test": {	165	"test": {
166	"include": "openssl/opensslv.h",	166	"include": "openssl/opensslv.h",
167	"tail": [	167	"tail": [
168	"#if !defined(OPENSSL_VERSION_NUMBER) \|\| OPENSSL_VERSION_NUMBER-0 < 0x10100000L",	168	"#if !defined(OPENSSL_VERSION_NUMBER) \|\| OPENSSL_VERSION_NUMBER-0 < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)",
169	"# error OpenSSL >= 1.1 is required",	169	"# error OpenSSL >= 1.1 is required",
170	"#endif"	170	"#endif"
171	]	171	]

Lines 249-255 void QSslContext::applyBackendConfig(QSslContext *sslContext) Link Here

(-)a/src/network/ssl/qsslcontext_openssl.cpp (-1 / +1 lines)
249	if (sslContext->sslConfiguration.backendConfiguration().isEmpty())	249	if (sslContext->sslConfiguration.backendConfiguration().isEmpty())
250	return;	250	return;
251		251
252	#if OPENSSL_VERSION_NUMBER >= 0x10002000L	252	#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
253	if (QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) {	253	if (QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) {
254	QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);	254	QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
255	if (cctx) {	255	if (cctx) {

Lines 359-365 int q_SSL_CTX_use_PrivateKey(SSL_CTX a, EVP_PKEY b); Link Here

(-)a/src/network/ssl/qsslsocket_openssl_symbols_p.h (-1 / +1 lines)
359	int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX a, RSA b);	359	int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX a, RSA b);
360	int q_SSL_CTX_use_PrivateKey_file(SSL_CTX a, const char b, int c);	360	int q_SSL_CTX_use_PrivateKey_file(SSL_CTX a, const char b, int c);
361	X509_STORE q_SSL_CTX_get_cert_store(const SSL_CTX a);	361	X509_STORE q_SSL_CTX_get_cert_store(const SSL_CTX a);
362	#if OPENSSL_VERSION_NUMBER >= 0x10002000L	362	#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
363	SSL_CONF_CTX *q_SSL_CONF_CTX_new();	363	SSL_CONF_CTX *q_SSL_CONF_CTX_new();
364	void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);	364	void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
365	void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX a, SSL_CTX b);	365	void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX a, SSL_CTX b);

Lines 78-85 Link Here

(-)a/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h (-2 / +2 lines)
78	unsigned char * q_ASN1_STRING_data(ASN1_STRING *a);	78	unsigned char * q_ASN1_STRING_data(ASN1_STRING *a);
79	BIO q_BIO_new_file(const char filename, const char *mode);	79	BIO q_BIO_new_file(const char filename, const char *mode);
80	void q_ERR_clear_error();	80	void q_ERR_clear_error();
81	Q_AUTOTEST_EXPORT BIO q_BIO_new(BIO_METHOD a);	81	Q_AUTOTEST_EXPORT BIO q_BIO_new(const BIO_METHOD a);
82	Q_AUTOTEST_EXPORT BIO_METHOD *q_BIO_s_mem();	82	Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
83	int q_CRYPTO_num_locks();	83	int q_CRYPTO_num_locks();
84	void q_CRYPTO_set_locking_callback(void (a)(int, int, const char , int));	84	void q_CRYPTO_set_locking_callback(void (a)(int, int, const char , int));
85	void q_CRYPTO_set_id_callback(unsigned long (*a)());	85	void q_CRYPTO_set_id_callback(unsigned long (*a)());

Return to bug 562050

Lines 214-221 DEFINEFUNC3(void , ASN1_dup, i2d_of_void a, a, d2i_of_void b, b, char c, c, Link Here

(-)a/src/network/ssl/qsslsocket_openssl_symbols.cpp (-3 / +3 lines)
214	#endif	214	#endif
215	DEFINEFUNC2(BIO , BIO_new_file, const char filename, filename, const char *mode, mode, return nullptr, return)	215	DEFINEFUNC2(BIO , BIO_new_file, const char filename, filename, const char *mode, mode, return nullptr, return)
216	DEFINEFUNC(void, ERR_clear_error, DUMMYARG, DUMMYARG, return, DUMMYARG)	216	DEFINEFUNC(void, ERR_clear_error, DUMMYARG, DUMMYARG, return, DUMMYARG)
217	DEFINEFUNC(BIO , BIO_new, BIO_METHOD a, a, return nullptr, return)	217	DEFINEFUNC(BIO , BIO_new, const BIO_METHOD a, a, return nullptr, return)
218	DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return nullptr, return)	218	DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return nullptr, return)
219	DEFINEFUNC(int, CRYPTO_num_locks, DUMMYARG, DUMMYARG, return 0, return)	219	DEFINEFUNC(int, CRYPTO_num_locks, DUMMYARG, DUMMYARG, return 0, return)
220	DEFINEFUNC(void, CRYPTO_set_locking_callback, void (a)(int, int, const char , int), a, return, DUMMYARG)	220	DEFINEFUNC(void, CRYPTO_set_locking_callback, void (a)(int, int, const char , int), a, return, DUMMYARG)
221	DEFINEFUNC(void, CRYPTO_set_id_callback, unsigned long (*a)(), a, return, DUMMYARG)	221	DEFINEFUNC(void, CRYPTO_set_id_callback, unsigned long (*a)(), a, return, DUMMYARG)
Lines 441-447 DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX a, a, EVP_PKEY b, b, return - Link Here
441	DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX a, a, RSA b, b, return -1, return)	441	DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX a, a, RSA b, b, return -1, return)
442	DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX a, a, const char b, b, int c, c, return -1, return)	442	DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX a, a, const char b, b, int c, c, return -1, return)
443	DEFINEFUNC(X509_STORE , SSL_CTX_get_cert_store, const SSL_CTX a, a, return nullptr, return)	443	DEFINEFUNC(X509_STORE , SSL_CTX_get_cert_store, const SSL_CTX a, a, return nullptr, return)
444	#if OPENSSL_VERSION_NUMBER >= 0x10002000L	444	#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
445	DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);	445	DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
446	DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);	446	DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
447	DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX a, a, SSL_CTX b, b, return, return);	447	DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX a, a, SSL_CTX b, b, return, return);