fix Symbian ordinals for merge request re. utf8 characters in SSL certs
Task-number: QTBUG-7912 (cherry picked from commit 83c37059df7f23be482d4ecb2c54603a3665a33d)
This commit is contained in:
parent
a89436fd9d
commit
6c72eb8456
@ -522,6 +522,7 @@ bool q_resolveOpenSslSymbols()
|
|||||||
RESOLVEFUNC(ASN1_INTEGER_get, 48, libs.second )
|
RESOLVEFUNC(ASN1_INTEGER_get, 48, libs.second )
|
||||||
RESOLVEFUNC(ASN1_STRING_data, 71, libs.second )
|
RESOLVEFUNC(ASN1_STRING_data, 71, libs.second )
|
||||||
RESOLVEFUNC(ASN1_STRING_length, 76, libs.second )
|
RESOLVEFUNC(ASN1_STRING_length, 76, libs.second )
|
||||||
|
RESOLVEFUNC(ASN1_STRING_to_UTF8, 86, libs.second )
|
||||||
RESOLVEFUNC(BIO_ctrl, 184, libs.second )
|
RESOLVEFUNC(BIO_ctrl, 184, libs.second )
|
||||||
RESOLVEFUNC(BIO_free, 209, libs.second )
|
RESOLVEFUNC(BIO_free, 209, libs.second )
|
||||||
RESOLVEFUNC(BIO_new, 222, libs.second )
|
RESOLVEFUNC(BIO_new, 222, libs.second )
|
||||||
@ -612,7 +613,10 @@ bool q_resolveOpenSslSymbols()
|
|||||||
RESOLVEFUNC(SSLv23_server_method, 191, libs.first )
|
RESOLVEFUNC(SSLv23_server_method, 191, libs.first )
|
||||||
RESOLVEFUNC(TLSv1_server_method, 200, libs.first )
|
RESOLVEFUNC(TLSv1_server_method, 200, libs.first )
|
||||||
RESOLVEFUNC(SSL_CTX_load_verify_locations, 34, libs.first )
|
RESOLVEFUNC(SSL_CTX_load_verify_locations, 34, libs.first )
|
||||||
RESOLVEFUNC(X509_NAME_oneline, 1830, libs.second )
|
RESOLVEFUNC(X509_NAME_entry_count, 1821, libs.second )
|
||||||
|
RESOLVEFUNC(X509_NAME_get_entry, 1823, libs.second )
|
||||||
|
RESOLVEFUNC(X509_NAME_ENTRY_get_data, 1808, libs.second )
|
||||||
|
RESOLVEFUNC(X509_NAME_ENTRY_get_object, 1809, libs.second )
|
||||||
RESOLVEFUNC(X509_PUBKEY_get, 1844, libs.second )
|
RESOLVEFUNC(X509_PUBKEY_get, 1844, libs.second )
|
||||||
RESOLVEFUNC(X509_STORE_free, 1939, libs.second )
|
RESOLVEFUNC(X509_STORE_free, 1939, libs.second )
|
||||||
RESOLVEFUNC(X509_STORE_new, 1942, libs.second )
|
RESOLVEFUNC(X509_STORE_new, 1942, libs.second )
|
||||||
|
Loading…
Reference in New Issue
Block a user