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

pkcs11, libopensc, pkkcs15init: not use C99 designated initializers 

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4238 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
viktor.tarasov 2010-04-14 11:36:40 +00:00
parent 3d6eaca830
commit 801fdcefe2
3 changed files with 150 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libopensc/card-myeid.c
View File

@ -38,12 +38,12 @@
static struct sc_card_operations myeid_ops; static struct sc_card_operations myeid_ops;
static struct sc_card_driver myeid_drv = { static struct sc_card_driver myeid_drv = {
.name = "MyEID cards with PKCS#15 applet", "MyEID cards with PKCS#15 applet",
.short_name = "myeid", "myeid",
.ops = &myeid_ops, &myeid_ops,
.atr_map = NULL, NULL,
.natrs = 0, 0,
.dll = NULL NULL
}; };
static const char *myeid_atrs[] = { static const char *myeid_atrs[] = {

252
src/pkcs11/openssl.c
View File

@ -32,154 +32,154 @@ static CK_RV sc_pkcs11_openssl_md_final(sc_pkcs11_operation_t *,
static void sc_pkcs11_openssl_md_release(sc_pkcs11_operation_t *); static void sc_pkcs11_openssl_md_release(sc_pkcs11_operation_t *);
static sc_pkcs11_mechanism_type_t openssl_sha1_mech = { static sc_pkcs11_mechanism_type_t openssl_sha1_mech = {
.mech = CKM_SHA_1, CKM_SHA_1,
.mech_info = { 0, 0, CKF_DIGEST }, { 0, 0, CKF_DIGEST },
.key_type = 0, 0,
.obj_size = sizeof(struct sc_pkcs11_operation), sizeof(struct sc_pkcs11_operation),
.release = sc_pkcs11_openssl_md_release, sc_pkcs11_openssl_md_release,
.md_init = sc_pkcs11_openssl_md_init, sc_pkcs11_openssl_md_init,
.md_update = sc_pkcs11_openssl_md_update, sc_pkcs11_openssl_md_update,
.md_final = sc_pkcs11_openssl_md_final, sc_pkcs11_openssl_md_final,
.sign_init = NULL, NULL,
.sign_update = NULL, NULL,
.sign_final = NULL, NULL,
.sign_size = NULL, NULL,
.verif_init = NULL, NULL,
.verif_update = NULL, NULL,
.verif_final = NULL, NULL,
.decrypt_init = NULL, NULL,
.decrypt = NULL, NULL,
.mech_data = NULL NULL
}; };
#if OPENSSL_VERSION_NUMBER >= 0x00908000L #if OPENSSL_VERSION_NUMBER >= 0x00908000L
static sc_pkcs11_mechanism_type_t openssl_sha256_mech = { static sc_pkcs11_mechanism_type_t openssl_sha256_mech = {
.mech = CKM_SHA256, CKM_SHA256,
.mech_info = { 0, 0, CKF_DIGEST }, { 0, 0, CKF_DIGEST },
.key_type = 0, 0,
.obj_size = sizeof(struct sc_pkcs11_operation), sizeof(struct sc_pkcs11_operation),
.release = sc_pkcs11_openssl_md_release, sc_pkcs11_openssl_md_release,
.md_init = sc_pkcs11_openssl_md_init, sc_pkcs11_openssl_md_init,
.md_update = sc_pkcs11_openssl_md_update, sc_pkcs11_openssl_md_update,
.md_final = sc_pkcs11_openssl_md_final, sc_pkcs11_openssl_md_final,
.sign_init = NULL, NULL,
.sign_update = NULL, NULL,
.sign_final = NULL, NULL,
.sign_size = NULL, NULL,
.verif_init = NULL, NULL,
.verif_update = NULL, NULL,
.verif_final = NULL, NULL,
.decrypt_init = NULL, NULL,
.decrypt = NULL, NULL,
.mech_data = NULL NULL
}; };
static sc_pkcs11_mechanism_type_t openssl_sha384_mech = { static sc_pkcs11_mechanism_type_t openssl_sha384_mech = {
.mech = CKM_SHA384, CKM_SHA384,
.mech_info = { 0, 0, CKF_DIGEST }, { 0, 0, CKF_DIGEST },
.key_type = 0, 0,
.obj_size = sizeof(struct sc_pkcs11_operation), sizeof(struct sc_pkcs11_operation),
.release = sc_pkcs11_openssl_md_release, sc_pkcs11_openssl_md_release,
.md_init = sc_pkcs11_openssl_md_init, sc_pkcs11_openssl_md_init,
.md_update = sc_pkcs11_openssl_md_update, sc_pkcs11_openssl_md_update,
.md_final = sc_pkcs11_openssl_md_final, sc_pkcs11_openssl_md_final,
.sign_init = NULL, NULL,
.sign_update = NULL, NULL,
.sign_final = NULL, NULL,
.sign_size = NULL, NULL,
.verif_init = NULL, NULL,
.verif_update = NULL, NULL,
.verif_final = NULL, NULL,
.decrypt_init = NULL, NULL,
.decrypt = NULL, NULL,
.mech_data = NULL NULL
}; };
static sc_pkcs11_mechanism_type_t openssl_sha512_mech = { static sc_pkcs11_mechanism_type_t openssl_sha512_mech = {
.mech = CKM_SHA512, CKM_SHA512,
.mech_info = { 0, 0, CKF_DIGEST }, { 0, 0, CKF_DIGEST },
.key_type = 0, 0,
.obj_size = sizeof(struct sc_pkcs11_operation), sizeof(struct sc_pkcs11_operation),
.release = sc_pkcs11_openssl_md_release, sc_pkcs11_openssl_md_release,
.md_init = sc_pkcs11_openssl_md_init, sc_pkcs11_openssl_md_init,
.md_update = sc_pkcs11_openssl_md_update, sc_pkcs11_openssl_md_update,
.md_final = sc_pkcs11_openssl_md_final, sc_pkcs11_openssl_md_final,
.sign_init = NULL, NULL,
.sign_update = NULL, NULL,
.sign_final = NULL, NULL,
.sign_size = NULL, NULL,
.verif_init = NULL, NULL,
.verif_update = NULL, NULL,
.verif_final = NULL, NULL,
.decrypt_init = NULL, NULL,
.decrypt = NULL, NULL,
.mech_data = NULL NULL
}; };
#endif #endif
#if OPENSSL_VERSION_NUMBER >= 0x10000000L #if OPENSSL_VERSION_NUMBER >= 0x10000000L
static sc_pkcs11_mechanism_type_t openssl_gostr3411_mech = { static sc_pkcs11_mechanism_type_t openssl_gostr3411_mech = {
.mech = CKM_GOSTR3411, CKM_GOSTR3411,
.mech_info = { 0, 0, CKF_DIGEST }, { 0, 0, CKF_DIGEST },
.key_type = 0, 0,
.obj_size = sizeof(struct sc_pkcs11_operation), sizeof(struct sc_pkcs11_operation),
.release = sc_pkcs11_openssl_md_release, sc_pkcs11_openssl_md_release,
.md_init = sc_pkcs11_openssl_md_init, sc_pkcs11_openssl_md_init,
.md_update = sc_pkcs11_openssl_md_update, sc_pkcs11_openssl_md_update,
.md_final = sc_pkcs11_openssl_md_final, sc_pkcs11_openssl_md_final,
.sign_init = NULL, NULL,
.sign_update = NULL, NULL,
.sign_final = NULL, NULL,
.sign_size = NULL, NULL,
.verif_init = NULL, NULL,
.verif_update = NULL, NULL,
.verif_final = NULL, NULL,
.decrypt_init = NULL, NULL,
.decrypt = NULL, NULL,
.mech_data = NULL NULL
}; };
#endif #endif
static sc_pkcs11_mechanism_type_t openssl_md5_mech = { static sc_pkcs11_mechanism_type_t openssl_md5_mech = {
.mech = CKM_MD5, CKM_MD5,
.mech_info = { 0, 0, CKF_DIGEST }, { 0, 0, CKF_DIGEST },
.key_type = 0, 0,
.obj_size = sizeof(struct sc_pkcs11_operation), sizeof(struct sc_pkcs11_operation),
.release = sc_pkcs11_openssl_md_release, sc_pkcs11_openssl_md_release,
.md_init = sc_pkcs11_openssl_md_init, sc_pkcs11_openssl_md_init,
.md_update = sc_pkcs11_openssl_md_update, sc_pkcs11_openssl_md_update,
.md_final = sc_pkcs11_openssl_md_final, sc_pkcs11_openssl_md_final,
.sign_init = NULL, NULL,
.sign_update = NULL, NULL,
.sign_final = NULL, NULL,
.sign_size = NULL, NULL,
.verif_init = NULL, NULL,
.verif_update = NULL, NULL,
.verif_final = NULL, NULL,
.decrypt_init = NULL, NULL,
.decrypt = NULL, NULL,
.mech_data = NULL NULL
}; };
static sc_pkcs11_mechanism_type_t openssl_ripemd160_mech = { static sc_pkcs11_mechanism_type_t openssl_ripemd160_mech = {
.mech = CKM_RIPEMD160, CKM_RIPEMD160,
.mech_info = { 0, 0, CKF_DIGEST }, { 0, 0, CKF_DIGEST },
.key_type = 0, 0,
.obj_size = sizeof(struct sc_pkcs11_operation), sizeof(struct sc_pkcs11_operation),
.release = sc_pkcs11_openssl_md_release, sc_pkcs11_openssl_md_release,
.md_init = sc_pkcs11_openssl_md_init, sc_pkcs11_openssl_md_init,
.md_update = sc_pkcs11_openssl_md_update, sc_pkcs11_openssl_md_update,
.md_final = sc_pkcs11_openssl_md_final, sc_pkcs11_openssl_md_final,
.sign_init = NULL, NULL,
.sign_update = NULL, NULL,
.sign_final = NULL, NULL,
.sign_size = NULL, NULL,
.verif_init = NULL, NULL,
.verif_update = NULL, NULL,
.verif_final = NULL, NULL,
.decrypt_init = NULL, NULL,
.decrypt = NULL, NULL,
.mech_data = NULL NULL
}; };
void void

36
src/pkcs15init/pkcs15-setcos.c
View File

@ -572,24 +572,24 @@ setcos_create_pin_internal(sc_profile_t *profile, sc_pkcs15_card_t *p15card,
static struct sc_pkcs15init_operations sc_pkcs15init_setcos_operations = { static struct sc_pkcs15init_operations sc_pkcs15init_setcos_operations = {
.erase_card = setcos_erase_card, setcos_erase_card, /* erase_card */
.init_card = setcos_init_card, /* init_card */ setcos_init_card, /* init_card */
.create_dir = setcos_create_dir, /* create_dir */ setcos_create_dir, /* create_dir */
.create_domain = NULL, /* create_domain */ NULL, /* create_domain */
.select_pin_reference = setcos_select_pin_reference, setcos_select_pin_reference, /* select_pin_reference */
.create_pin = setcos_create_pin, setcos_create_pin, /* create_pin */
.select_key_reference = NULL, /* select_key_reference */ NULL, /* select_key_reference */
.create_key = setcos_create_key, /* create_key */ setcos_create_key, /* create_key */
.store_key = setcos_store_key, /* store_key */ setcos_store_key, /* store_key */
.generate_key = setcos_generate_key, /* generate_key */ setcos_generate_key, /* generate_key */
.encode_private_key = setcos_encode_private_key, setcos_encode_private_key, /* encode_private_key */
.encode_public_key = setcos_encode_public_key, setcos_encode_public_key, /* encode_public_key */
.finalize_card = NULL, /* finalize_card */ NULL, /* finalize_card */
.delete_object = setcos_delete_object, setcos_delete_object, /* setcos_delete_object */
.emu_update_dir = NULL, NULL, /* emu_update_dir */
.emu_update_any_df = NULL, NULL, /* emu_update_any_df */
.emu_update_tokeninfo = NULL, NULL, /* emu_update_tokeninfo */
.emu_write_info = NULL NULL /* emu_write_info */
}; };
struct sc_pkcs15init_operations * struct sc_pkcs15init_operations *