cleanup
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1960 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
parent
2b29b3b7a8
commit
4bb760db4d
|
@ -258,7 +258,7 @@ int sc_transmit_apdu(struct sc_card *card, struct sc_apdu *apdu)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (apdu->sw1 == 0x61 && apdu->resplen == 0) {
|
if (apdu->sw1 == 0x61 && apdu->resplen == 0) {
|
||||||
unsigned int le;
|
size_t le;
|
||||||
|
|
||||||
if (orig_resplen == 0) {
|
if (orig_resplen == 0) {
|
||||||
apdu->sw1 = 0x90; /* FIXME: should we do this? */
|
apdu->sw1 = 0x90; /* FIXME: should we do this? */
|
||||||
|
|
|
@ -688,7 +688,8 @@ int sc_get_cache_dir(struct sc_context *ctx, char *buf, size_t bufsize)
|
||||||
int sc_make_cache_dir(struct sc_context *ctx)
|
int sc_make_cache_dir(struct sc_context *ctx)
|
||||||
{
|
{
|
||||||
char dirname[PATH_MAX], *sp;
|
char dirname[PATH_MAX], *sp;
|
||||||
int r, j, namelen;
|
int r;
|
||||||
|
size_t j, namelen;
|
||||||
|
|
||||||
if ((r = sc_get_cache_dir(ctx, dirname, sizeof(dirname))) < 0)
|
if ((r = sc_get_cache_dir(ctx, dirname, sizeof(dirname))) < 0)
|
||||||
return r;
|
return r;
|
||||||
|
|
|
@ -837,21 +837,16 @@ static int compare_obj_path(sc_pkcs15_object_t *obj, const sc_path_t *path)
|
||||||
switch (obj->type) {
|
switch (obj->type) {
|
||||||
case SC_PKCS15_TYPE_CERT_X509:
|
case SC_PKCS15_TYPE_CERT_X509:
|
||||||
return sc_compare_path(&((struct sc_pkcs15_cert_info *) data)->path, path);
|
return sc_compare_path(&((struct sc_pkcs15_cert_info *) data)->path, path);
|
||||||
break;
|
|
||||||
case SC_PKCS15_TYPE_PRKEY_RSA:
|
case SC_PKCS15_TYPE_PRKEY_RSA:
|
||||||
case SC_PKCS15_TYPE_PRKEY_DSA:
|
case SC_PKCS15_TYPE_PRKEY_DSA:
|
||||||
return sc_compare_path(&((struct sc_pkcs15_prkey_info *) data)->path, path);
|
return sc_compare_path(&((struct sc_pkcs15_prkey_info *) data)->path, path);
|
||||||
break;
|
|
||||||
case SC_PKCS15_TYPE_PUBKEY_RSA:
|
case SC_PKCS15_TYPE_PUBKEY_RSA:
|
||||||
case SC_PKCS15_TYPE_PUBKEY_DSA:
|
case SC_PKCS15_TYPE_PUBKEY_DSA:
|
||||||
return sc_compare_path(&((struct sc_pkcs15_pubkey_info *) data)->path, path);
|
return sc_compare_path(&((struct sc_pkcs15_pubkey_info *) data)->path, path);
|
||||||
break;
|
|
||||||
case SC_PKCS15_TYPE_AUTH_PIN:
|
case SC_PKCS15_TYPE_AUTH_PIN:
|
||||||
return sc_compare_path(&((struct sc_pkcs15_pin_info *) data)->path, path);
|
return sc_compare_path(&((struct sc_pkcs15_pin_info *) data)->path, path);
|
||||||
break;
|
|
||||||
case SC_PKCS15_TYPE_DATA_OBJECT:
|
case SC_PKCS15_TYPE_DATA_OBJECT:
|
||||||
return sc_compare_path(&((struct sc_pkcs15_data_info *) data)->path, path);
|
return sc_compare_path(&((struct sc_pkcs15_data_info *) data)->path, path);
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue