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>

diff --git a/src/utils/pcsc_funcs.c b/src/utils/pcsc_funcs.c
index eed521d42b7e4a84af89e28461ec74f44da7204b..26ee29b3154cb675ec0c2a3ca17d0d44ca5b8cbb 100644 (file)
--- 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 36992146b5d3be83f5f4214a363438266ad2b788..9b945cc8e0544b9ed325eab54dac36793d28c2af 100644 (file)
--- 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,