From 3a5b64b2f039a237b595961da07350b3f23282d0 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Sun, 26 Mar 2017 17:39:14 +0200 Subject: engines/e_capi.c: adhere to CryptAcquireContextW unconditionally. Reviewed-by: Rich Salz Reviewed-by: Richard Levitte --- engines/e_capi.c | 74 +++++++++++++++++++++----------------------------------- 1 file changed, 27 insertions(+), 47 deletions(-) (limited to 'engines') diff --git a/engines/e_capi.c b/engines/e_capi.c index 6e41708908..625e9a1b50 100644 --- a/engines/e_capi.c +++ b/engines/e_capi.c @@ -474,8 +474,8 @@ static int capi_init(ENGINE *e) /* See if we support AES CSP */ - if (CryptAcquireContext(&hprov, NULL, NULL, PROV_RSA_AES, - CRYPT_VERIFYCONTEXT)) { + if (CryptAcquireContextW(&hprov, NULL, NULL, PROV_RSA_AES, + CRYPT_VERIFYCONTEXT)) { use_aes_csp = 1; CryptReleaseContext(hprov, 0); } @@ -1179,27 +1179,25 @@ static int capi_list_containers(CAPI_CTX *ctx, BIO *out) HCRYPTPROV hprov; DWORD err, idx, flags, buflen = 0, clen; LPSTR cname; - LPTSTR cspname = NULL; + LPWSTR cspname = NULL; CAPI_trace(ctx, "Listing containers CSP=%s, type = %d\n", ctx->cspname, ctx->csptype); - if (ctx->cspname && sizeof(TCHAR) != sizeof(char)) { + if (ctx->cspname != NULL) { if ((clen = MultiByteToWideChar(CP_ACP, 0, ctx->cspname, -1, NULL, 0))) { cspname = alloca(clen * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, ctx->cspname, -1, (WCHAR *)cspname, clen); } - if (!cspname) { + if (cspname == NULL) { CAPIerr(CAPI_F_CAPI_LIST_CONTAINERS, ERR_R_MALLOC_FAILURE); capi_addlasterror(); return 0; } - } else { - cspname = (TCHAR *)ctx->cspname; } - if (!CryptAcquireContext(&hprov, NULL, cspname, ctx->csptype, - CRYPT_VERIFYCONTEXT)) { + if (!CryptAcquireContextW(&hprov, NULL, cspname, ctx->csptype, + CRYPT_VERIFYCONTEXT)) { CAPIerr(CAPI_F_CAPI_LIST_CONTAINERS, CAPI_R_CRYPTACQUIRECONTEXT_ERROR); capi_addlasterror(); @@ -1460,8 +1458,8 @@ static PCCERT_CONTEXT capi_find_cert(CAPI_CTX *ctx, const char *id, } } -static CAPI_KEY *capi_get_key(CAPI_CTX *ctx, const TCHAR *contname, - TCHAR *provname, DWORD ptype, DWORD keyspec) +static CAPI_KEY *capi_get_key(CAPI_CTX *ctx, const WCHAR *contname, + WCHAR *provname, DWORD ptype, DWORD keyspec) { DWORD dwFlags = 0; CAPI_KEY *key = OPENSSL_malloc(sizeof(*key)); @@ -1478,8 +1476,8 @@ static CAPI_KEY *capi_get_key(CAPI_CTX *ctx, const TCHAR *contname, contname, provname, ptype); } else if (ctx && ctx->debug_level >= CAPI_DBG_TRACE && ctx->debug_file) { /* above 'if' is optimization to minimize malloc-ations */ - char *_contname = wide_to_asc((WCHAR *)contname); - char *_provname = wide_to_asc((WCHAR *)provname); + char *_contname = wide_to_asc(contname); + char *_provname = wide_to_asc(provname); CAPI_trace(ctx, "capi_get_key, contname=%s, provname=%s, type=%d\n", _contname, _provname, ptype); @@ -1488,7 +1486,8 @@ static CAPI_KEY *capi_get_key(CAPI_CTX *ctx, const TCHAR *contname, } if (ctx->store_flags & CERT_SYSTEM_STORE_LOCAL_MACHINE) dwFlags = CRYPT_MACHINE_KEYSET; - if (!CryptAcquireContext(&key->hprov, contname, provname, ptype, dwFlags)) { + if (!CryptAcquireContextW(&key->hprov, contname, provname, ptype, + dwFlags)) { CAPIerr(CAPI_F_CAPI_GET_KEY, CAPI_R_CRYPTACQUIRECONTEXT_ERROR); capi_addlasterror(); goto err; @@ -1512,27 +1511,14 @@ static CAPI_KEY *capi_get_cert_key(CAPI_CTX *ctx, PCCERT_CONTEXT cert) { CAPI_KEY *key = NULL; CRYPT_KEY_PROV_INFO *pinfo = NULL; - char *provname = NULL, *contname = NULL; + pinfo = capi_get_prov_info(ctx, cert); - if (!pinfo) - goto err; - if (sizeof(TCHAR) != sizeof(char)) - key = capi_get_key(ctx, (TCHAR *)pinfo->pwszContainerName, - (TCHAR *)pinfo->pwszProvName, - pinfo->dwProvType, pinfo->dwKeySpec); - else { - provname = wide_to_asc(pinfo->pwszProvName); - contname = wide_to_asc(pinfo->pwszContainerName); - if (!provname || !contname) - goto err; - key = capi_get_key(ctx, (TCHAR *)contname, (TCHAR *)provname, + + if (pinfo != NULL) + key = capi_get_key(ctx, pinfo->pwszContainerName, pinfo->pwszProvName, pinfo->dwProvType, pinfo->dwKeySpec); - } - err: OPENSSL_free(pinfo); - OPENSSL_free(provname); - OPENSSL_free(contname); return key; } @@ -1541,6 +1527,7 @@ CAPI_KEY *capi_find_key(CAPI_CTX *ctx, const char *id) PCCERT_CONTEXT cert; HCERTSTORE hstore; CAPI_KEY *key = NULL; + switch (ctx->lookup_method) { case CAPI_LU_SUBSTR: case CAPI_LU_FNAME: @@ -1556,7 +1543,7 @@ CAPI_KEY *capi_find_key(CAPI_CTX *ctx, const char *id) break; case CAPI_LU_CONTNAME: - if (sizeof(TCHAR) != sizeof(char)) { + { WCHAR *contname, *provname; DWORD len; @@ -1568,11 +1555,8 @@ CAPI_KEY *capi_find_key(CAPI_CTX *ctx, const char *id) (provname = alloca(len * sizeof(WCHAR)), MultiByteToWideChar(CP_ACP, 0, ctx->cspname, -1, provname, len))) - key = capi_get_key(ctx, (TCHAR *)contname, (TCHAR *)provname, + key = capi_get_key(ctx, contname, provname, ctx->csptype, ctx->keytype); - } else { - key = capi_get_key(ctx, (TCHAR *)id, (TCHAR *)ctx->cspname, - ctx->csptype, ctx->keytype); } break; } @@ -1631,19 +1615,15 @@ static int capi_ctx_set_provname(CAPI_CTX *ctx, LPSTR pname, DWORD type, CAPI_trace(ctx, "capi_ctx_set_provname, name=%s, type=%d\n", pname, type); if (check) { HCRYPTPROV hprov; - LPTSTR name = NULL; + LPWSTR name = NULL; + DWORD len; - if (sizeof(TCHAR) != sizeof(char)) { - DWORD len; - if ((len = MultiByteToWideChar(CP_ACP, 0, pname, -1, NULL, 0))) { - name = alloca(len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, pname, -1, (WCHAR *)name, len); - } - } else { - name = (TCHAR *)pname; + if ((len = MultiByteToWideChar(CP_ACP, 0, pname, -1, NULL, 0))) { + name = alloca(len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pname, -1, (WCHAR *)name, len); } - if (!name || !CryptAcquireContext(&hprov, NULL, name, type, - CRYPT_VERIFYCONTEXT)) { + if (name == NULL || !CryptAcquireContextW(&hprov, NULL, name, type, + CRYPT_VERIFYCONTEXT)) { CAPIerr(CAPI_F_CAPI_CTX_SET_PROVNAME, CAPI_R_CRYPTACQUIRECONTEXT_ERROR); capi_addlasterror(); -- cgit v1.2.3