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

- better ISO 7816-8 compatibility with various cards 

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@162 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
jey 2002-01-16 20:20:40 +00:00
parent fec2138523
commit 4e2192b0f4
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libopensc/pkcs15-sec.c
View File

@ -35,10 +35,10 @@ int sc_pkcs15_decipher(struct sc_pkcs15_card *p15card,
struct sc_security_env senv; struct sc_security_env senv;
struct sc_context *ctx = p15card->card->ctx; struct sc_context *ctx = p15card->card->ctx;
senv.algorithm_ref = 0x02; senv.algorithm_ref = 0x0102;
senv.key_file_id = prkey->file_id; senv.key_file_id = prkey->file_id;
senv.operation = SC_SEC_OPERATION_DECIPHER; senv.operation = SC_SEC_OPERATION_DECIPHER;
senv.key_ref = prkey->key_reference; senv.key_ref = 0x0100 | prkey->key_reference;
SC_FUNC_CALLED(ctx, 1); SC_FUNC_CALLED(ctx, 1);
r = sc_select_file(p15card->card, &p15card->file_app.path, r = sc_select_file(p15card->card, &p15card->file_app.path,
@ -65,7 +65,7 @@ int sc_pkcs15_compute_signature(struct sc_pkcs15_card *p15card,
struct sc_security_env senv; struct sc_security_env senv;
struct sc_context *ctx = p15card->card->ctx; struct sc_context *ctx = p15card->card->ctx;
senv.algorithm_ref = 0x02; senv.algorithm_ref = 0x0102;
switch (hash) { switch (hash) {
case SC_PKCS15_HASH_SHA1: case SC_PKCS15_HASH_SHA1:
senv.algorithm_ref |= 0x10; senv.algorithm_ref |= 0x10;
@ -76,7 +76,7 @@ int sc_pkcs15_compute_signature(struct sc_pkcs15_card *p15card,
} }
senv.key_file_id = prkey->file_id; senv.key_file_id = prkey->file_id;
senv.operation = SC_SEC_OPERATION_SIGN; senv.operation = SC_SEC_OPERATION_SIGN;
senv.key_ref = prkey->key_reference; senv.key_ref = 0x0100 | prkey->key_reference;
SC_FUNC_CALLED(ctx, 1); SC_FUNC_CALLED(ctx, 1);
r = sc_select_file(p15card->card, &p15card->file_app.path, r = sc_select_file(p15card->card, &p15card->file_app.path,

27
src/libopensc/sec.c
View File

@ -44,21 +44,28 @@ int sc_set_security_env(struct sc_card *card,
apdu.p1 = 0x81; apdu.p1 = 0x81;
apdu.p2 = 0xB6; apdu.p2 = 0xB6;
break; break;
default: default:
return SC_ERROR_INVALID_ARGUMENTS; return SC_ERROR_INVALID_ARGUMENTS;
} }
apdu.le = 0; apdu.le = 0;
p = sbuf; p = sbuf;
*p++ = 0x80; /* algorithm reference */ if (env->algorithm_ref >= 0) {
*p++ = 1; *p++ = 0x80; /* algorithm reference */
*p++ = env->algorithm_ref; *p++ = env->algorithm_ref >> 8;
*p++ = 0x81; *p++ = env->algorithm_ref & 0xFF;
*p++ = env->key_file_id.len; }
memcpy(p, env->key_file_id.value, env->key_file_id.len); if (env->key_file_id.len >= 0) {
p += env->key_file_id.len; *p++ = 0x81;
*p++ = 0x84; *p++ = env->key_file_id.len;
*p++ = 1; memcpy(p, env->key_file_id.value, env->key_file_id.len);
*p++ = env->key_ref; p += env->key_file_id.len;
}
if (env->key_ref >= 0) {
*p++ = 0x84;
*p++ = env->key_ref >> 8;
*p++ = env->key_ref & 0xFF;
}
r = p - sbuf; r = p - sbuf;
apdu.lc = r; apdu.lc = r;
apdu.datalen = r; apdu.datalen = r;