morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

smartcard: take in account the module path for listing smartcards

Browse Source 
The PKCS1 module was taken only for the kerberos part.
Also make as exported the winpr_NCryptOpenStorageProviderEx function.
This commit is contained in:
David Fort
2022-04-14 08:17:48 +02:00
committed by akallabeth
parent 752ac3b479
commit f232562d8b
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libfreerdp/core/smartcardlogon.c
View File

@@ -268,7 +268,18 @@ static BOOL smartcard_hw_enumerateCerts(const rdpSettings* settings, LPCWSTR csp
goto out;
}
status = NCryptOpenStorageProvider(&provider, csp, 0);
if (settings->Pkcs11Module)
{
LPCSTR paths[] = {
settings->Pkcs11Module,
NULL
};
status = winpr_NCryptOpenStorageProviderEx(&provider, csp, 0, paths);
}
else
status = NCryptOpenStorageProvider(&provider, csp, 0);
if (status != ERROR_SUCCESS)
{
WLog_ERR(TAG, "unable to open provider");

2
winpr/include/winpr/ncrypt.h
View File

@@ -198,7 +198,7 @@ extern "C"
* @param modulePaths [in] an array of library path to try to load ended with a NULL string
* @return ERROR_SUCCESS or an NTE error code something failed
*/
SECURITY_STATUS winpr_NCryptOpenStorageProviderEx(NCRYPT_PROV_HANDLE* phProvider,
WINPR_API SECURITY_STATUS winpr_NCryptOpenStorageProviderEx(NCRYPT_PROV_HANDLE* phProvider,
LPCWSTR pszProviderName, DWORD dwFlags,
LPCSTR* modulePaths);