Skip to content

Commit

Permalink
Minidriver CardReadFile() parameters are optional
Browse files Browse the repository at this point in the history 
According to minidriver specs CardReadFile() method output parameters are
optional so don't return SCARD_E_INVALID_PARAMETER when they are NULL.

Also, use this opportunity to walk through this function helpers to make
sure they correctly return error status.

Signed-off-by: Maciej S. Szmigiero <[email protected]>
  • Loading branch information
@maciejsszmigiero
maciejsszmigiero committed Jan 1, 2017
1 parent 134bbb6 commit d576573
Showing 1 changed file with 53 additions and 33 deletions.
86 changes: 53 additions & 33 deletions src/minidriver/minidriver.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,8 @@ static const struct sc_asn1_entry c_asn1_md_container[C_ASN1_MD_CONTAINER_SIZE]
{ NULL, 0, 0, 0, NULL, NULL }
};

static DWORD md_translate_OpenSC_to_Windows_error(int OpenSCerror,
DWORD dwDefaulCode);
static DWORD associate_card(PCARD_DATA pCardData);
static void disassociate_card(PCARD_DATA pCardData);
#if 0
Expand Down Expand Up @@ -1635,27 +1637,31 @@ md_set_cardid(PCARD_DATA pCardData, struct md_file *file)
}

/* fill the msroot file from root certificates */
static void
md_fs_read_msroot_file(PCARD_DATA pCardData, char *parent, struct md_file *file)
static DWORD
md_fs_read_msroot_file(PCARD_DATA pCardData, struct md_file *file)
{
CERT_BLOB dbStore = {0};
HCERTSTORE hCertStore = NULL;
VENDOR_SPECIFIC *vs;
int rv, ii, cert_num;
struct sc_pkcs15_object *prkey_objs[MD_MAX_KEY_CONTAINERS];
DWORD dwret = SCARD_F_INTERNAL_ERROR;

hCertStore = CertOpenStore(CERT_STORE_PROV_MEMORY, X509_ASN_ENCODING, (HCRYPTPROV_LEGACY) NULL, 0, NULL);
if (!hCertStore) {
goto Ret;
}
if (!pCardData || !file)
return SCARD_E_INVALID_PARAMETER;

vs = (VENDOR_SPECIFIC *) pCardData->pvVendorSpecific;
if (!vs)
return SCARD_E_INVALID_PARAMETER;

hCertStore = CertOpenStore(CERT_STORE_PROV_MEMORY, X509_ASN_ENCODING, (HCRYPTPROV_LEGACY) NULL, 0, NULL);
if (!hCertStore)
goto Ret;

rv = sc_pkcs15_get_objects(vs->p15card, SC_PKCS15_TYPE_CERT_X509, prkey_objs, MD_MAX_KEY_CONTAINERS);
if (rv < 0) {
logprintf(pCardData, 0, "certificate enumeration failed: %s\n", sc_strerror(rv));
dwret = md_translate_OpenSC_to_Windows_error(rv, dwret);
goto Ret;
}
cert_num = rv;
Expand Down Expand Up @@ -1692,8 +1698,8 @@ md_fs_read_msroot_file(PCARD_DATA pCardData, char *parent, struct md_file *file)
}

dbStore.pbData = (PBYTE) pCardData->pfnCspAlloc(dbStore.cbData);

if (NULL == dbStore.pbData) {
dwret = SCARD_E_NO_MEMORY;
goto Ret;
}

Expand All @@ -1709,39 +1715,43 @@ md_fs_read_msroot_file(PCARD_DATA pCardData, char *parent, struct md_file *file)
file->size = dbStore.cbData;
file->blob = dbStore.pbData;
dbStore.pbData = NULL;
dwret = SCARD_S_SUCCESS;

Ret:
if (dbStore.pbData)
pCardData->pfnCspFree(dbStore.pbData);
if (hCertStore)
CertCloseStore(hCertStore, CERT_CLOSE_STORE_FORCE_FLAG);

return dwret;
}

/*
* Return content of the 'soft' file.
*/
static void
static DWORD
md_fs_read_content(PCARD_DATA pCardData, char *parent, struct md_file *file)
{
VENDOR_SPECIFIC *vs;
struct md_directory *dir = NULL;
DWORD dwret;

if (!pCardData || !file)
return;
return SCARD_E_INVALID_PARAMETER;

vs = pCardData->pvVendorSpecific;
if (!vs)
return;
return SCARD_E_INVALID_PARAMETER;

dwret = md_fs_find_directory(pCardData, NULL, parent, &dir);
if (dwret != SCARD_S_SUCCESS) {
logprintf(pCardData, 2, "find directory '%s' error: %lX\n",
parent ? parent : "<null>", (unsigned long)dwret);
return;
return dwret;
}
else if (!dir) {
logprintf(pCardData, 2, "directory '%s' not found\n", parent ? parent : "<null>");
return;
return SCARD_E_DIR_NOT_FOUND;
}

if (!strcmp((char *)dir->name, "mscp")) {
Expand All @@ -1764,21 +1774,21 @@ md_fs_read_content(PCARD_DATA pCardData, char *parent, struct md_file *file)
if(rv) {
logprintf(pCardData, 2, "Cannot read certificate idx:%i: sc-error %d\n", idx, rv);
logprintf(pCardData, 2, "set cardcf from 'DATA' pkcs#15 object\n");
return;
return md_translate_OpenSC_to_Windows_error(rv,
SCARD_F_INTERNAL_ERROR);
}

file->size = cert->data.len;
file->blob = pCardData->pfnCspAlloc(cert->data.len);
CopyMemory(file->blob, cert->data.value, cert->data.len);
sc_pkcs15_free_certificate(cert);
}
if (!strcmp((char *)file->name, "msroot")) {
md_fs_read_msroot_file(pCardData, parent, file);
}
}
else {
return;

return SCARD_S_SUCCESS;
} else if (!strcmp((char *)file->name, "msroot"))
return md_fs_read_msroot_file(pCardData, file);
}

return SCARD_E_FILE_NOT_FOUND;
}

/*
Expand Down Expand Up @@ -3229,7 +3239,8 @@ md_dialog_perform_pin_operation(PCARD_DATA pCardData, int operation, struct sc_p
return (int) result;
}

DWORD md_translate_OpenSC_to_Windows_error(int OpenSCerror, DWORD dwDefaulCode)
static DWORD md_translate_OpenSC_to_Windows_error(int OpenSCerror,
DWORD dwDefaulCode)
{
switch(OpenSCerror)
{
Expand Down Expand Up @@ -4088,13 +4099,11 @@ DWORD WINAPI CardReadFile(__in PCARD_DATA pCardData,

if(!pCardData)
return SCARD_E_INVALID_PARAMETER;
if (!ppbData || !pcbData)
return SCARD_E_INVALID_PARAMETER;

logprintf(pCardData, 2,
"pszDirectoryName = %s, pszFileName = %s, dwFlags = %lX, pcbData=%lu, ppbData=%p\n",
"pszDirectoryName = %s, pszFileName = %s, dwFlags = %lX, pcbData=%p, ppbData=%p\n",
NULLSTR(pszDirectoryName), NULLSTR(pszFileName),
(unsigned long)dwFlags, (unsigned long)*pcbData, ppbData);
(unsigned long)dwFlags, pcbData, ppbData);

if (!pszFileName || !strlen(pszFileName))
return SCARD_E_INVALID_PARAMETER;
Expand All @@ -4111,17 +4120,28 @@ DWORD WINAPI CardReadFile(__in PCARD_DATA pCardData,
return SCARD_E_FILE_NOT_FOUND;
}

if (!file->blob)
md_fs_read_content(pCardData, pszDirectoryName, file);
if (!file->blob) {
dwret = md_fs_read_content(pCardData, pszDirectoryName, file);
if (dwret != SCARD_S_SUCCESS)
return dwret;

*ppbData = pCardData->pfnCspAlloc(file->size);
if(!*ppbData)
return SCARD_E_NO_MEMORY;
*pcbData = (DWORD) file->size;
memcpy(*ppbData, file->blob, file->size);
if (!file->blob)
return SCARD_F_INTERNAL_ERROR;
}

if (ppbData) {
*ppbData = pCardData->pfnCspAlloc(file->size);
if(!*ppbData)
return SCARD_E_NO_MEMORY;

memcpy(*ppbData, file->blob, file->size);
}

if (pcbData)
*pcbData = (DWORD) file->size;

logprintf(pCardData, 7, "returns '%s' content:\n", NULLSTR(pszFileName));
loghex(pCardData, 7, *ppbData, *pcbData);
loghex(pCardData, 7, file->blob, file->size);
return SCARD_S_SUCCESS;
}

Expand Down

0 comments on commit d576573

Please sign in to comment.