--- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslcertificate.cpp.gcc7 2017-10-10 01:48:46.293207220 +0200 +++ qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslcertificate.cpp 2017-10-10 02:39:33.577822717 +0200 @@ -696,7 +696,7 @@ static QMap _q_mapFrom 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); - q_CRYPTO_free(data); + q_CRYPTO_free(data, OPENSSL_FILE, OPENSSL_LINE); } return info; } --- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols.cpp 2017-10-10 02:40:09.200573999 +0200 +++ qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols.cpp 2017-10-10 03:28:42.002259271 +0200 @@ -111,16 +111,16 @@ 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) -DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return 0, return) +DEFINEFUNC(BIO *, BIO_new, BIO_METHOD const *a, a, return 0, return) 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) -DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return) +DEFINEFUNC(BIO_METHOD const *, BIO_s_mem, void, DUMMYARG, return 0, return) 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) DEFINEFUNC(int, CRYPTO_num_locks, DUMMYARG, DUMMYARG, return 0, return) 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) -DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG) +DEFINEFUNC3(void, CRYPTO_free, void *a, a, const char *file, file, int line, line, return, DUMMYARG) DEFINEFUNC(void, DSA_free, DSA *a, a, return, DUMMYARG) #if OPENSSL_VERSION_NUMBER < 0x00908000L DEFINEFUNC3(X509 *, d2i_X509, X509 **a, a, unsigned char **b, b, long c, c, return 0, return) @@ -300,7 +300,7 @@ DEFINEFUNC(int, DSA_security_bits, const DSA *dsa, dsa, return 0, return) DEFINEFUNC(ASN1_TIME *, X509_get_notAfter, X509 *x, x, return 0, return) DEFINEFUNC(ASN1_TIME *, X509_get_notBefore, X509 *x, x, return 0, return) -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, BIGNUM const **p, p, BIGNUM const **q, q, BIGNUM const **g, g, return, return) #endif #ifdef Q_OS_SYMBIAN --- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols_p.h 2017-10-10 02:37:43.856588477 +0200 +++ qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols_p.h 2017-10-10 03:29:20.388003594 +0200 @@ -207,16 +207,16 @@ 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); -BIO *q_BIO_new(BIO_METHOD *a); +BIO *q_BIO_new(BIO_METHOD const *a); BIO *q_BIO_new_mem_buf(void *a, int b); int q_BIO_read(BIO *a, void *b, int c); -BIO_METHOD *q_BIO_s_mem(); +BIO_METHOD const *q_BIO_s_mem(); int q_BIO_write(BIO *a, const void *b, int c); int q_BN_num_bits(const BIGNUM *a); 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); +void q_CRYPTO_free(void *a, const char *file, int line); void q_DSA_free(DSA *a); #if OPENSSL_VERSION_NUMBER >= 0x00908000L // 0.9.8 broke SC and BC by changing this function's signature. @@ -415,7 +415,7 @@ 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, BIGNUM const **p, BIGNUM const **q, BIGNUM const **g); #endif #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st) --- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslkey.cpp.gcc7 2017-10-10 02:59:26.063849950 +0200 +++ qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslkey.cpp 2017-10-10 03:30:35.751501362 +0200 @@ -328,7 +328,7 @@ int QSslKey::length() const if (d->algorithm == QSsl::Rsa) { return q_RSA_bits(d->rsa); }else{ - BIGNUM *p = NULL; + BIGNUM const *p = NULL; q_DSA_get0_pqg(d->dsa, &p, NULL, NULL); return q_BN_num_bits(p); }