generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NULL is a valid cspname

Browse Source
This commit is contained in:
Dr. Stephen Henson 2011-05-15 11:44:14 +00:00
parent ff636340f5
commit 9609ea869d
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/e_capi.c
View File

@ -1158,17 +1158,23 @@ static int capi_list_containers(CAPI_CTX *ctx, BIO *out)
LPTSTR cspname = NULL; LPTSTR cspname = NULL;
CAPI_trace(ctx, "Listing containers CSP=%s, type = %d\n", ctx->cspname, ctx->csptype); CAPI_trace(ctx, "Listing containers CSP=%s, type = %d\n", ctx->cspname, ctx->csptype);
if (sizeof(TCHAR)!=sizeof(char)) if (ctx->cspname && sizeof(TCHAR)!=sizeof(char))
{ {
if ((clen=MultiByteToWideChar(CP_ACP,0,ctx->cspname,-1,NULL,0))) if ((clen=MultiByteToWideChar(CP_ACP,0,ctx->cspname,-1,NULL,0)))
{ {
cspname = alloca(clen*sizeof(WCHAR)); cspname = alloca(clen*sizeof(WCHAR));
MultiByteToWideChar(CP_ACP,0,ctx->cspname,-1,(WCHAR *)cspname,clen); MultiByteToWideChar(CP_ACP,0,ctx->cspname,-1,(WCHAR *)cspname,clen);
} }
if (!cspname)
{
CAPIerr(CAPI_F_CAPI_LIST_CONTAINERS, ERR_R_MALLOC_FAILURE);
capi_addlasterror();
return 0;
}
} }
else else
cspname = (TCHAR *)ctx->cspname; cspname = (TCHAR *)ctx->cspname;
if (!cspname || !CryptAcquireContext(&hprov, NULL, cspname, ctx->csptype, CRYPT_VERIFYCONTEXT)) if (!CryptAcquireContext(&hprov, NULL, cspname, ctx->csptype, CRYPT_VERIFYCONTEXT))
{ {
CAPIerr(CAPI_F_CAPI_LIST_CONTAINERS, CAPI_R_CRYPTACQUIRECONTEXT_ERROR); CAPIerr(CAPI_F_CAPI_LIST_CONTAINERS, CAPI_R_CRYPTACQUIRECONTEXT_ERROR);
capi_addlasterror(); capi_addlasterror();