diff options
| author | Jouni Malinen <j@w1.fi> | 2012-03-03 18:10:37 +0200 |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2012-03-03 18:10:37 +0200 |
| commit | 9779e122cda523c44c8d720f4a0034abe46cd2c5 (patch) | |
| tree | 55234ce806aecb9158eaf4312c240cf26e5c2d71 /src/utils | |
| parent | 67303a5479249141d0fa63b92ca34d560ffcfbe4 (diff) | |
| download | external_wpa_supplicant_8_ti-9779e122cda523c44c8d720f4a0034abe46cd2c5.zip external_wpa_supplicant_8_ti-9779e122cda523c44c8d720f4a0034abe46cd2c5.tar.gz external_wpa_supplicant_8_ti-9779e122cda523c44c8d720f4a0034abe46cd2c5.tar.bz2 | |
SCARD: Move SIM file definitions into the C file
These are used only within pcsc_funcs.c so no need to define the
file identifiers in the header file.
Signed-hostap: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/pcsc_funcs.c | 21 | ||||
| -rw-r--r-- | src/utils/pcsc_funcs.h | 20 |
2 files changed, 21 insertions, 20 deletions
diff --git a/src/utils/pcsc_funcs.c b/src/utils/pcsc_funcs.c index eed521d..26ee29b 100644 --- a/src/utils/pcsc_funcs.c +++ b/src/utils/pcsc_funcs.c @@ -84,6 +84,27 @@ #define CK_LEN 16 +/* GSM files + * File type in first octet: + * 3F = Master File + * 7F = Dedicated File + * 2F = Elementary File under the Master File + * 6F = Elementary File under a Dedicated File + */ +#define SCARD_FILE_MF 0x3F00 +#define SCARD_FILE_GSM_DF 0x7F20 +#define SCARD_FILE_UMTS_DF 0x7F50 +#define SCARD_FILE_GSM_EF_IMSI 0x6F07 +#define SCARD_FILE_GSM_EF_AD 0x6FAD +#define SCARD_FILE_EF_DIR 0x2F00 +#define SCARD_FILE_EF_ICCID 0x2FE2 +#define SCARD_FILE_EF_CK 0x6FE1 +#define SCARD_FILE_EF_IK 0x6FE2 + +#define SCARD_CHV1_OFFSET 13 +#define SCARD_CHV1_FLAG 0x80 + + typedef enum { SCARD_GSM_SIM, SCARD_USIM } sim_types; struct scard_data { diff --git a/src/utils/pcsc_funcs.h b/src/utils/pcsc_funcs.h index 3699214..9b945cc 100644 --- a/src/utils/pcsc_funcs.h +++ b/src/utils/pcsc_funcs.h @@ -9,26 +9,6 @@ #ifndef PCSC_FUNCS_H #define PCSC_FUNCS_H -/* GSM files - * File type in first octet: - * 3F = Master File - * 7F = Dedicated File - * 2F = Elementary File under the Master File - * 6F = Elementary File under a Dedicated File - */ -#define SCARD_FILE_MF 0x3F00 -#define SCARD_FILE_GSM_DF 0x7F20 -#define SCARD_FILE_UMTS_DF 0x7F50 -#define SCARD_FILE_GSM_EF_IMSI 0x6F07 -#define SCARD_FILE_GSM_EF_AD 0x6FAD -#define SCARD_FILE_EF_DIR 0x2F00 -#define SCARD_FILE_EF_ICCID 0x2FE2 -#define SCARD_FILE_EF_CK 0x6FE1 -#define SCARD_FILE_EF_IK 0x6FE2 - -#define SCARD_CHV1_OFFSET 13 -#define SCARD_CHV1_FLAG 0x80 - typedef enum { SCARD_GSM_SIM_ONLY, SCARD_USIM_ONLY, |