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

gp: Define the structure packed, as it is used directly to read data inside

Browse Source
This commit is contained in:
Jakub Jelen 2019-11-18 14:04:20 +01:00
parent 4fd34e28ea
commit cae3b71d75
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/libopensc/gp.h
View File

@ -32,8 +32,15 @@
extern "C" { extern "C" {
#endif #endif
#ifdef _MSC_VER
#define PACKED
#pragma pack(push,1)
#elif defined(__GNUC__)
#define PACKED __attribute__ ((__packed__))
#endif
/* returned by the iso get status apdu with the global platform cplc data parameters */ /* returned by the iso get status apdu with the global platform cplc data parameters */
typedef struct global_platform_cplc_data { typedef struct global_platform_cplc_data {
u8 tag[2]; u8 tag[2];
u8 length; u8 length;
u8 ic_fabricator[2]; u8 ic_fabricator[2];
@ -54,13 +61,20 @@ typedef struct global_platform_cplc_data {
u8 ic_personalizaer[2]; u8 ic_personalizaer[2];
u8 ic_personalization_data[2]; u8 ic_personalization_data[2];
u8 ic_personalization_id[4]; u8 ic_personalization_id[4];
} global_platform_cplc_data_t; } PACKED global_platform_cplc_data_t;
int gp_select_aid(struct sc_card *card, const struct sc_aid *aid); int gp_select_aid(struct sc_card *card, const struct sc_aid *aid);
int gp_select_card_manager(struct sc_card *card); int gp_select_card_manager(struct sc_card *card);
int gp_select_isd_rid(struct sc_card *card); int gp_select_isd_rid(struct sc_card *card);
int gp_get_cplc_data(struct sc_card *card, global_platform_cplc_data_t *cplc_data); int gp_get_cplc_data(struct sc_card *card, global_platform_cplc_data_t *cplc_data);
#ifdef _MSC_VER
#undef PACKED
#pragma pack(pop)
#elif defined(__GNUC__)
#undef PACKED
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif