wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

engine/e_capi.c: more formatting and styling fixes.

Browse source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Andy Polyakov 2017-03-26 16:12:10 +02:00
parent d7735c1eec
commit 8f0e5888ea
1 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
engines/e_capi.c
View file

@ -108,17 +108,17 @@ typedef struct CAPI_KEY_st CAPI_KEY;
static void capi_addlasterror(void); static void capi_addlasterror(void);
static void capi_adderror(DWORD err); static void capi_adderror(DWORD err);
static void CAPI_trace(CAPI_CTX * ctx, char *format, ...); static void CAPI_trace(CAPI_CTX *ctx, char *format, ...);
static int capi_list_providers(CAPI_CTX * ctx, BIO *out); static int capi_list_providers(CAPI_CTX *ctx, BIO *out);
static int capi_list_containers(CAPI_CTX * ctx, BIO *out); static int capi_list_containers(CAPI_CTX *ctx, BIO *out);
int capi_list_certs(CAPI_CTX * ctx, BIO *out, char *storename); int capi_list_certs(CAPI_CTX *ctx, BIO *out, char *storename);
void capi_free_key(CAPI_KEY * key); void capi_free_key(CAPI_KEY *key);
static PCCERT_CONTEXT capi_find_cert(CAPI_CTX * ctx, const char *id, static PCCERT_CONTEXT capi_find_cert(CAPI_CTX *ctx, const char *id,
HCERTSTORE hstore); HCERTSTORE hstore);
CAPI_KEY *capi_find_key(CAPI_CTX * ctx, const char *id); CAPI_KEY *capi_find_key(CAPI_CTX *ctx, const char *id);
static EVP_PKEY *capi_load_privkey(ENGINE *eng, const char *key_id, static EVP_PKEY *capi_load_privkey(ENGINE *eng, const char *key_id,
UI_METHOD *ui_method, void *callback_data); UI_METHOD *ui_method, void *callback_data);
@ -193,10 +193,10 @@ struct CAPI_CTX_st {
}; };
static CAPI_CTX *capi_ctx_new(void); static CAPI_CTX *capi_ctx_new(void);
static void capi_ctx_free(CAPI_CTX * ctx); static void capi_ctx_free(CAPI_CTX *ctx);
static int capi_ctx_set_provname(CAPI_CTX * ctx, LPSTR pname, DWORD type, static int capi_ctx_set_provname(CAPI_CTX *ctx, LPSTR pname, DWORD type,
int check); int check);
static int capi_ctx_set_provname_idx(CAPI_CTX * ctx, int idx); static int capi_ctx_set_provname_idx(CAPI_CTX *ctx, int idx);
# define CAPI_CMD_LIST_CERTS ENGINE_CMD_BASE # define CAPI_CMD_LIST_CERTS ENGINE_CMD_BASE
# define CAPI_CMD_LOOKUP_CERT (ENGINE_CMD_BASE + 1) # define CAPI_CMD_LOOKUP_CERT (ENGINE_CMD_BASE + 1)
@ -622,7 +622,7 @@ static int lend_tobn(BIGNUM *bn, unsigned char *bin, int binlen)
/* Given a CAPI_KEY get an EVP_PKEY structure */ /* Given a CAPI_KEY get an EVP_PKEY structure */
static EVP_PKEY *capi_get_pkey(ENGINE *eng, CAPI_KEY * key) static EVP_PKEY *capi_get_pkey(ENGINE *eng, CAPI_KEY *key)
{ {
unsigned char *pubkey = NULL; unsigned char *pubkey = NULL;
DWORD len; DWORD len;
@ -1050,7 +1050,7 @@ static int capi_dsa_free(DSA *dsa)
} }
# endif # endif
static void capi_vtrace(CAPI_CTX * ctx, int level, char *format, static void capi_vtrace(CAPI_CTX *ctx, int level, char *format,
va_list argptr) va_list argptr)
{ {
BIO *out; BIO *out;
@ -1066,7 +1066,7 @@ static void capi_vtrace(CAPI_CTX * ctx, int level, char *format,
BIO_free(out); BIO_free(out);
} }
static void CAPI_trace(CAPI_CTX * ctx, char *format, ...) static void CAPI_trace(CAPI_CTX *ctx, char *format, ...)
{ {
va_list args; va_list args;
va_start(args, format); va_start(args, format);
@ -1112,7 +1112,7 @@ static char *wide_to_asc(LPCWSTR wstr)
return str; return str;
} }
static int capi_get_provname(CAPI_CTX * ctx, LPSTR * pname, DWORD * ptype, static int capi_get_provname(CAPI_CTX *ctx, LPSTR *pname, DWORD *ptype,
DWORD idx) DWORD idx)
{ {
DWORD len, err; DWORD len, err;
@ -1154,7 +1154,7 @@ static int capi_get_provname(CAPI_CTX * ctx, LPSTR * pname, DWORD * ptype,
return 1; return 1;
} }
static int capi_list_providers(CAPI_CTX * ctx, BIO *out) static int capi_list_providers(CAPI_CTX *ctx, BIO *out)
{ {
DWORD idx, ptype; DWORD idx, ptype;
int ret; int ret;
@ -1173,7 +1173,7 @@ static int capi_list_providers(CAPI_CTX * ctx, BIO *out)
return 1; return 1;
} }
static int capi_list_containers(CAPI_CTX * ctx, BIO *out) static int capi_list_containers(CAPI_CTX *ctx, BIO *out)
{ {
int ret = 1; int ret = 1;
HCRYPTPROV hprov; HCRYPTPROV hprov;
@ -1257,7 +1257,7 @@ static int capi_list_containers(CAPI_CTX * ctx, BIO *out)
return ret; return ret;
} }
static CRYPT_KEY_PROV_INFO *capi_get_prov_info(CAPI_CTX * ctx, static CRYPT_KEY_PROV_INFO *capi_get_prov_info(CAPI_CTX *ctx,
PCCERT_CONTEXT cert) PCCERT_CONTEXT cert)
{ {
DWORD len; DWORD len;
@ -1282,8 +1282,8 @@ static CRYPT_KEY_PROV_INFO *capi_get_prov_info(CAPI_CTX * ctx,
return pinfo; return pinfo;
} }
static void capi_dump_prov_info(CAPI_CTX * ctx, BIO *out, static void capi_dump_prov_info(CAPI_CTX *ctx, BIO *out,
CRYPT_KEY_PROV_INFO * pinfo) CRYPT_KEY_PROV_INFO *pinfo)
{ {
char *provname = NULL, *contname = NULL; char *provname = NULL, *contname = NULL;
if (!pinfo) { if (!pinfo) {
@ -1305,7 +1305,7 @@ static void capi_dump_prov_info(CAPI_CTX * ctx, BIO *out,
OPENSSL_free(contname); OPENSSL_free(contname);
} }
static 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; LPWSTR wfname;
DWORD dlen; DWORD dlen;
@ -1330,7 +1330,7 @@ static char *capi_cert_get_fname(CAPI_CTX * ctx, PCCERT_CONTEXT cert)
return NULL; return NULL;
} }
static 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;
const unsigned char *p; const unsigned char *p;
@ -1372,7 +1372,7 @@ static void capi_dump_cert(CAPI_CTX * ctx, BIO *out, PCCERT_CONTEXT cert)
X509_free(x); X509_free(x);
} }
static HCERTSTORE capi_open_store(CAPI_CTX * ctx, char *storename) static HCERTSTORE capi_open_store(CAPI_CTX *ctx, char *storename)
{ {
HCERTSTORE hstore; HCERTSTORE hstore;
@ -1391,7 +1391,7 @@ static HCERTSTORE capi_open_store(CAPI_CTX * ctx, char *storename)
return hstore; return hstore;
} }
int capi_list_certs(CAPI_CTX * ctx, BIO *out, char *id) int capi_list_certs(CAPI_CTX *ctx, BIO *out, char *id)
{ {
char *storename; char *storename;
int idx; int idx;
@ -1429,7 +1429,7 @@ int capi_list_certs(CAPI_CTX * ctx, BIO *out, char *id)
return ret; return ret;
} }
static PCCERT_CONTEXT capi_find_cert(CAPI_CTX * ctx, const char *id, static PCCERT_CONTEXT capi_find_cert(CAPI_CTX *ctx, const char *id,
HCERTSTORE hstore) HCERTSTORE hstore)
{ {
PCCERT_CONTEXT cert = NULL; PCCERT_CONTEXT cert = NULL;
@ -1460,7 +1460,7 @@ static PCCERT_CONTEXT capi_find_cert(CAPI_CTX * ctx, const char *id,
} }
} }
static CAPI_KEY *capi_get_key(CAPI_CTX * ctx, const TCHAR *contname, static CAPI_KEY *capi_get_key(CAPI_CTX *ctx, const TCHAR *contname,
TCHAR *provname, DWORD ptype, DWORD keyspec) TCHAR *provname, DWORD ptype, DWORD keyspec)
{ {
DWORD dwFlags = 0; DWORD dwFlags = 0;
@ -1508,7 +1508,7 @@ static CAPI_KEY *capi_get_key(CAPI_CTX * ctx, const TCHAR *contname,
return NULL; return NULL;
} }
static CAPI_KEY *capi_get_cert_key(CAPI_CTX * ctx, PCCERT_CONTEXT cert) static CAPI_KEY *capi_get_cert_key(CAPI_CTX *ctx, PCCERT_CONTEXT cert)
{ {
CAPI_KEY *key = NULL; CAPI_KEY *key = NULL;
CRYPT_KEY_PROV_INFO *pinfo = NULL; CRYPT_KEY_PROV_INFO *pinfo = NULL;
@ -1536,7 +1536,7 @@ static CAPI_KEY *capi_get_cert_key(CAPI_CTX * ctx, PCCERT_CONTEXT cert)
return key; return key;
} }
CAPI_KEY *capi_find_key(CAPI_CTX * ctx, const char *id) CAPI_KEY *capi_find_key(CAPI_CTX *ctx, const char *id)
{ {
PCCERT_CONTEXT cert; PCCERT_CONTEXT cert;
HCERTSTORE hstore; HCERTSTORE hstore;
@ -1580,7 +1580,7 @@ CAPI_KEY *capi_find_key(CAPI_CTX * ctx, const char *id)
return key; return key;
} }
void capi_free_key(CAPI_KEY * key) void capi_free_key(CAPI_KEY *key)
{ {
if (!key) if (!key)
return; return;
@ -1611,7 +1611,7 @@ static CAPI_CTX *capi_ctx_new(void)
return ctx; return ctx;
} }
static void capi_ctx_free(CAPI_CTX * ctx) static void capi_ctx_free(CAPI_CTX *ctx)
{ {
CAPI_trace(ctx, "Calling capi_ctx_free with %lx\n", ctx); CAPI_trace(ctx, "Calling capi_ctx_free with %lx\n", ctx);
if (!ctx) if (!ctx)
@ -1623,7 +1623,7 @@ static void capi_ctx_free(CAPI_CTX * ctx)
OPENSSL_free(ctx); OPENSSL_free(ctx);
} }
static int capi_ctx_set_provname(CAPI_CTX * ctx, LPSTR pname, DWORD type, static int capi_ctx_set_provname(CAPI_CTX *ctx, LPSTR pname, DWORD type,
int check) int check)
{ {
LPSTR tmpcspname; LPSTR tmpcspname;
@ -1662,7 +1662,7 @@ static int capi_ctx_set_provname(CAPI_CTX * ctx, LPSTR pname, DWORD type,
return 1; return 1;
} }
static int capi_ctx_set_provname_idx(CAPI_CTX * ctx, int idx) static int capi_ctx_set_provname_idx(CAPI_CTX *ctx, int idx)
{ {
LPSTR pname; LPSTR pname;
DWORD type; DWORD type;