Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2026-11-14 07:47:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[idd] network: correct CNG certificate key metadata

Browse Source
This commit is contained in:
Geoffrey McRae
2026-10-01 07:40:30 +10:00
parent 93c18419cb
commit ab6ee5665a
1 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
idd/LGIddInstall/NetworkIdentity.c
View File

@@ -171,6 +171,32 @@ static bool networkIdentityCanUsePrivateKey(PCCERT_CONTEXT certificate)
return result; return result;
} }
static bool networkIdentityRepairKeyProvider(
PCCERT_CONTEXT certificate,
CRYPT_KEY_PROV_INFO *info)
{
const DWORD flags = NCRYPT_MACHINE_KEY_FLAG | NCRYPT_SILENT_FLAG;
if (info->dwFlags == flags && info->dwKeySpec == 0)
return true;
/* This CNG key has no legacy CAPI key specification. */
info->dwFlags = flags;
info->dwKeySpec = 0;
if (!CertSetCertificateContextProperty(
certificate,
CERT_KEY_PROV_INFO_PROP_ID,
0,
info))
{
networkIdentityError(
L"CertSetCertificateContextProperty(key provider)",
GetLastError());
return false;
}
return true;
}
static bool networkIdentityMatchesKey(PCCERT_CONTEXT certificate) static bool networkIdentityMatchesKey(PCCERT_CONTEXT certificate)
{ {
DWORD size = 0; DWORD size = 0;
@@ -182,15 +208,18 @@ static bool networkIdentityMatchesKey(PCCERT_CONTEXT certificate)
if (!info) if (!info)
return false; return false;
const bool result = CertGetCertificateContextProperty( bool result = CertGetCertificateContextProperty(
certificate, CERT_KEY_PROV_INFO_PROP_ID, info, &size) && certificate, CERT_KEY_PROV_INFO_PROP_ID, info, &size) &&
info->pwszContainerName && info->pwszContainerName &&
wcscmp(info->pwszContainerName, wcscmp(info->pwszContainerName,
LG_NETWORK_CERTIFICATE_KEY_NAME) == 0 && LG_NETWORK_CERTIFICATE_KEY_NAME) == 0 &&
info->pwszProvName && info->pwszProvName &&
wcscmp(info->pwszProvName, MS_KEY_STORAGE_PROVIDER) == 0 && wcscmp(info->pwszProvName, MS_KEY_STORAGE_PROVIDER) == 0 &&
CertVerifyTimeValidity(NULL, certificate->pCertInfo) == 0 && info->dwProvType == 0 &&
networkIdentityCanUsePrivateKey(certificate); CertVerifyTimeValidity(NULL, certificate->pCertInfo) == 0;
if (result)
result = networkIdentityRepairKeyProvider(certificate, info) &&
networkIdentityCanUsePrivateKey(certificate);
free(info); free(info);
return result; return result;
@@ -335,10 +364,10 @@ static PCCERT_CONTEXT networkIdentityCreateCertificate(
.pwszContainerName = LG_NETWORK_CERTIFICATE_KEY_NAME, .pwszContainerName = LG_NETWORK_CERTIFICATE_KEY_NAME,
.pwszProvName = MS_KEY_STORAGE_PROVIDER, .pwszProvName = MS_KEY_STORAGE_PROVIDER,
.dwProvType = 0, .dwProvType = 0,
.dwFlags = CRYPT_MACHINE_KEYSET, .dwFlags = NCRYPT_MACHINE_KEY_FLAG | NCRYPT_SILENT_FLAG,
.cProvParam = 0, .cProvParam = 0,
.rgProvParam = NULL, .rgProvParam = NULL,
.dwKeySpec = CERT_NCRYPT_KEY_SPEC, .dwKeySpec = 0,
}; };
CRYPT_ALGORITHM_IDENTIFIER signature = CRYPT_ALGORITHM_IDENTIFIER signature =
{ {