mirror of
https://bitbucket.org/smil3y/katie.git
synced 2025-02-24 02:42:55 +00:00
replace SSL support check function with pre-processor conditional
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
4b4a00f2f8
commit
810cf3713a
3 changed files with 4 additions and 13 deletions
|
@ -513,9 +513,7 @@ bool QSslSocketPrivate::supportsSsl()
|
|||
|
||||
bool QSslSocketPrivate::ensureLibraryLoaded()
|
||||
{
|
||||
if (!q_resolveOpenSslSymbols())
|
||||
return false;
|
||||
|
||||
#ifndef QT_NO_OPENSSL
|
||||
// Check if the library itself needs to be initialized.
|
||||
QMutexLocker locker(openssl_locks()->initLock());
|
||||
if (!s_libraryLoaded) {
|
||||
|
@ -558,6 +556,9 @@ bool QSslSocketPrivate::ensureLibraryLoaded()
|
|||
}
|
||||
}
|
||||
return true;
|
||||
#else
|
||||
return false;
|
||||
#endif // QT_NO_OPENSSL
|
||||
}
|
||||
|
||||
void QSslSocketPrivate::ensureCiphersAndCertsLoaded()
|
||||
|
|
|
@ -287,15 +287,6 @@ DEFINEFUNC(void, OPENSSL_add_all_algorithms_conf, void, DUMMYARG, return, DUMMYA
|
|||
DEFINEFUNC3(int, SSL_CTX_load_verify_locations, SSL_CTX *ctx, ctx, const char *CAfile, CAfile, const char *CApath, CApath, return 0, return)
|
||||
DEFINEFUNC(long, SSLeay, void, DUMMYARG, return 0, return)
|
||||
|
||||
|
||||
bool q_resolveOpenSslSymbols()
|
||||
{
|
||||
#ifdef QT_NO_OPENSSL
|
||||
return false;
|
||||
#endif
|
||||
return true;
|
||||
}
|
||||
|
||||
//==============================================================================
|
||||
// contributed by Jay Case of Sarvega, Inc.; http://sarvega.com/
|
||||
// Based on X509_cmp_time() for intitial buffer hacking.
|
||||
|
|
|
@ -98,7 +98,6 @@ QT_BEGIN_NAMESPACE
|
|||
// **************** Static declarations ******************
|
||||
|
||||
|
||||
bool q_resolveOpenSslSymbols();
|
||||
long q_ASN1_INTEGER_get(ASN1_INTEGER *a);
|
||||
unsigned char * q_ASN1_STRING_data(ASN1_STRING *a);
|
||||
int q_ASN1_STRING_length(ASN1_STRING *a);
|
||||
|
|
Loading…
Add table
Reference in a new issue