Kaydet (Commit) ebb985be authored tarafından Mike Kaganski's avatar Mike Kaganski

cryptosign: don't use 8-bit string functions

Change-Id: I5f0414c85001043cd746bab364a84a00ac9c85e4
Reviewed-on: https://gerrit.libreoffice.org/42305Reviewed-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
Tested-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
üst 8d24a4e1
......@@ -1912,12 +1912,12 @@ OUString GetSubjectName(PCCERT_CONTEXT pCertContext)
OUString subjectName;
// Get Subject name size.
DWORD dwData = CertGetNameString(pCertContext,
CERT_NAME_SIMPLE_DISPLAY_TYPE,
0,
nullptr,
nullptr,
0);
DWORD dwData = CertGetNameStringW(pCertContext,
CERT_NAME_SIMPLE_DISPLAY_TYPE,
0,
nullptr,
nullptr,
0);
if (!dwData)
{
SAL_WARN("svl.crypto", "ValidateSignature: CertGetNameString failed");
......@@ -1925,8 +1925,8 @@ OUString GetSubjectName(PCCERT_CONTEXT pCertContext)
}
// Allocate memory for subject name.
LPTSTR szName = static_cast<LPTSTR>(
LocalAlloc(LPTR, dwData * sizeof(TCHAR)));
LPWSTR szName = static_cast<LPWSTR>(
LocalAlloc(LPTR, dwData * sizeof(WCHAR)));
if (!szName)
{
SAL_WARN("svl.crypto", "ValidateSignature: Unable to allocate memory for subject name");
......@@ -1934,18 +1934,18 @@ OUString GetSubjectName(PCCERT_CONTEXT pCertContext)
}
// Get subject name.
if (!CertGetNameString(pCertContext,
CERT_NAME_SIMPLE_DISPLAY_TYPE,
0,
nullptr,
szName,
dwData))
if (!CertGetNameStringW(pCertContext,
CERT_NAME_SIMPLE_DISPLAY_TYPE,
0,
nullptr,
szName,
dwData))
{
SAL_WARN("svl.crypto", "ValidateSignature: CertGetNameString failed");
return subjectName;
}
subjectName = OUString::fromUtf8(OString(szName));
subjectName = OUString(reinterpret_cast<sal_Unicode*>(szName));
if (szName != nullptr)
LocalFree(szName);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment