update from Peter Koch
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2343 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
nils
parent
fa333542db
commit
f1625365bf
|
|
@ -32,79 +32,83 @@ int sc_pkcs15emu_netkey_init_ex(sc_pkcs15_card_t *, sc_pkcs15emu_opt_t *);
|
|||
static void
|
||||
set_string(char **strp, const char *value)
|
||||
{
|
||||
if (*strp)
|
||||
free(*strp);
|
||||
if (*strp) free(*strp);
|
||||
*strp = value? strdup(value) : NULL;
|
||||
}
|
||||
|
||||
static int
|
||||
sc_pkcs15emu_netkey_init(sc_pkcs15_card_t *p15card) {
|
||||
static const struct {
|
||||
int id;
|
||||
int id, auth_id;
|
||||
int min_length;
|
||||
unsigned char reference;
|
||||
const char *path;
|
||||
const char *label;
|
||||
unsigned char pinref;
|
||||
int flags;
|
||||
} pinlist[]={
|
||||
{1, "DF015080", "lokale PIN0", 0x80},
|
||||
{2, "DF015081", "lokale PIN1", 0x81},
|
||||
{1, 2, 6, 0x00, "5000", "globale PIN",
|
||||
SC_PKCS15_PIN_FLAG_CASE_SENSITIVE | SC_PKCS15_PIN_FLAG_INITIALIZED |
|
||||
SC_PKCS15_PIN_FLAG_UNBLOCKING_PIN},
|
||||
{2, 0, 8, 0x01, "5001", "globale PUK",
|
||||
SC_PKCS15_PIN_FLAG_CASE_SENSITIVE | SC_PKCS15_PIN_FLAG_INITIALIZED |
|
||||
SC_PKCS15_PIN_FLAG_UNBLOCKING_PIN | SC_PKCS15_PIN_FLAG_SO_PIN},
|
||||
{3, 4, 6, 0x80, "DF015080", "lokale PIN0",
|
||||
SC_PKCS15_PIN_FLAG_CASE_SENSITIVE | SC_PKCS15_PIN_FLAG_LOCAL |
|
||||
SC_PKCS15_PIN_FLAG_INITIALIZED},
|
||||
{4, 1, 6, 0x81, "DF015081", "lokale PIN1",
|
||||
SC_PKCS15_PIN_FLAG_CASE_SENSITIVE | SC_PKCS15_PIN_FLAG_LOCAL |
|
||||
SC_PKCS15_PIN_FLAG_INITIALIZED | SC_PKCS15_PIN_FLAG_UNBLOCKING_PIN |
|
||||
SC_PKCS15_PIN_FLAG_SO_PIN},
|
||||
{0}
|
||||
};
|
||||
static const struct {
|
||||
int id, auth_id;
|
||||
const char *path;
|
||||
unsigned char key_reference;
|
||||
const char *label;
|
||||
unsigned char keyref;
|
||||
int usage;
|
||||
} keylist[]={
|
||||
{1, 2, "DF015331", "Signatur-Schlüssel", 0x80,
|
||||
SC_PKCS15_PRKEY_USAGE_NONREPUDIATION},
|
||||
{2, 2, "DF015371", "Authentifizierungs-Schlüssel", 0x82,
|
||||
SC_PKCS15_PRKEY_USAGE_SIGN | SC_PKCS15_PRKEY_USAGE_SIGNRECOVER | SC_PKCS15_PRKEY_USAGE_ENCRYPT | SC_PKCS15_PRKEY_USAGE_DECRYPT},
|
||||
{3, 1, "DF0153B1", "Verschlüsselungs-Schlüssel", 0x81,
|
||||
SC_PKCS15_PRKEY_USAGE_ENCRYPT | SC_PKCS15_PRKEY_USAGE_DECRYPT},
|
||||
{1, 4, "DF015331", 0x80, "Signatur-Schlüssel"},
|
||||
{2, 4, "DF015371", 0x82, "Authentifizierungs-Schlüssel"},
|
||||
{3, 3, "DF0153B1", 0x81, "Verschlüsselungs-Schlüssel"},
|
||||
{0}
|
||||
};
|
||||
static const struct {
|
||||
int id;
|
||||
int writable;
|
||||
const char *path;
|
||||
const char *label;
|
||||
int obj_flags;
|
||||
} certlist[]={
|
||||
{1, "DF01C000", "Telesec Signatur Zertifikat", 0},
|
||||
{1, "DF014331", "User Signatur Zertifikat1",
|
||||
SC_PKCS15_CO_FLAG_MODIFIABLE},
|
||||
{1, "DF014332", "User Signatur Zertifikat2",
|
||||
SC_PKCS15_CO_FLAG_MODIFIABLE},
|
||||
{2, "DF01C100", "Telesec Authentifizierungs Zertifikat", 0},
|
||||
{2, "DF014371", "User Authentifizierungs Zertifikat1",
|
||||
SC_PKCS15_CO_FLAG_MODIFIABLE},
|
||||
{2, "DF014372", "User Authentifizierungs Zertifikat2",
|
||||
SC_PKCS15_CO_FLAG_MODIFIABLE},
|
||||
{3, "DF01C200", "Telesec Verschlüsselungs Zertifikat", 0},
|
||||
{3, "DF0143B1", "User Verschlüsselungs Zertifikat1",
|
||||
SC_PKCS15_CO_FLAG_MODIFIABLE},
|
||||
{3, "DF0143B2", "User Verschlüsselungs Zertifikat2",
|
||||
SC_PKCS15_CO_FLAG_MODIFIABLE},
|
||||
{1, 0, "DF01C000", "Telesec Signatur Zertifikat"},
|
||||
{1, 1, "DF014331", "User Signatur Zertifikat 1"},
|
||||
{1, 1, "DF014332", "User Signatur Zertifikat 2"},
|
||||
{2, 0, "DF01C100", "Telesec Authentifizierungs Zertifikat"},
|
||||
{2, 1, "DF014371", "User Authentifizierungs Zertifikat 1"},
|
||||
{2, 1, "DF014372", "User Authentifizierungs Zertifikat 2"},
|
||||
{3, 0, "DF01C200", "Telesec Verschlüsselungs Zertifikat"},
|
||||
{3, 1, "DF0143B1", "User Verschlüsselungs Zertifikat 1"},
|
||||
{3, 1, "DF0143B2", "User Verschlüsselungs Zertifikat 2"},
|
||||
{0}
|
||||
};
|
||||
|
||||
sc_card_t *card = p15card->card;
|
||||
sc_context_t *ctx = p15card->card->ctx;
|
||||
sc_path_t path;
|
||||
char serial[30];
|
||||
int i, r;
|
||||
sc_card_t *card = p15card->card;
|
||||
sc_context_t *ctx = p15card->card->ctx;
|
||||
sc_path_t path;
|
||||
sc_file_t *file;
|
||||
sc_serial_number_t serialnr;
|
||||
char serial[30];
|
||||
int i, r, usage;
|
||||
|
||||
|
||||
/* check if we have the correct card OS */
|
||||
if (strcmp(card->name, "TCOS"))
|
||||
return SC_ERROR_WRONG_CARD;
|
||||
/* check if we have a df01 DF */
|
||||
sc_format_path("3F00DF01", &path);
|
||||
if (strcmp(card->name, "TCOS")) return SC_ERROR_WRONG_CARD;
|
||||
|
||||
/* check if we have a df01 DF with a C000 certificate */
|
||||
sc_format_path("3F00DF01C000", &path);
|
||||
r = sc_select_file(card, &path, NULL);
|
||||
if (r < 0) {
|
||||
r = SC_ERROR_WRONG_CARD;
|
||||
goto failed;
|
||||
}
|
||||
|
||||
/* get the card serial number */
|
||||
r = sc_card_ctl(card, SC_CARDCTL_GET_SERIALNR, &serialnr);
|
||||
if (r < 0) {
|
||||
|
|
@ -120,83 +124,98 @@ sc_pkcs15emu_netkey_init(sc_pkcs15_card_t *p15card) {
|
|||
|
||||
for(i=0; pinlist[i].id; ++i){
|
||||
struct sc_pkcs15_pin_info pin_info;
|
||||
struct sc_pkcs15_object pin_obj;
|
||||
struct sc_pkcs15_object pin_obj;
|
||||
|
||||
if (ctx->debug >= 2) sc_debug(ctx, "Netkey: Loading %s: %s\n", pinlist[i].path, pinlist[i].label);
|
||||
|
||||
sc_format_path(pinlist[i].path, &path);
|
||||
r = sc_select_file(card, &path, &file);
|
||||
if (r < 0) continue;
|
||||
|
||||
memset(&pin_info, 0, sizeof(pin_info));
|
||||
memset(&pin_obj, 0, sizeof(pin_obj));
|
||||
|
||||
if (ctx->debug >= 2)
|
||||
sc_debug(ctx, "Netkey: Loading %s: %s\n", pinlist[i].path, pinlist[i].label);
|
||||
|
||||
pin_info.auth_id.len = 1;
|
||||
pin_info.auth_id.len = 1;
|
||||
pin_info.auth_id.value[0] = pinlist[i].id;
|
||||
pin_info.reference = pinlist[i].pinref;
|
||||
pin_info.flags = SC_PKCS15_PIN_FLAG_CASE_SENSITIVE | SC_PKCS15_PIN_FLAG_INITIALIZED;
|
||||
pin_info.type = SC_PKCS15_PIN_TYPE_ASCII_NUMERIC;
|
||||
pin_info.min_length = 6;
|
||||
pin_info.stored_length = 16;
|
||||
pin_info.max_length = 16;
|
||||
pin_info.pad_char = '\0';
|
||||
pin_info.reference = pinlist[i].reference;
|
||||
pin_info.flags = pinlist[i].flags;
|
||||
pin_info.type = SC_PKCS15_PIN_TYPE_ASCII_NUMERIC;
|
||||
pin_info.min_length = pinlist[i].min_length;
|
||||
pin_info.stored_length = 16;
|
||||
pin_info.max_length = 16;
|
||||
pin_info.pad_char = '\0';
|
||||
pin_info.tries_left = file->prop_attr[3];
|
||||
sc_format_path(pinlist[i].path, &pin_info.path);
|
||||
pin_info.tries_left = -1;
|
||||
|
||||
memset(&pin_obj, 0, sizeof(pin_obj));
|
||||
strncpy(pin_obj.label, pinlist[i].label, SC_PKCS15_MAX_LABEL_SIZE - 1);
|
||||
pin_obj.flags = SC_PKCS15_CO_FLAG_MODIFIABLE | SC_PKCS15_CO_FLAG_PRIVATE;
|
||||
pin_obj.flags = SC_PKCS15_CO_FLAG_MODIFIABLE | SC_PKCS15_CO_FLAG_PRIVATE;
|
||||
pin_obj.auth_id.len = pinlist[i].auth_id ? 0 : 1;
|
||||
pin_obj.auth_id.value[0] = pinlist[i].auth_id;
|
||||
|
||||
r = sc_pkcs15emu_add_pin_obj(p15card, &pin_obj, &pin_info);
|
||||
if (r < 0)
|
||||
return SC_ERROR_INTERNAL;
|
||||
sc_file_free(file);
|
||||
if (r < 0) {
|
||||
sc_debug(ctx, "sc_pkcs15emu_add_pin_obj(%s) failed\n", pinlist[i].path);
|
||||
r = SC_ERROR_INTERNAL;
|
||||
goto failed;
|
||||
}
|
||||
}
|
||||
|
||||
for(i=0; keylist[i].id; ++i){
|
||||
struct sc_pkcs15_prkey_info prkey_info;
|
||||
struct sc_pkcs15_object prkey_obj;
|
||||
|
||||
if (ctx->debug >= 2) sc_debug(ctx, "Netkey: Loading %s\n", keylist[i].label);
|
||||
|
||||
sc_format_path(keylist[i].path, &path);
|
||||
r = sc_select_file(card, &path, &file);
|
||||
if (r < 0) continue;
|
||||
|
||||
usage = SC_PKCS15_PRKEY_USAGE_NONREPUDIATION | SC_PKCS15_PRKEY_USAGE_SIGN;
|
||||
if(file->prop_attr[1] & 0x04) usage |= SC_PKCS15_PRKEY_USAGE_ENCRYPT | SC_PKCS15_PRKEY_USAGE_DECRYPT;
|
||||
|
||||
memset(&prkey_info, 0, sizeof(prkey_info));
|
||||
memset(&prkey_obj, 0, sizeof(prkey_obj));
|
||||
|
||||
if (ctx->debug >= 2)
|
||||
sc_debug(ctx, "Netkey: Loading %s\n", keylist[i].label);
|
||||
|
||||
prkey_info.id.len = 1;
|
||||
prkey_info.id.value[0] = keylist[i].id;
|
||||
prkey_info.usage = keylist[i].usage;
|
||||
prkey_info.native = 1;
|
||||
prkey_info.key_reference = keylist[i].keyref;
|
||||
prkey_info.modulus_length= 1024;
|
||||
prkey_info.id.len = 1;
|
||||
prkey_info.id.value[0] = keylist[i].id;
|
||||
prkey_info.usage = usage;
|
||||
prkey_info.native = 1;
|
||||
prkey_info.key_reference = keylist[i].key_reference;
|
||||
prkey_info.modulus_length = 1024;
|
||||
sc_format_path(keylist[i].path, &prkey_info.path);
|
||||
|
||||
memset(&prkey_obj, 0, sizeof(prkey_obj));
|
||||
strncpy(prkey_obj.label, keylist[i].label, SC_PKCS15_MAX_LABEL_SIZE - 1);
|
||||
prkey_obj.flags = SC_PKCS15_CO_FLAG_PRIVATE;
|
||||
prkey_obj.flags = SC_PKCS15_CO_FLAG_PRIVATE;
|
||||
prkey_obj.auth_id.len = 1;
|
||||
prkey_obj.auth_id.value[0] = keylist[i].auth_id;
|
||||
|
||||
r = sc_pkcs15emu_add_rsa_prkey(p15card, &prkey_obj, &prkey_info);
|
||||
if (r < 0)
|
||||
return SC_ERROR_INTERNAL;
|
||||
sc_file_free(file);
|
||||
if (r < 0) {
|
||||
sc_debug(ctx, "sc_pkcs15emu_add_rsa_prkey(%s) failed\n", keylist[i].path);
|
||||
r = SC_ERROR_INTERNAL;
|
||||
goto failed;
|
||||
}
|
||||
}
|
||||
|
||||
for(i=0; certlist[i].id; ++i){
|
||||
unsigned char cert[20];
|
||||
struct sc_pkcs15_cert_info cert_info;
|
||||
struct sc_pkcs15_object cert_obj;
|
||||
unsigned char cert[20];
|
||||
|
||||
if (ctx->debug >= 2)
|
||||
sc_debug(ctx, "Netkey: Loading %s: %s\n", certlist[i].path, certlist[i].label);
|
||||
if (ctx->debug >= 2) sc_debug(ctx, "Netkey: Loading %s: %s\n", certlist[i].path, certlist[i].label);
|
||||
sc_format_path(certlist[i].path, &path);
|
||||
card->ctx->suppress_errors++;
|
||||
r = sc_select_file(card, &path, NULL);
|
||||
card->ctx->suppress_errors--;
|
||||
if (r < 0)
|
||||
continue;
|
||||
if (r < 0) continue;
|
||||
|
||||
/* read first 20 bytes of certificate, first two bytes
|
||||
* must be 0x30 0x82, otherwise this is an empty cert-file
|
||||
* Telesec-Certificates are prefixed by an OID,
|
||||
* for example 06:03:55:04:24. this must be skipped
|
||||
*/
|
||||
sc_read_binary(card, 0, cert, sizeof(cert), 0);
|
||||
if(cert[0]!=0x30 || cert[1]!=0x82) continue;
|
||||
r = sc_read_binary(card, 0, cert, sizeof(cert), 0);
|
||||
if(r<0 || cert[0]!=0x30 || cert[1]!=0x82) continue;
|
||||
if(cert[4]==0x06 && cert[5]<10 && cert[6+cert[5]]==0x30 && cert[7+cert[5]]==0x82){
|
||||
path.index=6+cert[5];
|
||||
path.count=(cert[8+cert[5]]<<8) + cert[9+cert[5]] + 4;
|
||||
|
|
@ -206,19 +225,21 @@ sc_pkcs15emu_netkey_init(sc_pkcs15_card_t *p15card) {
|
|||
}
|
||||
|
||||
memset(&cert_info, 0, sizeof(cert_info));
|
||||
memset(&cert_obj, 0, sizeof(cert_obj));
|
||||
|
||||
cert_info.id.len = 1;
|
||||
cert_info.id.value[0] = certlist[i].id;
|
||||
cert_info.authority = 0;
|
||||
cert_info.path = path;
|
||||
|
||||
memset(&cert_obj, 0, sizeof(cert_obj));
|
||||
strncpy(cert_obj.label, certlist[i].label, SC_PKCS15_MAX_LABEL_SIZE - 1);
|
||||
cert_obj.flags = certlist[i].obj_flags;
|
||||
cert_obj.flags = certlist[i].writable ? SC_PKCS15_CO_FLAG_MODIFIABLE : 0;
|
||||
|
||||
r = sc_pkcs15emu_add_x509_cert(p15card, &cert_obj, &cert_info);
|
||||
if (r < 0)
|
||||
return SC_ERROR_INTERNAL;
|
||||
if (r < 0) {
|
||||
sc_debug(ctx, "sc_pkcs15emu_add_x509_cert(%s) failed\n", certlist[i].path);
|
||||
r = SC_ERROR_INTERNAL;
|
||||
goto failed;
|
||||
}
|
||||
}
|
||||
|
||||
/* return to MF */
|
||||
|
|
|
|||
Loading…
Reference in New Issue