The_Great_Archive/xca
1
0
Fork 0
mirror of https://github.com/chris2511/xca.git synced 2026-09-12 19:51:05 +05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Christian Hohnstaedt 2020-04-05 13:49:01 +02:00
commit b7d3e6a3cc
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/func.cpp
View File

@ -229,8 +229,8 @@ QString relativePath(QString path)
QFileInfo fi_path(path);
QFileInfo fi_home(getHomeDir());
QString prefix = fi_home.canonicalFilePath();
path = fi_path.canonicalFilePath();
QString prefix = fi_home.absoluteFilePath();
path = fi_path.absoluteFilePath();
if (portable_app()) {
if (path.startsWith(prefix))

10
lib/pkcs11_lib.cpp
View File

@ -52,6 +52,7 @@ pkcs11_lib::pkcs11_lib(const QString &f)
CK_RV rv;
file = name2File(f, &enabled);
p11 = NULL;
dl_handle = NULL;
if (!enabled)
return;
@ -59,7 +60,14 @@ pkcs11_lib::pkcs11_lib(const QString &f)
lt_dlinit();
try {
dl_handle = lt_dlopen(find_filecodec(file));
/* PKCS11 libs without path should be looked up locally */
QString realfile = file;
if (!realfile.contains("/") && !realfile.isEmpty())
realfile.prepend("./");
QByteArray localfn = find_filecodec(realfile);
if (localfn.isEmpty())
throw errorEx(QObject::tr("Invalid filename: %1").arg(file));
dl_handle = lt_dlopen(localfn);
if (dl_handle == NULL)
throw errorEx(QObject::tr("Failed to open PKCS11 library: %1: %2").arg(file).arg(lt_dlerror()));