-
Notifications
You must be signed in to change notification settings - Fork 24
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fixed Croatian PKCS11 module path #85
base: main
Are you sure you want to change the base?
Conversation
Fixed paths for croatian pkcs11 modul from eid to certilia
Thanks a lot for the fix! We will include this soon. |
We should make this backwards-compatible, something along the lines of the following: #include <filesystem>
namespace fs = std::filesystem;
inline fs::path croatianPkcs11ModulePath()
{
#ifdef _WIN32
fs::path certiliaPath = programFilesPath() / L"AKD/Certilia Middleware/pkcs11/AkdEidPkcs11_64.dll";
fs::path eidPath = programFilesPath() / L"AKD/eID Middleware/pkcs11/AkdEidPkcs11_64.dll";
return fs::exists(certiliaPath) ? certiliaPath : eidPath;
#elif defined __APPLE__
fs::path certiliaPath = "/Library/AKD/Certilia Middleware/pkcs11/libEidPkcs11.so";
fs::path eidPath = "/Library/AKD/eID Middleware/pkcs11/libEidPkcs11.so";
return fs::exists(certiliaPath) ? certiliaPath : eidPath;
#else // Linux
fs::path certiliaPath = "/usr/lib/akd/certiliamiddleware/pkcs11/libEidPkcs11.so";
fs::path eidPath = "/usr/lib/akd/eidmiddleware/pkcs11/libEidPkcs11.so";
return fs::exists(certiliaPath) ? certiliaPath : eidPath;
#endif
} Can you please test this? |
Made the Croatian PKCS11 module path backwards-compatible
Hi, I have made the Croatian PKCS11 module path backward compatible. Also, fixed the path for macOS since the old one was invalid. @mrts since I'm not familiar with macOS I've created a check for .so and .dylib file extensions which may be unnecessary. |
Thanks! In macOS the only path should be |
We have made an unofficial, untested version 2.6.1 release candidate with support for Luxembourg cards and new version of Croatian eID middleware, it is available here. I included your work by cherry-picking your commit to this PR: #92. Thanks for your contribution again! Please test v2.6.1-rc1 and let us know if it works as expected. |
Fixed paths for croatian pkcs11 modul from eid to certilia
Signed-off-by: Firstname Lastname [email protected]