giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix warnings 

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2851 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
nils 2006-02-17 21:06:31 +00:00
parent aa5d081c3a
commit 8410084f0e
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libopensc/card-piv.c
View File

@ -541,7 +541,7 @@ static int piv_get_data(sc_card_t * card, unsigned int enumtag,
if (piv_objects[enumtag].enumtag == PIV_OBJ_9A06) { if (piv_objects[enumtag].enumtag == PIV_OBJ_9A06) {
BIO * bp = NULL; BIO * bp = NULL;
RSA * rsa = NULL; RSA * rsa = NULL;
u8 *p; u8 *q;
size_t derlen; size_t derlen;
size_t taglen; size_t taglen;
char * keyfilename = NULL; char * keyfilename = NULL;
@ -586,12 +586,12 @@ static int piv_get_data(sc_card_t * card, unsigned int enumtag,
r = SC_ERROR_OUT_OF_MEMORY; r = SC_ERROR_OUT_OF_MEMORY;
goto err; goto err;
} }
p = *buf; q = *buf;
put_tag_and_len(0x53, taglen, &p); put_tag_and_len(0x53, taglen, &q);
put_tag_and_len(0x99, derlen, &p); put_tag_and_len(0x99, derlen, &q);
i2d_RSAPublicKey(rsa, &p); i2d_RSAPublicKey(rsa, &q);
RSA_free(rsa); RSA_free(rsa);

3
src/libopensc/ctx.c
View File

@ -544,7 +544,7 @@ static void process_config_file(sc_context_t *ctx, struct _sc_ctx_options *opts)
{ {
int i, r, count = 0; int i, r, count = 0;
scconf_block **blocks; scconf_block **blocks;
char *conf_path; const char *conf_path = NULL;
#ifdef _WIN32 #ifdef _WIN32
char temp_path[PATH_MAX]; char temp_path[PATH_MAX];
int temp_len; int temp_len;
@ -552,7 +552,6 @@ static void process_config_file(sc_context_t *ctx, struct _sc_ctx_options *opts)
HKEY hKey; HKEY hKey;
#endif #endif
conf_path = 0;
memset(ctx->conf_blocks, 0, sizeof(ctx->conf_blocks)); memset(ctx->conf_blocks, 0, sizeof(ctx->conf_blocks));
#ifdef _WIN32 #ifdef _WIN32
rc = RegOpenKeyEx( HKEY_CURRENT_USER, "Software\\OpenSC", rc = RegOpenKeyEx( HKEY_CURRENT_USER, "Software\\OpenSC",