projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add dummy pipeline support for aes128_cbc_hmac_sha1
[openssl.git]
/
engines
/
e_capi.c
diff --git
a/engines/e_capi.c
b/engines/e_capi.c
index 33881cdb0b97786a9218a63d8264b4003d5ed910..8e78354b70f735f33553eb08e6a7ff95080ab5f7 100644
(file)
--- a/
engines/e_capi.c
+++ b/
engines/e_capi.c
@@
-1,4
+1,3
@@
-/* engines/e_capi.c */
/*
* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project.
/*
* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project.
@@
-134,6
+133,10
@@
# define CALG_SHA_512 (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA_512)
# endif
# define CALG_SHA_512 (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA_512)
# endif
+# ifndef PROV_RSA_AES
+# define PROV_RSA_AES 24
+# endif
+
# include <openssl/engine.h>
# include <openssl/pem.h>
# include <openssl/x509v3.h>
# include <openssl/engine.h>
# include <openssl/pem.h>
# include <openssl/x509v3.h>
@@
-188,6
+191,8
@@
static int cert_select_simple(ENGINE *e, SSL *ssl, STACK_OF(X509) *certs);
static int cert_select_dialog(ENGINE *e, SSL *ssl, STACK_OF(X509) *certs);
# endif
static int cert_select_dialog(ENGINE *e, SSL *ssl, STACK_OF(X509) *certs);
# endif
+void engine_load_capi_internal(void);
+
typedef PCCERT_CONTEXT(WINAPI *CERTDLG) (HCERTSTORE, HWND, LPCWSTR,
LPCWSTR, DWORD, DWORD, void *);
typedef HWND(WINAPI *GETCONSWIN) (void);
typedef PCCERT_CONTEXT(WINAPI *CERTDLG) (HCERTSTORE, HWND, LPCWSTR,
LPCWSTR, DWORD, DWORD, void *);
typedef HWND(WINAPI *GETCONSWIN) (void);
@@
-239,7
+244,7
@@
struct CAPI_CTX_st {
GETCONSWIN getconswindow;
};
GETCONSWIN getconswindow;
};
-static CAPI_CTX *capi_ctx_new();
+static CAPI_CTX *capi_ctx_new(
void
);
static void capi_ctx_free(CAPI_CTX * ctx);
static int capi_ctx_set_provname(CAPI_CTX * ctx, LPSTR pname, DWORD type,
int check);
static void capi_ctx_free(CAPI_CTX * ctx);
static int capi_ctx_set_provname(CAPI_CTX * ctx, LPSTR pname, DWORD type,
int check);
@@
-361,7
+366,7
@@
static int capi_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) (void))
case CAPI_CMD_STORE_NAME:
OPENSSL_free(ctx->storename);
case CAPI_CMD_STORE_NAME:
OPENSSL_free(ctx->storename);
- ctx->storename =
BUF
_strdup(p);
+ ctx->storename =
OPENSSL
_strdup(p);
CAPI_trace(ctx, "Setting store name to %s\n", p);
break;
CAPI_trace(ctx, "Setting store name to %s\n", p);
break;
@@
-382,7
+387,7
@@
static int capi_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) (void))
break;
case CAPI_CMD_DEBUG_FILE:
break;
case CAPI_CMD_DEBUG_FILE:
- ctx->debug_file =
BUF
_strdup(p);
+ ctx->debug_file =
OPENSSL
_strdup(p);
CAPI_trace(ctx, "Setting debug file to %s\n", ctx->debug_file);
break;
CAPI_trace(ctx, "Setting debug file to %s\n", ctx->debug_file);
break;
@@
-436,7
+441,7
@@
static RSA_METHOD capi_rsa_method = {
0, /* bn_mod_exp */
0, /* init */
capi_rsa_free, /* finish */
0, /* bn_mod_exp */
0, /* init */
capi_rsa_free, /* finish */
-
RSA_FLAG_SIGN_VER,
/* flags */
+
0,
/* flags */
NULL, /* app_data */
capi_rsa_sign, /* rsa_sign */
0 /* rsa_verify */
NULL, /* app_data */
capi_rsa_sign, /* rsa_sign */
0 /* rsa_verify */
@@
-457,11
+462,14
@@
static DSA_METHOD capi_dsa_method = {
0 /* dsa_keygen */
};
0 /* dsa_keygen */
};
+static int use_aes_csp = 0;
+
static int capi_init(ENGINE *e)
{
CAPI_CTX *ctx;
const RSA_METHOD *ossl_rsa_meth;
const DSA_METHOD *ossl_dsa_meth;
static int capi_init(ENGINE *e)
{
CAPI_CTX *ctx;
const RSA_METHOD *ossl_rsa_meth;
const DSA_METHOD *ossl_dsa_meth;
+ HCRYPTPROV hprov;
if (capi_idx < 0) {
capi_idx = ENGINE_get_ex_new_index(0, NULL, NULL, NULL, 0);
if (capi_idx < 0) {
capi_idx = ENGINE_get_ex_new_index(0, NULL, NULL, NULL, 0);
@@
-472,7
+480,7
@@
static int capi_init(ENGINE *e)
/* Setup RSA_METHOD */
rsa_capi_idx = RSA_get_ex_new_index(0, NULL, NULL, NULL, 0);
/* Setup RSA_METHOD */
rsa_capi_idx = RSA_get_ex_new_index(0, NULL, NULL, NULL, 0);
- ossl_rsa_meth = RSA_PKCS1_
SSLeay
();
+ ossl_rsa_meth = RSA_PKCS1_
OpenSSL
();
capi_rsa_method.rsa_pub_enc = ossl_rsa_meth->rsa_pub_enc;
capi_rsa_method.rsa_pub_dec = ossl_rsa_meth->rsa_pub_dec;
capi_rsa_method.rsa_mod_exp = ossl_rsa_meth->rsa_mod_exp;
capi_rsa_method.rsa_pub_enc = ossl_rsa_meth->rsa_pub_enc;
capi_rsa_method.rsa_pub_dec = ossl_rsa_meth->rsa_pub_dec;
capi_rsa_method.rsa_mod_exp = ossl_rsa_meth->rsa_mod_exp;
@@
-487,7
+495,7
@@
static int capi_init(ENGINE *e)
}
ctx = capi_ctx_new();
}
ctx = capi_ctx_new();
- if (
!ctx
)
+ if (
ctx == NULL
)
goto memerr;
ENGINE_set_ex_data(e, capi_idx, ctx);
goto memerr;
ENGINE_set_ex_data(e, capi_idx, ctx);
@@
-508,6
+516,14
@@
static int capi_init(ENGINE *e)
}
# endif
}
# endif
+ /* See if we support AES CSP */
+
+ if (CryptAcquireContext(&hprov, NULL, NULL, PROV_RSA_AES,
+ CRYPT_VERIFYCONTEXT)) {
+ use_aes_csp = 1;
+ CryptReleaseContext(hprov, 0);
+ }
+
return 1;
memerr:
return 1;
memerr:
@@
-584,7
+600,7
@@
IMPLEMENT_DYNAMIC_CHECK_FN()
static ENGINE *engine_capi(void)
{
ENGINE *ret = ENGINE_new();
static ENGINE *engine_capi(void)
{
ENGINE *ret = ENGINE_new();
- if (
!ret
)
+ if (
ret == NULL
)
return NULL;
if (!bind_capi(ret)) {
ENGINE_free(ret);
return NULL;
if (!bind_capi(ret)) {
ENGINE_free(ret);
@@
-593,7
+609,7
@@
static ENGINE *engine_capi(void)
return ret;
}
return ret;
}
-void
ENGINE_load_capi
(void)
+void
engine_load_capi_internal
(void)
{
/* Copied from eng_[openssl|dyn].c */
ENGINE *toadd = engine_capi();
{
/* Copied from eng_[openssl|dyn].c */
ENGINE *toadd = engine_capi();
@@
-643,7
+659,7
@@
static EVP_PKEY *capi_get_pkey(ENGINE *eng, CAPI_KEY * key)
pubkey = OPENSSL_malloc(len);
pubkey = OPENSSL_malloc(len);
- if (
!pubkey
)
+ if (
pubkey == NULL
)
goto memerr;
if (!CryptExportKey(key->key, 0, PUBLICKEYBLOB, 0, pubkey, &len)) {
goto memerr;
if (!CryptExportKey(key->key, 0, PUBLICKEYBLOB, 0, pubkey, &len)) {
@@
-678,7
+694,7
@@
static EVP_PKEY *capi_get_pkey(ENGINE *eng, CAPI_KEY * key)
rkey->e = BN_new();
rkey->n = BN_new();
rkey->e = BN_new();
rkey->n = BN_new();
- if (
!rkey->e || !rkey->n
)
+ if (
rkey->e == NULL || rkey->n == NULL
)
goto memerr;
if (!BN_set_word(rkey->e, rp->pubexp))
goto memerr;
if (!BN_set_word(rkey->e, rp->pubexp))
@@
-690,7
+706,7
@@
static EVP_PKEY *capi_get_pkey(ENGINE *eng, CAPI_KEY * key)
RSA_set_ex_data(rkey, rsa_capi_idx, key);
RSA_set_ex_data(rkey, rsa_capi_idx, key);
- if (
!(ret = EVP_PKEY_new())
)
+ if (
(ret = EVP_PKEY_new()) == NULL
)
goto memerr;
EVP_PKEY_assign_RSA(ret, rkey);
goto memerr;
EVP_PKEY_assign_RSA(ret, rkey);
@@
-718,7
+734,8
@@
static EVP_PKEY *capi_get_pkey(ENGINE *eng, CAPI_KEY * key)
dkey->q = BN_new();
dkey->g = BN_new();
dkey->pub_key = BN_new();
dkey->q = BN_new();
dkey->g = BN_new();
dkey->pub_key = BN_new();
- if (!dkey->p || !dkey->q || !dkey->g || !dkey->pub_key)
+ if (dkey->p == NULL || dkey->q == NULL || dkey->g == NULL
+ || dkey->pub_key == NULL)
goto memerr;
if (!lend_tobn(dkey->p, btmp, dsa_plen))
goto memerr;
goto memerr;
if (!lend_tobn(dkey->p, btmp, dsa_plen))
goto memerr;
@@
-735,14
+752,14
@@
static EVP_PKEY *capi_get_pkey(ENGINE *eng, CAPI_KEY * key)
DSA_set_ex_data(dkey, dsa_capi_idx, key);
DSA_set_ex_data(dkey, dsa_capi_idx, key);
- if (
!(ret = EVP_PKEY_new())
)
+ if (
(ret = EVP_PKEY_new()) == NULL
)
goto memerr;
EVP_PKEY_assign_DSA(ret, dkey);
dkey = NULL;
} else {
char algstr[10];
goto memerr;
EVP_PKEY_assign_DSA(ret, dkey);
dkey = NULL;
} else {
char algstr[10];
- BIO_snprintf(algstr, 10, "%
l
x", bh->aiKeyAlg);
+ BIO_snprintf(algstr, 10, "%
u
x", bh->aiKeyAlg);
CAPIerr(CAPI_F_CAPI_GET_PKEY,
CAPI_R_UNSUPPORTED_PUBLIC_KEY_ALGORITHM);
ERR_add_error_data(2, "aiKeyAlg=0x", algstr);
CAPIerr(CAPI_F_CAPI_GET_PKEY,
CAPI_R_UNSUPPORTED_PUBLIC_KEY_ALGORITHM);
ERR_add_error_data(2, "aiKeyAlg=0x", algstr);
@@
-847,7
+864,7
@@
int capi_rsa_sign(int dtype, const unsigned char *m, unsigned int m_len,
default:
{
char algstr[10];
default:
{
char algstr[10];
- BIO_snprintf(algstr, 10, "%
l
x", dtype);
+ BIO_snprintf(algstr, 10, "%x", dtype);
CAPIerr(CAPI_F_CAPI_RSA_SIGN, CAPI_R_UNSUPPORTED_ALGORITHM_NID);
ERR_add_error_data(2, "NID=0x", algstr);
return -1;
CAPIerr(CAPI_F_CAPI_RSA_SIGN, CAPI_R_UNSUPPORTED_ALGORITHM_NID);
ERR_add_error_data(2, "NID=0x", algstr);
return -1;
@@
-901,6
+918,11
@@
int capi_rsa_priv_dec(int flen, const unsigned char *from,
unsigned char *tmpbuf;
CAPI_KEY *capi_key;
CAPI_CTX *ctx;
unsigned char *tmpbuf;
CAPI_KEY *capi_key;
CAPI_CTX *ctx;
+ DWORD dlen;
+
+ if (flen <= 0)
+ return flen;
+
ctx = ENGINE_get_ex_data(rsa->engine, capi_idx);
CAPI_trace(ctx, "Called capi_rsa_priv_dec()\n");
ctx = ENGINE_get_ex_data(rsa->engine, capi_idx);
CAPI_trace(ctx, "Called capi_rsa_priv_dec()\n");
@@
-920,7
+942,7
@@
int capi_rsa_priv_dec(int flen, const unsigned char *from,
}
/* Create temp reverse order version of input */
}
/* Create temp reverse order version of input */
- if (
!(tmpbuf = OPENSSL_malloc(flen))
) {
+ if (
(tmpbuf = OPENSSL_malloc(flen)) == NULL
) {
CAPIerr(CAPI_F_CAPI_RSA_PRIV_DEC, ERR_R_MALLOC_FAILURE);
return -1;
}
CAPIerr(CAPI_F_CAPI_RSA_PRIV_DEC, ERR_R_MALLOC_FAILURE);
return -1;
}
@@
-928,13
+950,14
@@
int capi_rsa_priv_dec(int flen, const unsigned char *from,
tmpbuf[flen - i - 1] = from[i];
/* Finally decrypt it */
tmpbuf[flen - i - 1] = from[i];
/* Finally decrypt it */
- if (!CryptDecrypt(capi_key->key, 0, TRUE, 0, tmpbuf, &flen)) {
+ dlen = flen;
+ if (!CryptDecrypt(capi_key->key, 0, TRUE, 0, tmpbuf, &dlen)) {
CAPIerr(CAPI_F_CAPI_RSA_PRIV_DEC, CAPI_R_DECRYPT_ERROR);
capi_addlasterror();
OPENSSL_free(tmpbuf);
return -1;
} else
CAPIerr(CAPI_F_CAPI_RSA_PRIV_DEC, CAPI_R_DECRYPT_ERROR);
capi_addlasterror();
OPENSSL_free(tmpbuf);
return -1;
} else
- memcpy(to, tmpbuf,
flen
);
+ memcpy(to, tmpbuf,
(flen = (int)dlen)
);
OPENSSL_free(tmpbuf);
OPENSSL_free(tmpbuf);
@@
-1000,11
+1023,11
@@
static DSA_SIG *capi_dsa_do_sign(const unsigned char *digest, int dlen,
goto err;
} else {
ret = DSA_SIG_new();
goto err;
} else {
ret = DSA_SIG_new();
- if (
!ret
)
+ if (
ret == NULL
)
goto err;
ret->r = BN_new();
ret->s = BN_new();
goto err;
ret->r = BN_new();
ret->s = BN_new();
- if (
!ret->r || !ret->s
)
+ if (
ret->r == NULL || ret->s == NULL
)
goto err;
if (!lend_tobn(ret->r, csigbuf, 20)
|| !lend_tobn(ret->s, csigbuf + 20, 20)) {
goto err;
if (!lend_tobn(ret->r, csigbuf, 20)
|| !lend_tobn(ret->s, csigbuf + 20, 20)) {
@@
-1081,7
+1104,7
@@
static char *wide_to_asc(LPCWSTR wstr)
return NULL;
}
str = OPENSSL_malloc(sz);
return NULL;
}
str = OPENSSL_malloc(sz);
- if (
!str
) {
+ if (
str == NULL
) {
CAPIerr(CAPI_F_WIDE_TO_ASC, ERR_R_MALLOC_FAILURE);
return NULL;
}
CAPIerr(CAPI_F_WIDE_TO_ASC, ERR_R_MALLOC_FAILURE);
return NULL;
}
@@
-1147,7
+1170,7
@@
static int capi_list_providers(CAPI_CTX * ctx, BIO *out)
break;
if (ret == 0)
break;
break;
if (ret == 0)
break;
- BIO_printf(out, "%
d. %s, type %d
\n", idx, provname, ptype);
+ BIO_printf(out, "%
lu. %s, type %lu
\n", idx, provname, ptype);
OPENSSL_free(provname);
}
return 1;
OPENSSL_free(provname);
}
return 1;
@@
-1195,7
+1218,7
@@
static int capi_list_containers(CAPI_CTX * ctx, BIO *out)
if (buflen == 0)
buflen = 1024;
cname = OPENSSL_malloc(buflen);
if (buflen == 0)
buflen = 1024;
cname = OPENSSL_malloc(buflen);
- if (
!cname
) {
+ if (
cname == NULL
) {
CAPIerr(CAPI_F_CAPI_LIST_CONTAINERS, ERR_R_MALLOC_FAILURE);
goto err;
}
CAPIerr(CAPI_F_CAPI_LIST_CONTAINERS, ERR_R_MALLOC_FAILURE);
goto err;
}
@@
-1223,7
+1246,7
@@
static int capi_list_containers(CAPI_CTX * ctx, BIO *out)
CAPI_trace(ctx, "Enumerate bug: using workaround\n");
goto done;
}
CAPI_trace(ctx, "Enumerate bug: using workaround\n");
goto done;
}
- BIO_printf(out, "%
d
. %s\n", idx, cname);
+ BIO_printf(out, "%
lu
. %s\n", idx, cname);
}
err:
}
err:
@@
-1236,7
+1259,7
@@
static int capi_list_containers(CAPI_CTX * ctx, BIO *out)
return ret;
}
return ret;
}
-CRYPT_KEY_PROV_INFO *capi_get_prov_info(CAPI_CTX * ctx, PCCERT_CONTEXT cert)
+
static
CRYPT_KEY_PROV_INFO *capi_get_prov_info(CAPI_CTX * ctx, PCCERT_CONTEXT cert)
{
DWORD len;
CRYPT_KEY_PROV_INFO *pinfo;
{
DWORD len;
CRYPT_KEY_PROV_INFO *pinfo;
@@
-1245,7
+1268,7
@@
CRYPT_KEY_PROV_INFO *capi_get_prov_info(CAPI_CTX * ctx, PCCERT_CONTEXT cert)
(cert, CERT_KEY_PROV_INFO_PROP_ID, NULL, &len))
return NULL;
pinfo = OPENSSL_malloc(len);
(cert, CERT_KEY_PROV_INFO_PROP_ID, NULL, &len))
return NULL;
pinfo = OPENSSL_malloc(len);
- if (
!pinfo
) {
+ if (
pinfo == NULL
) {
CAPIerr(CAPI_F_CAPI_GET_PROV_INFO, ERR_R_MALLOC_FAILURE);
return NULL;
}
CAPIerr(CAPI_F_CAPI_GET_PROV_INFO, ERR_R_MALLOC_FAILURE);
return NULL;
}
@@
-1274,16
+1297,16
@@
static void capi_dump_prov_info(CAPI_CTX * ctx, BIO *out,
goto err;
BIO_printf(out, " Private Key Info:\n");
goto err;
BIO_printf(out, " Private Key Info:\n");
- BIO_printf(out, " Provider Name: %s, Provider Type %
d
\n", provname,
+ BIO_printf(out, " Provider Name: %s, Provider Type %
lu
\n", provname,
pinfo->dwProvType);
pinfo->dwProvType);
- BIO_printf(out, " Container Name: %s, Key Type %
d
\n", contname,
+ BIO_printf(out, " Container Name: %s, Key Type %
lu
\n", contname,
pinfo->dwKeySpec);
err:
OPENSSL_free(provname);
OPENSSL_free(contname);
}
pinfo->dwKeySpec);
err:
OPENSSL_free(provname);
OPENSSL_free(contname);
}
-char *capi_cert_get_fname(CAPI_CTX * ctx, PCCERT_CONTEXT cert)
+
static
char *capi_cert_get_fname(CAPI_CTX * ctx, PCCERT_CONTEXT cert)
{
LPWSTR wfname;
DWORD dlen;
{
LPWSTR wfname;
DWORD dlen;
@@
-1308,10
+1331,10
@@
char *capi_cert_get_fname(CAPI_CTX * ctx, PCCERT_CONTEXT cert)
return NULL;
}
return NULL;
}
-void capi_dump_cert(CAPI_CTX * ctx, BIO *out, PCCERT_CONTEXT cert)
+
static
void capi_dump_cert(CAPI_CTX * ctx, BIO *out, PCCERT_CONTEXT cert)
{
X509 *x;
{
X509 *x;
- unsigned char *p;
+
const
unsigned char *p;
unsigned long flags = ctx->dump_flags;
if (flags & CAPI_DMP_FNAME) {
char *fname;
unsigned long flags = ctx->dump_flags;
if (flags & CAPI_DMP_FNAME) {
char *fname;
@@
-1349,7
+1372,7
@@
void capi_dump_cert(CAPI_CTX * ctx, BIO *out, PCCERT_CONTEXT cert)
X509_free(x);
}
X509_free(x);
}
-HCERTSTORE capi_open_store(CAPI_CTX * ctx, char *storename)
+
static
HCERTSTORE capi_open_store(CAPI_CTX * ctx, char *storename)
{
HCERTSTORE hstore;
{
HCERTSTORE hstore;
@@
-1446,10
+1469,15
@@
static CAPI_KEY *capi_get_key(CAPI_CTX * ctx, const TCHAR *contname,
if (key == NULL)
return NULL;
if (key == NULL)
return NULL;
- if (sizeof(TCHAR) == sizeof(char))
+ /* If PROV_RSA_AES supported use it instead */
+ if (ptype == PROV_RSA_FULL && use_aes_csp) {
+ provname = NULL;
+ ptype = PROV_RSA_AES;
+ CAPI_trace(ctx, "capi_get_key, contname=%s, RSA_AES_CSP\n", contname);
+ } else if (sizeof(TCHAR) == sizeof(char)) {
CAPI_trace(ctx, "capi_get_key, contname=%s, provname=%s, type=%d\n",
contname, provname, ptype);
CAPI_trace(ctx, "capi_get_key, contname=%s, provname=%s, type=%d\n",
contname, provname, ptype);
- else if (ctx && ctx->debug_level >= CAPI_DBG_TRACE && ctx->debug_file) {
+
}
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);
/* above 'if' is optimization to minimize malloc-ations */
char *_contname = wide_to_asc((WCHAR *)contname);
char *_provname = wide_to_asc((WCHAR *)provname);
@@
-1571,25
+1599,20
@@
void capi_free_key(CAPI_KEY * key)
/* Initialize a CAPI_CTX structure */
/* Initialize a CAPI_CTX structure */
-static CAPI_CTX *capi_ctx_new()
+static CAPI_CTX *capi_ctx_new(
void
)
{
{
- CAPI_CTX *ctx = OPENSSL_
m
alloc(sizeof(*ctx));
+ CAPI_CTX *ctx = OPENSSL_
z
alloc(sizeof(*ctx));
- if (
!ctx
) {
+ if (
ctx == NULL
) {
CAPIerr(CAPI_F_CAPI_CTX_NEW, ERR_R_MALLOC_FAILURE);
return NULL;
}
CAPIerr(CAPI_F_CAPI_CTX_NEW, ERR_R_MALLOC_FAILURE);
return NULL;
}
- ctx->cspname = NULL;
ctx->csptype = PROV_RSA_FULL;
ctx->dump_flags = CAPI_DMP_SUMMARY | CAPI_DMP_FNAME;
ctx->keytype = AT_KEYEXCHANGE;
ctx->csptype = PROV_RSA_FULL;
ctx->dump_flags = CAPI_DMP_SUMMARY | CAPI_DMP_FNAME;
ctx->keytype = AT_KEYEXCHANGE;
- ctx->storename = NULL;
- ctx->ssl_client_store = NULL;
ctx->store_flags = CERT_STORE_OPEN_EXISTING_FLAG |
CERT_STORE_READONLY_FLAG | CERT_SYSTEM_STORE_CURRENT_USER;
ctx->lookup_method = CAPI_LU_SUBSTR;
ctx->store_flags = CERT_STORE_OPEN_EXISTING_FLAG |
CERT_STORE_READONLY_FLAG | CERT_SYSTEM_STORE_CURRENT_USER;
ctx->lookup_method = CAPI_LU_SUBSTR;
- ctx->debug_level = 0;
- ctx->debug_file = NULL;
ctx->client_cert_select = cert_select_simple;
return ctx;
}
ctx->client_cert_select = cert_select_simple;
return ctx;
}
@@
-1633,7
+1656,7
@@
static int capi_ctx_set_provname(CAPI_CTX * ctx, LPSTR pname, DWORD type,
CryptReleaseContext(hprov, 0);
}
OPENSSL_free(ctx->cspname);
CryptReleaseContext(hprov, 0);
}
OPENSSL_free(ctx->cspname);
- ctx->cspname =
BUF
_strdup(pname);
+ ctx->cspname =
OPENSSL
_strdup(pname);
ctx->csptype = type;
return 1;
}
ctx->csptype = type;
return 1;
}
@@
-1674,7
+1697,7
@@
static int capi_load_ssl_client_cert(ENGINE *e, SSL *ssl,
STACK_OF(X509) *certs = NULL;
X509 *x;
char *storename;
STACK_OF(X509) *certs = NULL;
X509 *x;
char *storename;
- const char *p;
+ const
unsigned
char *p;
int i, client_cert_idx;
HCERTSTORE hstore;
PCCERT_CONTEXT cert = NULL, excert = NULL;
int i, client_cert_idx;
HCERTSTORE hstore;
PCCERT_CONTEXT cert = NULL, excert = NULL;
@@
-1873,7
+1896,8
@@
OPENSSL_EXPORT
IMPLEMENT_DYNAMIC_CHECK_FN()
# else
IMPLEMENT_DYNAMIC_CHECK_FN()
# else
-void ENGINE_load_capi(void)
+void engine_load_capi_internal(void);
+void engine_load_capi_internal(void)
{
}
# endif
{
}
# endif