From 56ab7ae00af53a8494ba7a8e3ab69cd358f464b9 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Jan 05 2018 17:11:08 +0000 Subject: Fix openssl-1.1 FTBFS with -openssl-linked --- diff --git a/qt-everywhere-opensource-src-4.8.7-openssl-1.1.patch b/qt-everywhere-opensource-src-4.8.7-openssl-1.1.patch index aa30a00..6a99460 100644 --- a/qt-everywhere-opensource-src-4.8.7-openssl-1.1.patch +++ b/qt-everywhere-opensource-src-4.8.7-openssl-1.1.patch @@ -1,6 +1,6 @@ diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslcertificate.cpp qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslcertificate.cpp --- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslcertificate.cpp 2015-05-07 16:14:44.000000000 +0200 -+++ qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslcertificate.cpp 2018-01-05 12:06:06.113994377 +0100 ++++ qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslcertificate.cpp 2018-01-05 17:44:16.997588265 +0100 @@ -259,10 +259,10 @@ QByteArray QSslCertificate::version() const { @@ -62,9 +62,21 @@ diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslcertificate.cpp q_EVP_PKEY_free(pkey); return key; } +@@ -687,7 +696,11 @@ + unsigned char *data = 0; + int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e)); + info[QString::fromUtf8(obj)] = QString::fromUtf8((char*)data, size); ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + q_CRYPTO_free(data); ++#else ++ q_CRYPTO_free(data, __FILE__, __LINE__); ++#endif + } + return info; + } diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslkey.cpp qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslkey.cpp --- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslkey.cpp 2015-05-07 16:14:44.000000000 +0200 -+++ qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslkey.cpp 2018-01-05 12:06:06.335990971 +0100 ++++ qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslkey.cpp 2018-01-05 18:00:27.453937599 +0100 @@ -321,8 +321,19 @@ { if (d->isNull) @@ -75,10 +87,10 @@ diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslkey.cpp qt-every +#else + if (d->algorithm == QSsl::Rsa) { + return q_RSA_bits(d->rsa); -+ }else{ -+ BIGNUM *p = NULL; -+ q_DSA_get0_pqg(d->dsa, &p, NULL, NULL); -+ return q_BN_num_bits(p); ++ } else { ++ const BIGNUM *p = (const BIGNUM *) NULL; ++ q_DSA_get0_pqg(d->dsa, &p, (const BIGNUM **) NULL, (const BIGNUM **) NULL); ++ return q_BN_num_bits(p); + } +#endif + @@ -204,9 +216,23 @@ diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_p #endif diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols.cpp qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslsocket_openssl_symbols.cpp --- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols.cpp 2015-05-07 16:14:44.000000000 +0200 -+++ qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslsocket_openssl_symbols.cpp 2018-01-05 12:11:43.923809321 +0100 -@@ -117,9 +117,11 @@ ++++ qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslsocket_openssl_symbols.cpp 2018-01-05 17:59:10.636973932 +0100 +@@ -111,16 +111,30 @@ + DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **a, a, ASN1_STRING *b, b, return 0, return); + DEFINEFUNC4(long, BIO_ctrl, BIO *a, a, int b, b, long c, c, void *d, d, return -1, return) + DEFINEFUNC(int, BIO_free, BIO *a, a, return 0, return) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return 0, return) ++#else ++DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, return 0, return) ++#endif + DEFINEFUNC2(BIO *, BIO_new_mem_buf, void *a, a, int b, b, return 0, return) + DEFINEFUNC3(int, BIO_read, BIO *a, a, void *b, b, int c, c, return -1, return) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return) ++#else ++DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return) ++#endif DEFINEFUNC3(int, BIO_write, BIO *a, a, const void *b, b, int c, c, return -1, return) DEFINEFUNC(int, BN_num_bits, const BIGNUM *a, a, return 0, return) +#if OPENSSL_VERSION_NUMBER < 0x10100000L @@ -214,10 +240,15 @@ diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_s DEFINEFUNC(void, CRYPTO_set_locking_callback, void (*a)(int, int, const char *, int), a, return, DUMMYARG) DEFINEFUNC(void, CRYPTO_set_id_callback, unsigned long (*a)(), a, return, DUMMYARG) +#endif ++#if OPENSSL_VERSION_NUMBER < 0x10100000L DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG) ++#else ++DEFINEFUNC3(void, CRYPTO_free, void *a, a, const char *b, b, int c, c, return, DUMMYARG) ++#endif DEFINEFUNC(void, DSA_free, DSA *a, a, return, DUMMYARG) #if OPENSSL_VERSION_NUMBER < 0x00908000L -@@ -157,6 +159,7 @@ + DEFINEFUNC3(X509 *, d2i_X509, X509 **a, a, unsigned char **b, b, long c, c, return 0, return) +@@ -157,6 +171,7 @@ DEFINEFUNC2(void, RAND_seed, const void *a, a, int b, b, return, DUMMYARG) DEFINEFUNC(int, RAND_status, void, DUMMYARG, return -1, return) DEFINEFUNC(void, RSA_free, RSA *a, a, return, DUMMYARG) @@ -225,7 +256,7 @@ diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_s DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return) DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG) #if OPENSSL_VERSION_NUMBER >= 0x10000000L -@@ -166,6 +169,12 @@ +@@ -166,6 +181,12 @@ DEFINEFUNC(void, sk_free, STACK *a, a, return, DUMMYARG) DEFINEFUNC2(char *, sk_value, STACK *a, a, int b, b, return 0, return) #endif @@ -238,7 +269,7 @@ diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_s DEFINEFUNC(int, SSL_accept, SSL *a, a, return -1, return) DEFINEFUNC(int, SSL_clear, SSL *a, a, return -1, return) DEFINEFUNC3(char *, SSL_CIPHER_description, SSL_CIPHER *a, a, char *b, b, int c, c, return 0, return) -@@ -213,8 +222,12 @@ +@@ -213,8 +234,12 @@ #else DEFINEFUNC(long, SSL_get_verify_result, SSL *a, a, return -1, return) #endif @@ -246,12 +277,12 @@ diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_s DEFINEFUNC(int, SSL_library_init, void, DUMMYARG, return -1, return) DEFINEFUNC(void, SSL_load_error_strings, void, DUMMYARG, return, DUMMYARG) +#else -+DEFINEFUNC2(int, OPENSSL_init_ssl, uint64_t opts, opts, void *settings, settings, return -1, return) ++DEFINEFUNC2(int, OPENSSL_init_ssl, uint64_t opts, opts, const OPENSSL_INIT_SETTINGS *settings, settings, return -1, return) +#endif DEFINEFUNC(SSL *, SSL_new, SSL_CTX *a, a, return 0, return) #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT) DEFINEFUNC4(long, SSL_ctrl, SSL *a, a, int cmd, cmd, long larg, larg, void *parg, parg, return -1, return) -@@ -229,13 +242,21 @@ +@@ -229,13 +254,21 @@ DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return) #endif DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return) @@ -273,7 +304,7 @@ diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_s DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return) #else DEFINEFUNC(SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return) -@@ -274,7 +295,11 @@ +@@ -274,7 +307,11 @@ DEFINEFUNC(int, X509_STORE_CTX_get_error, X509_STORE_CTX *a, a, return -1, return) DEFINEFUNC(int, X509_STORE_CTX_get_error_depth, X509_STORE_CTX *a, a, return -1, return) DEFINEFUNC(X509 *, X509_STORE_CTX_get_current_cert, X509_STORE_CTX *a, a, return 0, return) @@ -285,7 +316,7 @@ diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_s DEFINEFUNC(X509_STORE_CTX *, X509_STORE_CTX_new, DUMMYARG, DUMMYARG, return 0, return) #ifdef SSLEAY_MACROS DEFINEFUNC2(int, i2d_DSAPrivateKey, const DSA *a, a, unsigned char **b, b, return -1, return) -@@ -282,10 +307,39 @@ +@@ -282,10 +319,34 @@ DEFINEFUNC3(RSA *, d2i_RSAPrivateKey, RSA **a, a, unsigned char **b, b, long c, c, return 0, return) DEFINEFUNC3(DSA *, d2i_DSAPrivateKey, DSA **a, a, unsigned char **b, b, long c, c, return 0, return) #endif @@ -293,7 +324,7 @@ diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_s DEFINEFUNC(void, OPENSSL_add_all_algorithms_noconf, void, DUMMYARG, return, DUMMYARG) DEFINEFUNC(void, OPENSSL_add_all_algorithms_conf, void, DUMMYARG, return, DUMMYARG) +#else -+DEFINEFUNC2(int, OPENSSL_init_crypto, uint64_t opts, opts, void *settings, settings, return -1, return) ++DEFINEFUNC2(int, OPENSSL_init_crypto, uint64_t opts, opts, const OPENSSL_INIT_SETTINGS *settings, settings, return -1, return) +#endif DEFINEFUNC3(int, SSL_CTX_load_verify_locations, SSL_CTX *ctx, ctx, const char *CAfile, CAfile, const char *CApath, CApath, return 0, return) +#if OPENSSL_VERSION_NUMBER < 0x10100000L @@ -313,19 +344,14 @@ diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_s +DEFINEFUNC(X509_PUBKEY *, X509_get_X509_PUBKEY, X509 *x, x, return 0, return) +DEFINEFUNC(int, RSA_bits, const RSA *rsa, rsa, return 0, return) +DEFINEFUNC(int, DSA_security_bits, const DSA *dsa, dsa, return 0, return) -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+DEFINEFUNC(ASN1_TIME *, X509_get_notAfter, X509 *x, x, return 0, return) -+DEFINEFUNC(ASN1_TIME *, X509_get_notBefore, X509 *x, x, return 0, return) -+#else +DEFINEFUNC(ASN1_TIME *, X509_getm_notAfter, X509 *x, x, return 0, return) +DEFINEFUNC(ASN1_TIME *, X509_getm_notBefore, X509 *x, x, return 0, return) -+#endif -+DEFINEFUNC4(void, DSA_get0_pqg, const DSA *d, d, BIGNUM **p, p, BIGNUM **q, q, BIGNUM **g, g, return, return) ++DEFINEFUNC4(void, DSA_get0_pqg, const DSA *d, d, const BIGNUM **p, p, const BIGNUM **q, q, const BIGNUM **g, g, return, return) +#endif #ifdef Q_OS_SYMBIAN #define RESOLVEFUNC(func, ordinal, lib) \ -@@ -580,7 +634,11 @@ +@@ -580,7 +641,11 @@ static volatile bool symbolsResolved = false; static volatile bool triedToResolveSymbols = false; #ifndef QT_NO_THREAD @@ -337,7 +363,7 @@ diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_s #endif if (symbolsResolved) return true; -@@ -614,9 +672,11 @@ +@@ -614,9 +679,11 @@ RESOLVEFUNC(BIO_write, 269, libs.second ) RESOLVEFUNC(BN_num_bits, 387, libs.second ) RESOLVEFUNC(CRYPTO_free, 469, libs.second ) @@ -349,7 +375,7 @@ diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_s RESOLVEFUNC(DSA_free, 594, libs.second ) RESOLVEFUNC(ERR_error_string, 744, libs.second ) RESOLVEFUNC(ERR_get_error, 749, libs.second ) -@@ -674,8 +734,10 @@ +@@ -674,8 +741,10 @@ RESOLVEFUNC(SSL_get_peer_cert_chain, 117, libs.first ) RESOLVEFUNC(SSL_get_peer_certificate, 118, libs.first ) RESOLVEFUNC(SSL_get_verify_result, 132, libs.first ) @@ -360,7 +386,7 @@ diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_s RESOLVEFUNC(SSL_new, 140, libs.first ) #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT) RESOLVEFUNC(SSL_ctrl, 95, libs.first ) -@@ -747,9 +809,11 @@ +@@ -747,9 +816,11 @@ RESOLVEFUNC(BIO_write) RESOLVEFUNC(BN_num_bits) RESOLVEFUNC(CRYPTO_free) @@ -372,7 +398,7 @@ diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_s RESOLVEFUNC(DSA_free) RESOLVEFUNC(ERR_error_string) RESOLVEFUNC(ERR_get_error) -@@ -779,10 +843,17 @@ +@@ -779,10 +850,17 @@ RESOLVEFUNC(RAND_seed) RESOLVEFUNC(RAND_status) RESOLVEFUNC(RSA_free) @@ -390,7 +416,7 @@ diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_s RESOLVEFUNC(SSL_CIPHER_description) RESOLVEFUNC(SSL_CTX_check_private_key) RESOLVEFUNC(SSL_CTX_ctrl) -@@ -797,6 +868,7 @@ +@@ -797,6 +875,7 @@ RESOLVEFUNC(SSL_CTX_use_PrivateKey) RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey) RESOLVEFUNC(SSL_CTX_use_PrivateKey_file) @@ -398,7 +424,7 @@ diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_s RESOLVEFUNC(SSL_accept) RESOLVEFUNC(SSL_clear) RESOLVEFUNC(SSL_connect) -@@ -807,8 +879,12 @@ +@@ -807,8 +886,12 @@ RESOLVEFUNC(SSL_get_peer_cert_chain) RESOLVEFUNC(SSL_get_peer_certificate) RESOLVEFUNC(SSL_get_verify_result) @@ -411,7 +437,7 @@ diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_s RESOLVEFUNC(SSL_new) #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT) RESOLVEFUNC(SSL_ctrl) -@@ -819,17 +895,47 @@ +@@ -819,17 +902,47 @@ RESOLVEFUNC(SSL_set_connect_state) RESOLVEFUNC(SSL_shutdown) RESOLVEFUNC(SSL_write) @@ -459,7 +485,7 @@ diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_s RESOLVEFUNC(TLSv1_server_method) RESOLVEFUNC(X509_NAME_entry_count) RESOLVEFUNC(X509_NAME_get_entry) -@@ -846,7 +952,11 @@ +@@ -846,7 +959,11 @@ RESOLVEFUNC(X509_STORE_CTX_get_error) RESOLVEFUNC(X509_STORE_CTX_get_error_depth) RESOLVEFUNC(X509_STORE_CTX_get_current_cert) @@ -471,7 +497,7 @@ diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_s RESOLVEFUNC(X509_cmp) #ifndef SSLEAY_MACROS RESOLVEFUNC(X509_dup) -@@ -867,10 +977,18 @@ +@@ -867,10 +984,18 @@ RESOLVEFUNC(d2i_DSAPrivateKey) RESOLVEFUNC(d2i_RSAPrivateKey) #endif @@ -492,24 +518,40 @@ diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_s delete libs.first; diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols_p.h qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslsocket_openssl_symbols_p.h --- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols_p.h 2015-05-07 16:14:44.000000000 +0200 -+++ qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslsocket_openssl_symbols_p.h 2018-01-05 12:06:06.336990956 +0100 -@@ -213,9 +213,15 @@ ++++ qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslsocket_openssl_symbols_p.h 2018-01-05 17:59:42.041550255 +0100 +@@ -207,16 +207,31 @@ + int q_ASN1_STRING_to_UTF8(unsigned char **a, ASN1_STRING *b); + long q_BIO_ctrl(BIO *a, int b, long c, void *d); + int q_BIO_free(BIO *a); ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + BIO *q_BIO_new(BIO_METHOD *a); ++#else ++BIO *q_BIO_new(const BIO_METHOD *a); ++#endif + BIO *q_BIO_new_mem_buf(void *a, int b); + int q_BIO_read(BIO *a, void *b, int c); ++#if OPENSSL_VERSION_NUMBER < 0x10100000L BIO_METHOD *q_BIO_s_mem(); ++#else ++const BIO_METHOD *q_BIO_s_mem(); ++#endif int q_BIO_write(BIO *a, const void *b, int c); int q_BN_num_bits(const BIGNUM *a); +#if OPENSSL_VERSION_NUMBER < 0x10100000L int q_CRYPTO_num_locks(); void q_CRYPTO_set_locking_callback(void (*a)(int, int, const char *, int)); void q_CRYPTO_set_id_callback(unsigned long (*a)()); + void q_CRYPTO_free(void *a); +#else +#define q_CRYPTO_num_locks() 1 +#define q_CRYPTO_set_locking_callback(a) +#define q_CRYPTO_set_id_callback(a) ++void q_CRYPTO_free(void *a, const char *b, int c); +#endif - void q_CRYPTO_free(void *a); void q_DSA_free(DSA *a); #if OPENSSL_VERSION_NUMBER >= 0x00908000L -@@ -258,6 +264,7 @@ + // 0.9.8 broke SC and BC by changing this function's signature. +@@ -258,6 +273,7 @@ void q_RAND_seed(const void *a, int b); int q_RAND_status(); void q_RSA_free(RSA *a); @@ -517,7 +559,7 @@ diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_s int q_sk_num(STACK *a); void q_sk_pop_free(STACK *a, void (*b)(void *)); #if OPENSSL_VERSION_NUMBER >= 0x10000000L -@@ -267,6 +274,16 @@ +@@ -267,6 +283,16 @@ void q_sk_free(STACK *a); char * q_sk_value(STACK *a, int b); #endif @@ -534,7 +576,7 @@ diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_s int q_SSL_accept(SSL *a); int q_SSL_clear(SSL *a); char *q_SSL_CIPHER_description(SSL_CIPHER *a, char *b, int c); -@@ -314,8 +331,14 @@ +@@ -314,8 +340,14 @@ #else long q_SSL_get_verify_result(SSL *a); #endif @@ -542,14 +584,14 @@ diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_s int q_SSL_library_init(); void q_SSL_load_error_strings(); +#else -+int q_OPENSSL_init_ssl(uint64_t opts, void *settings); -+#define q_SSL_library_init() q_OPENSSL_init_ssl(0, NULL) -+#define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL) ++int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); ++#define q_SSL_library_init() q_OPENSSL_init_ssl(0, (const OPENSSL_INIT_SETTINGS *) NULL) ++#define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, (const OPENSSL_INIT_SETTINGS *) NULL) +#endif SSL *q_SSL_new(SSL_CTX *a); #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT) long q_SSL_ctrl(SSL *ssl,int cmd, long larg, void *parg); -@@ -328,11 +351,21 @@ +@@ -328,11 +360,21 @@ #if OPENSSL_VERSION_NUMBER >= 0x10000000L const SSL_METHOD *q_SSLv2_client_method(); const SSL_METHOD *q_SSLv3_client_method(); @@ -571,7 +613,7 @@ diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_s const SSL_METHOD *q_TLSv1_server_method(); #else SSL_METHOD *q_SSLv2_client_method(); -@@ -377,7 +410,12 @@ +@@ -377,7 +419,12 @@ int q_X509_STORE_CTX_get_error(X509_STORE_CTX *ctx); int q_X509_STORE_CTX_get_error_depth(X509_STORE_CTX *ctx); X509 *q_X509_STORE_CTX_get_current_cert(X509_STORE_CTX *ctx); @@ -584,7 +626,7 @@ diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_s #define q_BIO_get_mem_data(b, pp) (int)q_BIO_ctrl(b,BIO_CTRL_INFO,0,(char *)pp) #define q_BIO_pending(b) (int)q_BIO_ctrl(b,BIO_CTRL_PENDING,0,NULL) -@@ -399,7 +437,25 @@ +@@ -399,7 +446,25 @@ PEM_ASN1_write_bio((int (*)(void*, unsigned char**))q_i2d_DSAPrivateKey,PEM_STRING_DSA,\ bp,(char *)x,enc,kstr,klen,cb,u) #endif @@ -604,13 +646,13 @@ diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_s +X509_PUBKEY * q_X509_get_X509_PUBKEY(X509 *x); +int q_RSA_bits(const RSA *rsa); +int q_DSA_security_bits(const DSA *dsa); -+void q_DSA_get0_pqg(const DSA *d, BIGNUM **p, BIGNUM **q, BIGNUM **g); ++void q_DSA_get0_pqg(const DSA *d, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g); +#endif + #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st) #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i) #define q_sk_GENERAL_NAME_num(st) q_SKM_sk_num(GENERAL_NAME, (st)) -@@ -410,8 +466,17 @@ +@@ -410,8 +475,17 @@ #define q_sk_SSL_CIPHER_value(st, i) q_SKM_sk_value(SSL_CIPHER, (st), (i)) #define q_SSL_CTX_add_extra_chain_cert(ctx,x509) \ q_SSL_CTX_ctrl(ctx,SSL_CTRL_EXTRA_CHAIN_CERT,0,(char *)x509) @@ -628,7 +670,7 @@ diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_s #define q_EVP_PKEY_assign_RSA(pkey,rsa) q_EVP_PKEY_assign((pkey),EVP_PKEY_RSA,\ (char *)(rsa)) #define q_EVP_PKEY_assign_DSA(pkey,dsa) q_EVP_PKEY_assign((pkey),EVP_PKEY_DSA,\ -@@ -421,10 +486,21 @@ +@@ -421,10 +495,21 @@ #else #define q_OpenSSL_add_all_algorithms() q_OPENSSL_add_all_algorithms_noconf() #endif @@ -636,9 +678,9 @@ diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_s void q_OPENSSL_add_all_algorithms_noconf(); void q_OPENSSL_add_all_algorithms_conf(); +#else -+int q_OPENSSL_init_crypto(uint64_t opts, void *settings); -+#define q_OPENSSL_add_all_algorithms_conf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS | OPENSSL_INIT_ADD_ALL_DIGESTS | OPENSSL_INIT_LOAD_CONFIG, NULL) -+# define q_OPENSSL_add_all_algorithms_noconf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL) ++int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); ++#define q_OPENSSL_add_all_algorithms_conf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS | OPENSSL_INIT_ADD_ALL_DIGESTS | OPENSSL_INIT_LOAD_CONFIG, (const OPENSSL_INIT_SETTINGS *) NULL) ++# define q_OPENSSL_add_all_algorithms_noconf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS | OPENSSL_INIT_ADD_ALL_DIGESTS, (const OPENSSL_INIT_SETTINGS *) NULL) +#endif int q_SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile, const char *CApath); +#if OPENSSL_VERSION_NUMBER < 0x10100000L diff --git a/qt.spec b/qt.spec index c489075..c5900d7 100644 --- a/qt.spec +++ b/qt.spec @@ -188,6 +188,7 @@ Patch93: qt-everywhere-opensource-src-4.8.7-alsa-1.1.patch # support OpenSSL 1.1.x, from Debian (Gert Wollny, Dmitry Eremin-Solenikov) # https://anonscm.debian.org/cgit/pkg-kde/qt/qt4-x11.git/tree/debian/patches/openssl_1.1.patch?h=experimental +# fixes for -openssl-linked by Kevin Kofler Patch94: qt-everywhere-opensource-src-4.8.7-openssl-1.1.patch # fix build with ICU >= 59, from OpenSUSE (Fabian Vogt)