Lines 1-24
Link Here
|
1 |
--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2015-02-17 04:56:38 UTC |
1 |
--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2016-09-16 05:49:42 UTC |
2 |
+++ src/network/ssl/qsslsocket_openssl_symbols.cpp |
2 |
+++ src/network/ssl/qsslsocket_openssl_symbols.cpp |
3 |
@@ -611,8 +611,8 @@ static QPair<QLibrary*, QLibrary*> loadO |
3 |
@@ -424,6 +424,8 @@ DEFINEFUNC(void, EC_KEY_free, EC_KEY *ec |
|
|
4 |
DEFINEFUNC2(size_t, EC_get_builtin_curves, EC_builtin_curve * r, r, size_t nitems, nitems, return 0, return) |
5 |
#if OPENSSL_VERSION_NUMBER >= 0x10002000L |
6 |
DEFINEFUNC(int, EC_curve_nist2nid, const char *name, name, return 0, return) |
7 |
+DEFINEFUNC3(int, SSL_CTX_set1_curves, SSL_CTX *a, a, int *b, b, int c, c, return -1, return) |
8 |
+DEFINEFUNC3(int, SSL_CTX_set1_groups, SSL_CTX *a, a, const int *b, b, size_t c, c, return -1, return) |
9 |
#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L |
10 |
#endif // OPENSSL_NO_EC |
11 |
|
12 |
@@ -652,8 +654,8 @@ static QPair<QLibrary*, QLibrary*> loadO |
4 |
#endif |
13 |
#endif |
5 |
#if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so |
14 |
#if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so |
6 |
// first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER> |
15 |
// first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER> |
7 |
- libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER)); |
16 |
- libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER)); |
8 |
- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER)); |
17 |
- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER)); |
9 |
+ libssl->setFileNameAndVersion(QLatin1String("/usr/local/libssl"), QLatin1String(SHLIB_VERSION_NUMBER)); |
18 |
+ libssl->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libssl"), QLatin1String(SHLIB_VERSION_NUMBER)); |
10 |
+ libcrypto->setFileNameAndVersion(QLatin1String("/usr/local/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER)); |
19 |
+ libcrypto->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER)); |
11 |
if (libcrypto->load() && libssl->load()) { |
20 |
if (libcrypto->load() && libssl->load()) { |
12 |
// libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found |
21 |
// libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found |
13 |
return pair; |
22 |
return pair; |
14 |
@@ -629,8 +629,8 @@ static QPair<QLibrary*, QLibrary*> loadO |
23 |
@@ -670,8 +672,8 @@ static QPair<QLibrary*, QLibrary*> loadO |
15 |
// OS X's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third |
24 |
// OS X's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third |
16 |
// attempt, _after_ <bundle>/Contents/Frameworks has been searched. |
25 |
// attempt, _after_ <bundle>/Contents/Frameworks has been searched. |
17 |
// iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place. |
26 |
// iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place. |
18 |
- libssl->setFileNameAndVersion(QLatin1String("ssl"), -1); |
27 |
- libssl->setFileNameAndVersion(QLatin1String("ssl"), -1); |
19 |
- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1); |
28 |
- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1); |
20 |
+ libssl->setFileNameAndVersion(QLatin1String("/usr/local/lib/libssl"), -1); |
29 |
+ libssl->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libssl"), -1); |
21 |
+ libcrypto->setFileNameAndVersion(QLatin1String("/usr/local/lib/libcrypto"), -1); |
30 |
+ libcrypto->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libcrypto"), -1); |
22 |
if (libcrypto->load() && libssl->load()) { |
31 |
if (libcrypto->load() && libssl->load()) { |
23 |
// libssl.so.0 and libcrypto.so.0 found |
32 |
// libssl.so.0 and libcrypto.so.0 found |
24 |
return pair; |
33 |
return pair; |
|
|
34 |
@@ -976,8 +978,11 @@ bool q_resolveOpenSslSymbols() |
35 |
RESOLVEFUNC(EC_KEY_free) |
36 |
RESOLVEFUNC(EC_get_builtin_curves) |
37 |
#if OPENSSL_VERSION_NUMBER >= 0x10002000L |
38 |
- if (q_SSLeay() >= 0x10002000L) |
39 |
+ if (q_SSLeay() >= 0x10002000L) { |
40 |
RESOLVEFUNC(EC_curve_nist2nid) |
41 |
+ RESOLVEFUNC(SSL_CTX_set1_curves) |
42 |
+ RESOLVEFUNC(SSL_CTX_set1_groups) |
43 |
+ } |
44 |
#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L |
45 |
#endif // OPENSSL_NO_EC |
46 |
RESOLVEFUNC(PKCS12_parse) |