Fix build after libcrypto bump.
ok sthen
This commit is contained in:
tb
parent
27012f61f2
commit
374937d15c
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-qt_src_network_ssl_qsslsocket_openssl_symbols_cpp,v 1.2 2018/07/24 12:03:11 sthen Exp $
|
||||
$OpenBSD: patch-qt_src_network_ssl_qsslsocket_openssl_symbols_cpp,v 1.3 2018/08/26 11:58:36 tb Exp $
|
||||
|
||||
Index: qt/src/network/ssl/qsslsocket_openssl_symbols.cpp
|
||||
--- qt/src/network/ssl/qsslsocket_openssl_symbols.cpp.orig
|
||||
@ -102,7 +102,7 @@ Index: qt/src/network/ssl/qsslsocket_openssl_symbols.cpp
|
||||
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)
|
||||
@@ -321,40 +286,11 @@ DEFINEFUNC2(int, i2d_RSAPrivateKey, const RSA *a, a, u
|
||||
@@ -321,30 +286,11 @@ DEFINEFUNC2(int, i2d_RSAPrivateKey, const RSA *a, a, u
|
||||
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
|
||||
@ -130,20 +130,20 @@ Index: qt/src/network/ssl/qsslsocket_openssl_symbols.cpp
|
||||
-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
|
||||
#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)
|
||||
@@ -352,9 +298,6 @@ DEFINEFUNC(ASN1_TIME *, X509_get_notBefore, X509 *x, x
|
||||
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, const BIGNUM **p, p, const BIGNUM **q, q, const BIGNUM **g, g, return, return)
|
||||
-#endif
|
||||
-
|
||||
#ifdef Q_OS_SYMBIAN
|
||||
#define RESOLVEFUNC(func, ordinal, lib) \
|
||||
if (!(_q_##func = _q_PTR_##func(lib->resolve(#ordinal)))) \
|
||||
@@ -648,12 +584,8 @@ bool q_resolveOpenSslSymbols()
|
||||
@@ -648,12 +591,8 @@ bool q_resolveOpenSslSymbols()
|
||||
static volatile bool symbolsResolved = false;
|
||||
static volatile bool triedToResolveSymbols = false;
|
||||
#ifndef QT_NO_THREAD
|
||||
@ -156,7 +156,7 @@ Index: qt/src/network/ssl/qsslsocket_openssl_symbols.cpp
|
||||
if (symbolsResolved)
|
||||
return true;
|
||||
if (triedToResolveSymbols)
|
||||
@@ -686,11 +618,9 @@ bool q_resolveOpenSslSymbols()
|
||||
@@ -686,11 +625,9 @@ bool q_resolveOpenSslSymbols()
|
||||
RESOLVEFUNC(BIO_write, 269, libs.second )
|
||||
RESOLVEFUNC(BN_num_bits, 387, libs.second )
|
||||
RESOLVEFUNC(CRYPTO_free, 469, libs.second )
|
||||
@ -168,7 +168,7 @@ Index: qt/src/network/ssl/qsslsocket_openssl_symbols.cpp
|
||||
RESOLVEFUNC(DSA_free, 594, libs.second )
|
||||
RESOLVEFUNC(ERR_error_string, 744, libs.second )
|
||||
RESOLVEFUNC(ERR_get_error, 749, libs.second )
|
||||
@@ -748,10 +678,8 @@ bool q_resolveOpenSslSymbols()
|
||||
@@ -748,10 +685,8 @@ bool q_resolveOpenSslSymbols()
|
||||
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 )
|
||||
@ -179,7 +179,7 @@ Index: qt/src/network/ssl/qsslsocket_openssl_symbols.cpp
|
||||
RESOLVEFUNC(SSL_new, 140, libs.first )
|
||||
#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
|
||||
RESOLVEFUNC(SSL_ctrl, 95, libs.first )
|
||||
@@ -823,11 +751,9 @@ bool q_resolveOpenSslSymbols()
|
||||
@@ -823,11 +758,9 @@ bool q_resolveOpenSslSymbols()
|
||||
RESOLVEFUNC(BIO_write)
|
||||
RESOLVEFUNC(BN_num_bits)
|
||||
RESOLVEFUNC(CRYPTO_free)
|
||||
@ -191,7 +191,7 @@ Index: qt/src/network/ssl/qsslsocket_openssl_symbols.cpp
|
||||
RESOLVEFUNC(DSA_free)
|
||||
RESOLVEFUNC(ERR_error_string)
|
||||
RESOLVEFUNC(ERR_get_error)
|
||||
@@ -857,17 +783,10 @@ bool q_resolveOpenSslSymbols()
|
||||
@@ -857,17 +790,10 @@ bool q_resolveOpenSslSymbols()
|
||||
RESOLVEFUNC(RAND_seed)
|
||||
RESOLVEFUNC(RAND_status)
|
||||
RESOLVEFUNC(RSA_free)
|
||||
@ -209,7 +209,7 @@ Index: qt/src/network/ssl/qsslsocket_openssl_symbols.cpp
|
||||
RESOLVEFUNC(SSL_CIPHER_description)
|
||||
RESOLVEFUNC(SSL_CTX_check_private_key)
|
||||
RESOLVEFUNC(SSL_CTX_ctrl)
|
||||
@@ -882,7 +801,6 @@ bool q_resolveOpenSslSymbols()
|
||||
@@ -882,7 +808,6 @@ bool q_resolveOpenSslSymbols()
|
||||
RESOLVEFUNC(SSL_CTX_use_PrivateKey)
|
||||
RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
|
||||
RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
|
||||
@ -217,7 +217,7 @@ Index: qt/src/network/ssl/qsslsocket_openssl_symbols.cpp
|
||||
RESOLVEFUNC(SSL_accept)
|
||||
RESOLVEFUNC(SSL_clear)
|
||||
RESOLVEFUNC(SSL_connect)
|
||||
@@ -893,12 +811,8 @@ bool q_resolveOpenSslSymbols()
|
||||
@@ -893,12 +818,8 @@ bool q_resolveOpenSslSymbols()
|
||||
RESOLVEFUNC(SSL_get_peer_cert_chain)
|
||||
RESOLVEFUNC(SSL_get_peer_certificate)
|
||||
RESOLVEFUNC(SSL_get_verify_result)
|
||||
@ -230,7 +230,7 @@ Index: qt/src/network/ssl/qsslsocket_openssl_symbols.cpp
|
||||
RESOLVEFUNC(SSL_new)
|
||||
#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
|
||||
RESOLVEFUNC(SSL_ctrl)
|
||||
@@ -909,39 +823,13 @@ bool q_resolveOpenSslSymbols()
|
||||
@@ -909,19 +830,6 @@ bool q_resolveOpenSslSymbols()
|
||||
RESOLVEFUNC(SSL_set_connect_state)
|
||||
RESOLVEFUNC(SSL_shutdown)
|
||||
RESOLVEFUNC(SSL_write)
|
||||
@ -247,13 +247,13 @@ Index: qt/src/network/ssl/qsslsocket_openssl_symbols.cpp
|
||||
- RESOLVEFUNC(RSA_bits)
|
||||
- RESOLVEFUNC(DSA_security_bits)
|
||||
- RESOLVEFUNC(DSA_get0_pqg)
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
- RESOLVEFUNC(X509_get_notAfter)
|
||||
- RESOLVEFUNC(X509_get_notBefore)
|
||||
-#else
|
||||
- RESOLVEFUNC(X509_getm_notAfter)
|
||||
- RESOLVEFUNC(X509_getm_notBefore)
|
||||
-#endif
|
||||
#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
RESOLVEFUNC(X509_get_notAfter)
|
||||
RESOLVEFUNC(X509_get_notBefore)
|
||||
@@ -929,19 +837,13 @@ bool q_resolveOpenSslSymbols()
|
||||
RESOLVEFUNC(X509_getm_notAfter)
|
||||
RESOLVEFUNC(X509_getm_notBefore)
|
||||
#endif
|
||||
-#endif
|
||||
-
|
||||
#ifndef OPENSSL_NO_SSL2
|
||||
@ -270,7 +270,7 @@ Index: qt/src/network/ssl/qsslsocket_openssl_symbols.cpp
|
||||
RESOLVEFUNC(TLSv1_client_method)
|
||||
#ifndef OPENSSL_NO_SSL2
|
||||
RESOLVEFUNC(SSLv2_server_method)
|
||||
@@ -949,11 +837,7 @@ bool q_resolveOpenSslSymbols()
|
||||
@@ -949,11 +851,7 @@ bool q_resolveOpenSslSymbols()
|
||||
#ifndef OPENSSL_NO_SSL3_METHOD
|
||||
RESOLVEFUNC(SSLv3_server_method)
|
||||
#endif
|
||||
@ -282,7 +282,7 @@ Index: qt/src/network/ssl/qsslsocket_openssl_symbols.cpp
|
||||
RESOLVEFUNC(TLSv1_server_method)
|
||||
RESOLVEFUNC(X509_NAME_entry_count)
|
||||
RESOLVEFUNC(X509_NAME_get_entry)
|
||||
@@ -970,11 +854,7 @@ bool q_resolveOpenSslSymbols()
|
||||
@@ -970,11 +868,7 @@ bool q_resolveOpenSslSymbols()
|
||||
RESOLVEFUNC(X509_STORE_CTX_get_error)
|
||||
RESOLVEFUNC(X509_STORE_CTX_get_error_depth)
|
||||
RESOLVEFUNC(X509_STORE_CTX_get_current_cert)
|
||||
@ -294,7 +294,7 @@ Index: qt/src/network/ssl/qsslsocket_openssl_symbols.cpp
|
||||
RESOLVEFUNC(X509_cmp)
|
||||
#ifndef SSLEAY_MACROS
|
||||
RESOLVEFUNC(X509_dup)
|
||||
@@ -995,18 +875,10 @@ bool q_resolveOpenSslSymbols()
|
||||
@@ -995,18 +889,10 @@ bool q_resolveOpenSslSymbols()
|
||||
RESOLVEFUNC(d2i_DSAPrivateKey)
|
||||
RESOLVEFUNC(d2i_RSAPrivateKey)
|
||||
#endif
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-qt_src_network_ssl_qsslsocket_openssl_symbols_p_h,v 1.1 2018/07/24 12:03:11 sthen Exp $
|
||||
$OpenBSD: patch-qt_src_network_ssl_qsslsocket_openssl_symbols_p_h,v 1.2 2018/08/26 11:58:36 tb Exp $
|
||||
|
||||
Index: qt/src/network/ssl/qsslsocket_openssl_symbols_p.h
|
||||
--- qt/src/network/ssl/qsslsocket_openssl_symbols_p.h.orig
|
||||
@ -136,25 +136,7 @@ Index: qt/src/network/ssl/qsslsocket_openssl_symbols_p.h
|
||||
#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))
|
||||
@@ -475,17 +410,8 @@ void q_DSA_get0_pqg(const DSA *d, const BIGNUM **p, co
|
||||
#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)
|
||||
-
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
#define q_X509_get_notAfter(x) X509_get_notAfter(x)
|
||||
#define q_X509_get_notBefore(x) X509_get_notBefore(x)
|
||||
-#else
|
||||
-ASN1_TIME *q_X509_getm_notAfter(X509 *x);
|
||||
-ASN1_TIME *q_X509_getm_notBefore(X509 *x);
|
||||
-#define q_X509_get_notAfter(x) q_X509_getm_notAfter(x)
|
||||
-#define q_X509_get_notBefore(x) q_X509_getm_notBefore(x)
|
||||
-#endif
|
||||
-
|
||||
#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,\
|
||||
@@ -495,21 +421,10 @@ ASN1_TIME *q_X509_getm_notBefore(X509 *x);
|
||||
@@ -495,21 +430,10 @@ ASN1_TIME *q_X509_getm_notBefore(X509 *x);
|
||||
#else
|
||||
#define q_OpenSSL_add_all_algorithms() q_OPENSSL_add_all_algorithms_noconf()
|
||||
#endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user