AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved detection of libcrypto and libssl.

Browse Source 
The previous solution didn't work on systems where the libraries
aren't in the same location.
Now we search for both libcrypto and libssl and load them if their
versions match, even if they are in different directories.

Task-number: QTBUG-25398

Change-Id: I37164638890586947d07670d8a59fc53a84f9c42
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
This commit is contained in:
Niels Weber 2012-04-20 14:31:34 +02:00 committed by Qt by Nokia
parent a5ff60dc96
commit 8643e1992f
1 changed files with 51 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/network/ssl/qsslsocket_openssl_symbols.cpp
View File

@ -368,7 +368,7 @@ static int dlIterateCallback(struct dl_phdr_info *info, size_t size, void *data)
}
#endif
static QStringList findAllLibSsl()
static QStringList libraryPathList()
{
QStringList paths;
# ifdef Q_OS_DARWIN
@ -379,6 +379,9 @@ static QStringList findAllLibSsl()
.split(QLatin1Char(':'), QString::SkipEmptyParts);
# endif
paths << QLatin1String("/lib") << QLatin1String("/usr/lib") << QLatin1String("/usr/local/lib");
paths << QLatin1String("/lib64") << QLatin1String("/usr/lib64") << QLatin1String("/usr/local/lib64");
paths << QLatin1String("/lib32") << QLatin1String("/usr/lib32") << QLatin1String("/usr/local/lib32");
#ifdef Q_OS_LINUX
// discover paths of already loaded libraries
QSet<QString> loadedPaths;
@ -386,9 +389,17 @@ static QStringList findAllLibSsl()
paths.append(loadedPaths.toList());
#endif
return paths;
}
static QStringList findAllLibSsl()
{
QStringList paths = libraryPathList();
QStringList foundSsls;
foreach (const QString &path, paths) {
QDir dir = QDir(path);
QDir dir(path);
QStringList entryList = dir.entryList(QStringList() << QLatin1String("libssl.*"), QDir::Files);
qSort(entryList.begin(), entryList.end(), libGreaterThan);
@ -398,6 +409,23 @@ static QStringList findAllLibSsl()
return foundSsls;
}
static QStringList findAllLibCrypto()
{
QStringList paths = libraryPathList();
QStringList foundCryptos;
foreach (const QString &path, paths) {
QDir dir(path);
QStringList entryList = dir.entryList(QStringList() << QLatin1String("libcrypto.*"), QDir::Files);
qSort(entryList.begin(), entryList.end(), libGreaterThan);
foreach (const QString &entry, entryList)
foundCryptos << path + QLatin1Char('/') + entry;
}
return foundCryptos;
}
# endif
#ifdef Q_OS_WIN
@ -490,18 +518,29 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl()
// third attempt: loop on the most common library paths and find libssl
QStringList sslList = findAllLibSsl();
foreach (const QString &ssl, sslList) {
QString crypto = ssl;
crypto.replace(QLatin1String("ssl"), QLatin1String("crypto"));
libssl->setFileNameAndVersion(ssl, -1);
QStringList cryptoList = findAllLibCrypto();
foreach (const QString &crypto, cryptoList) {
libcrypto->setFileNameAndVersion(crypto, -1);
if (libcrypto->load() && libssl->load()) {
// libssl.so.0 and libcrypto.so.0 found
return pair;
} else {
libssl->unload();
libcrypto->unload();
if (libcrypto->load()) {
QFileInfo fi(crypto);
QString version = fi.completeSuffix();
foreach (const QString &ssl, sslList) {
if (!ssl.endsWith(version))
continue;
libssl->setFileNameAndVersion(ssl, -1);
if (libssl->load()) {
// libssl.so.x and libcrypto.so.x found
return pair;
} else {
libssl->unload();
}
}
}
libcrypto->unload();
}
// failed to load anything