initial checkin of 'libosmosim'

10 files changed, 1487 insertions, 0 deletions

diff --git a/src/sim/Makefile.am b/src/sim/Makefile.am
new file mode 100644
index 00000000..f3f8069c
--- /dev/null
+++ b/src/sim/Makefile.am
@@ -0,0 +1,16 @@
+# This is _NOT_ the library release version, it's an API version.
+# Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification
+LIBVERSION=0:0:0
+
+INCLUDES = $(all_includes) -I$(top_srcdir)/include
+AM_CFLAGS = -fPIC -Wall
+
+noinst_HEADERS = sim_int.h gsm_int.h
+
+lib_LTLIBRARIES = libosmosim.la
+
+libosmosim_la_SOURCES = core.c card_fs_sim.c card_fs_usim.c card_fs_uicc.c file_codec.c reader.c reader_pcsc.c
+# FIXME: use autoconf to determine pcsc include path / library name
+libosmosim_la_LDFLAGS = -version-info $(LIBVERSION) -lpcsclite
+libosmosim_la_CFLAGS = -I/usr/include/PCSC
+
diff --git a/src/sim/card_fs_sim.c b/src/sim/card_fs_sim.c
new file mode 100644
index 00000000..d8421505
--- /dev/null
+++ b/src/sim/card_fs_sim.c
@@ -0,0 +1,385 @@
+
+#include <errno.h>
+#include <string.h>
+
+#include <osmocom/sim/sim.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/gsm/gsm48.h>
+
+#include "sim_int.h"
+
+/* TS 11.11 / Chapter 9.4 */
+static const struct osim_card_sw ts11_11_sw[] = {
+	{
+		0x9000, 0xffff, SW_TYPE_STR, SW_CLS_OK,
+		.u.str = "Normal ending of the command",
+	}, {
+		0x9100, 0xff00, SW_TYPE_STR, SW_CLS_OK,
+		.u.str = "Normal ending of the command - proactive command from SIM pending",
+	}, {
+		0x9e00, 0xff00, SW_TYPE_STR, SW_CLS_OK,
+		.u.str = "Normal ending of the command - response data for SIM data download",
+	}, {
+		0x9f00, 0xff00, SW_TYPE_STR, SW_CLS_OK,
+		.u.str = "Normal ending of the command - response data available",
+	}, {
+		0x9300, 0xffff, SW_TYPE_STR, SW_CLS_POSTP,
+		.u.str = "SIM Application Toolkit is busy, command cannot be executed at present",
+	}, {
+		0x9200, 0xfff0, SW_TYPE_STR, SW_CLS_WARN,
+		.u.str = "Memory management - Command successful but after using an internal updat retry X times",
+	}, {
+		0x9240, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Memory management - Memory problem",
+	}, {
+		0x9400, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Referencing management - no EF selected",
+	}, {
+		0x9402, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Referencing management - out of range (invalid address)",
+	}, {
+		0x9404, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Referencing management - file ID not found / pattern not found",
+	}, {
+		0x9802, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Security management - no CHV initialized",
+	}, {
+		0x9804, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Security management - access condition not fulfilled",
+	}, {
+		0x9808, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Security management - in contradiction with CHV status",
+	}, {
+		0x9810, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Security management - in contradiction with invalidation status",
+	}, {
+		0x9840, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Security management - unsuccessful CHV verification, no attempt left",
+	}, {
+		0x9850, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Security management - increase cannot be performed, max value reached",
+	}, {
+		0x6700, 0xff00, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Application independent - incorrect parameter P3",
+	}, {
+		0x6b00, 0xff00, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Application independent - incorrect parameter P1 or P2",
+	}, {
+		0x6d00, 0xff00, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Application independent - unknown instruction code",
+	}, {
+		0x6e00, 0xff00, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Application independent - wrong instruction class",
+	}, {
+		0x6f00, 0xff00, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Application independent - technical problem with no diagnostic given",
+	},
+	OSIM_CARD_SW_LAST
+};
+
+static const struct osim_card_sw *sim_card_sws[] = {
+	ts11_11_sw,
+	NULL
+};
+
+static int iccid_decode(struct osim_decoded_data *dd,
+			const struct osim_file_desc *desc,
+	     		int len, uint8_t *data)
+{
+	struct osim_decoded_element *elem;
+
+	elem = element_alloc(dd, "ICCID", ELEM_T_BCD, ELEM_REPR_DEC);
+	elem->length = len;
+	elem->u.buf = talloc_memdup(elem, data, len);
+
+	return 0;
+}
+
+static int elp_decode(struct osim_decoded_data *dd,
+		      const struct osim_file_desc *desc,
+		      int len, uint8_t *data)
+{
+	int i, num_lp = len / 2;
+
+	for (i = 0; i < num_lp; i++) {
+		uint8_t *cur = data + i*2;
+		struct osim_decoded_element *elem;
+		elem = element_alloc(dd, "Language Code", ELEM_T_STRING, ELEM_REPR_NONE);
+		elem->u.buf = (uint8_t *) talloc_strndup(elem, (const char *) cur, 2);
+	}
+
+	return 0;
+}
+
+static int default_decode(struct osim_decoded_data *dd,
+			  const struct osim_file_desc *desc,
+			  int len, uint8_t *data)
+{
+	struct osim_decoded_element *elem;
+
+	elem = element_alloc(dd, "Unknown Payload", ELEM_T_BYTES, ELEM_REPR_HEX);
+	elem->u.buf = talloc_memdup(elem, data, len);
+
+	return 0;
+}
+
+
+/* 10.3.1 */
+int gsm_lp_decode(struct osim_decoded_data *dd,
+		 const struct osim_file_desc *desc,
+		 int len, uint8_t *data)
+{
+	int i;
+
+	for (i = 0; i < len; i++) {
+		struct osim_decoded_element *elem;
+		elem = element_alloc(dd, "Language Code", ELEM_T_UINT8, ELEM_REPR_DEC);
+		elem->u.u8 = data[i];
+	}
+
+	return 0;
+}
+
+/* 10.3.2 */
+int gsm_imsi_decode(struct osim_decoded_data *dd,
+		   const struct osim_file_desc *desc,
+		   int len, uint8_t *data)
+{
+	struct osim_decoded_element *elem;
+
+	if (len < 2)
+		return -EINVAL;
+
+	elem = element_alloc(dd, "IMSI", ELEM_T_BCD, ELEM_REPR_DEC);
+	elem->length = data[0];
+	elem->u.buf = talloc_memdup(elem, data+1, len-1);
+
+	return 0;
+}
+
+/* 10.3.3 */
+static int gsm_kc_decode(struct osim_decoded_data *dd,
+			 const struct osim_file_desc *desc,
+			 int len, uint8_t *data)
+{
+	struct osim_decoded_element *kc, *cksn;
+
+	if (len < 9)
+		return -EINVAL;
+
+	kc = element_alloc(dd, "Kc", ELEM_T_BYTES, ELEM_REPR_HEX);
+	kc->u.buf = talloc_memdup(kc, data, 8);
+	cksn = element_alloc(dd, "CKSN", ELEM_T_UINT8, ELEM_REPR_DEC);
+	cksn->u.u8 = data[8];
+
+	return 0;
+}
+
+/* 10.3.4 */
+static int gsm_plmnsel_decode(struct osim_decoded_data *dd,
+			      const struct osim_file_desc *desc,
+			      int len, uint8_t *data)
+{
+	int i, n_plmn = len / 3;
+
+	if (n_plmn < 1)
+		return -EINVAL;
+
+	for (i = 0; i < n_plmn; i++) {
+		uint8_t *cur = data + 3*i;
+		struct osim_decoded_element *elem, *mcc, *mnc;
+		uint8_t ra_buf[6];
+		struct gprs_ra_id ra_id;
+
+		memset(ra_buf, 0, sizeof(ra_buf));
+		memcpy(ra_buf, cur, 3);
+		gsm48_parse_ra(&ra_id, ra_buf);
+
+		elem = element_alloc(dd, "PLMN", ELEM_T_GROUP, ELEM_REPR_NONE);
+
+		mcc = element_alloc_sub(elem, "MCC", ELEM_T_UINT16, ELEM_REPR_DEC);
+		mcc->u.u16 = ra_id.mcc;
+
+		mnc = element_alloc_sub(elem, "MNC", ELEM_T_UINT16, ELEM_REPR_DEC);
+		mnc->u.u16 = ra_id.mnc;
+	}
+
+	return 0;
+}
+
+/* 10.3.5 */
+int gsm_hpplmn_decode(struct osim_decoded_data *dd,
+		     const struct osim_file_desc *desc,
+		     int len, uint8_t *data)
+{
+	struct osim_decoded_element *elem;
+
+	elem = element_alloc(dd, "Time interval", ELEM_T_UINT8, ELEM_REPR_DEC);
+	elem->u.u8 = *data;
+
+	return 0;
+}
+
+/* Chapter 10.2.x */
+static const struct osim_file_desc sim_ef_in_mf[] = {
+	EF_TRANSP(0x2FE2, "EF.ICCID", 0,
+		  "ICC Identification", &iccid_decode, NULL),
+	EF_TRANSP(0x2F05, "EF.ELP", F_OPTIONAL,
+		  "Extended language preference", &elp_decode, NULL),
+};
+
+/* Chapter 10.3.x */
+static const struct osim_file_desc sim_ef_in_gsm[] = {
+	EF_TRANSP(0x6F05, "EF.LP", 0,
+		  "Language preference", &gsm_lp_decode, NULL),
+	EF_TRANSP(0x6F07, "EF.IMSI", 0,
+		  "IMSI", &gsm_imsi_decode, NULL),
+	EF_TRANSP(0x6F20, "EF.Kc", 0,
+		  "Ciphering key Kc", &gsm_kc_decode, NULL),
+	EF_TRANSP(0x6F30, "EF.PLMNsel", F_OPTIONAL,
+		  "PLMN selector", &gsm_plmnsel_decode, NULL),
+	EF_TRANSP(0x6F31, "EF.HPPLMN", 0,
+		  "Higher Priority PLMN search period", &gsm_hpplmn_decode, NULL),
+	EF_TRANSP_N(0x6F37, "EF.ACMmax", F_OPTIONAL,
+		  "ACM maximum value"),
+	EF_TRANSP_N(0x6F38, "EF.SST", 0,
+		  "SIM service table"),
+	EF_CYCLIC_N(0x6F39, "EF.ACM", F_OPTIONAL,
+		  "Accumulated call meter"),
+	EF_TRANSP_N(0x6F3E, "EF.GID1", F_OPTIONAL,
+		  "Group Identifier Level 1"),
+	EF_TRANSP_N(0x6F3F, "EF.GID2", F_OPTIONAL,
+		  "Group Identifier Level 2"),
+	EF_TRANSP_N(0x6F46, "EF.SPN", F_OPTIONAL,
+		  "Service Provider Name"),
+	EF_TRANSP_N(0x6F41, "EF.PUCT", F_OPTIONAL,
+		  "Price per unit and currency table"),
+	EF_TRANSP_N(0x6F45, "EF.CBMI", F_OPTIONAL,
+		  "Cell broadcast massage identifier selection"),
+	EF_TRANSP_N(0x6F74, "EF.BCCH", 0,
+		  "Broadcast control channels"),
+	EF_TRANSP_N(0x6F78, "EF.ACC", 0,
+		  "Access control class"),
+	EF_TRANSP_N(0x6F7B, "EF.FPLMN", 0,
+		  "Forbidden PLMNs"),
+	EF_TRANSP_N(0x6F7E, "EF.LOCI", 0,
+		  "Location information"),
+	EF_TRANSP_N(0x6FAD, "EF.AD", 0,
+		  "Administrative data"),
+	EF_TRANSP_N(0x6FAE, "EF.Phase", 0,
+		  "Phase identification"),
+	EF_TRANSP_N(0x6FB1, "EF.VGCS", F_OPTIONAL,
+		  "Voice Group Call Service"),
+	EF_TRANSP_N(0x6FB2, "EF.VGCSS", F_OPTIONAL,
+		  "Voice Group Call Service Status"),
+	EF_TRANSP_N(0x6FB3, "EF.VBS", F_OPTIONAL,
+		  "Voice Broadcast Service"),
+	EF_TRANSP_N(0x6FB4, "EF.VBSS", F_OPTIONAL,
+		  "Voice Broadcast Service Status"),
+	EF_TRANSP_N(0x6FB5, "EF.eMLPP", F_OPTIONAL,
+		  "enhanced Mult Level Pre-emption and Priority"),
+	EF_TRANSP_N(0x6FB6, "EF.AAeM", F_OPTIONAL,
+		  "Automatic Answer for eMLPP Service"),
+	EF_TRANSP_N(0x6F48, "EF.CBMID", F_OPTIONAL,
+		  "Cell Broadcast Message Identifier for Data Download"),
+	EF_TRANSP_N(0x6FB7, "EF.ECC", F_OPTIONAL,
+		  "Emergency Call Code"),
+	EF_TRANSP_N(0x6F50, "EF.CBMIR", F_OPTIONAL,
+		  "Cell broadcast message identifier range selection"),
+	EF_TRANSP_N(0x6F2C, "EF.DCK", F_OPTIONAL,
+		  "De-personalization Control Keys"),
+	EF_TRANSP_N(0x6F32, "EF.CNL", F_OPTIONAL,
+		  "Co-operative Network List"),
+	EF_LIN_FIX_N(0x6F51, "EF.NIA", F_OPTIONAL,
+		   "Network's Indication of Alerting"),
+	EF_TRANSP_N(0x6F52, "EF.KcGPRS", F_OPTIONAL,
+		  "GPRS Ciphering key KcGPRS"),
+	EF_TRANSP_N(0x6F53, "EF.LOCIGPRS", F_OPTIONAL,
+		  "GPRS location information"),
+	EF_TRANSP_N(0x6F54, "EF.SUME", F_OPTIONAL,
+		  "SetUpMenu Elements"),
+	EF_TRANSP_N(0x6F60, "EF.PLMNwAcT", F_OPTIONAL,
+		  "User controlled PLMN Selector with Access Technology"),
+	EF_TRANSP_N(0x6F61, "EF.OPLMNwAcT", F_OPTIONAL,
+		  "Operator controlled PLMN Selector with Access Technology"),
+	EF_TRANSP_N(0x6F62, "EF.HPLMNwAcT", F_OPTIONAL,
+		  "HPLMN Selector with Access Technology"),
+	EF_TRANSP_N(0x6F63, "EF.CPBCCH", F_OPTIONAL,
+		  "CPBCCH Information"),
+	EF_TRANSP_N(0x6F64, "EF.InvScan", F_OPTIONAL,
+		  "Investigation Scan"),
+};
+
+/* 10.5. */
+static const struct osim_file_desc sim_ef_in_telecom[] = {
+	EF_LIN_FIX_N(0x6F3A, "EF.ADN", F_OPTIONAL,
+		"Abbreviated dialling numbers"),
+	EF_LIN_FIX_N(0x6F3B, "EF.FDN", F_OPTIONAL,
+		"Fixed dialling numbers"),
+	EF_LIN_FIX_N(0x6F3C, "EF.SMS", F_OPTIONAL,
+		"Short messages"),
+	EF_LIN_FIX_N(0x6F3D, "EF.CCP", F_OPTIONAL,
+		"Capability configuration parameters"),
+	EF_LIN_FIX_N(0x6F4F, "EF.ECCP", F_OPTIONAL,
+		"Extended Capability configuration parameters"),
+	EF_LIN_FIX_N(0x6F40, "EF.MSISDN", F_OPTIONAL,
+		"MSISDN"),
+	EF_LIN_FIX_N(0x6F42, "EF.SMSP", F_OPTIONAL,
+		"Short message service parameters"),
+	EF_TRANSP_N(0x6F43, "EF.SMSS", F_OPTIONAL,
+		"SMS Status"),
+	EF_CYCLIC_N(0x6F44, "EF.LND", F_OPTIONAL,
+		"Last number dialled"),
+	EF_LIN_FIX_N(0x6F4A, "EF.EXT1", F_OPTIONAL,
+		"Extension 1"),
+	EF_LIN_FIX_N(0x6F4B, "EF.EXT2", F_OPTIONAL,
+		"Extension 2"),
+	EF_LIN_FIX_N(0x6F4C, "EF.EXT3", F_OPTIONAL,
+		"Extension 3"),
+	EF_LIN_FIX_N(0x6F4D, "EF.BDN", F_OPTIONAL,
+		"Barred dialling numbers"),
+	EF_LIN_FIX_N(0x6F4E, "EF.EXT4", F_OPTIONAL,
+		"Extension 4"),
+	EF_LIN_FIX_N(0x6F47, "EF.SMSR", F_OPTIONAL,
+		"Short message status reports"),
+	EF_LIN_FIX_N(0x6F58, "EF.CMI", F_OPTIONAL,
+		"Comparison Method Information"),
+};
+
+
+/* 10.6. */
+static const struct osim_file_desc sim_ef_in_graphics[] = {
+	EF_LIN_FIX_N(0x4F20, "EF.IMG", F_OPTIONAL,
+		"Image"),
+};
+
+struct osim_card_profile *osim_cprof_sim(void *ctx)
+{
+	struct osim_card_profile *cprof;
+	struct osim_file_desc *mf, *gsm, *tc;
+
+	cprof = talloc_zero(ctx, struct osim_card_profile);
+	cprof->name = "GSM SIM";
+	cprof->sws = sim_card_sws;
+
+	mf = alloc_df(cprof, 0x3f00, "MF");
+
+	cprof->mf = mf;
+
+	add_filedesc(mf, sim_ef_in_mf, ARRAY_SIZE(sim_ef_in_mf));
+	gsm = add_df_with_ef(mf, 0x7F20, "DF.GSM", sim_ef_in_gsm,
+			ARRAY_SIZE(sim_ef_in_gsm));
+	add_df_with_ef(gsm, 0x5F30, "DF.IRIDIUM", NULL, 0);
+	add_df_with_ef(gsm, 0x5F31, "DF.GLOBST", NULL, 0);
+	add_df_with_ef(gsm, 0x5F32, "DF.ICO", NULL, 0);
+	add_df_with_ef(gsm, 0x5F33, "DF.ACeS", NULL, 0);
+	add_df_with_ef(gsm, 0x5F40, "DF.ACeS", NULL, 0);
+	add_df_with_ef(gsm, 0x5F60, "DF.CTS", NULL, 0);
+	add_df_with_ef(gsm, 0x5F70, "DF.SoLSA", NULL, 0);
+	tc = add_df_with_ef(mf, 0x7F10, "DF.TELECOM", sim_ef_in_telecom,
+			ARRAY_SIZE(sim_ef_in_telecom));
+	add_df_with_ef(tc, 0x5F50, "DF.GRAPHICS", sim_ef_in_graphics,
+			ARRAY_SIZE(sim_ef_in_graphics));
+
+	return cprof;
+}
diff --git a/src/sim/card_fs_uicc.c b/src/sim/card_fs_uicc.c
new file mode 100644
index 00000000..03dbad32
--- /dev/null
+++ b/src/sim/card_fs_uicc.c
@@ -0,0 +1,185 @@
+#include <osmocom/sim/sim.h>
+#include <osmocom/gsm/tlv.h>
+
+/* TS 102 221 V10.0.0 / 10.2.1 */
+const struct osim_card_sw ts102221_uicc_sw[] = {
+	{
+		0x9000, 0xffff, SW_TYPE_STR, SW_CLS_OK,
+		.u.str = "Normal ending of the command",
+	}, {
+		0x9100, 0xff00, SW_TYPE_STR, SW_CLS_OK,
+		.u.str = "Normal ending of the command, extra info proactive",
+	}, {
+		0x9200, 0xff00, SW_TYPE_STR, SW_CLS_OK,
+		.u.str = "Normal ending of the command, extra info regarding transfer session",
+	}, {
+		0x9300, 0xff00, SW_TYPE_STR, SW_CLS_POSTP,
+		.u.str = "SIM Application Toolkit is busy, command cannot be executed at present",
+	}, {
+		0x6200, 0xffff, SW_TYPE_STR, SW_CLS_WARN,
+		.u.str = "No information given, state of non volatile memory unchanged",
+	}, {
+		0x6281, 0xffff, SW_TYPE_STR, SW_CLS_WARN,
+		.u.str = "Part of returned data may be corrupted",
+	}, {
+		0x6282, 0xffff, SW_TYPE_STR, SW_CLS_WARN,
+		.u.str = "End of file/record reached before reading Le bytes",
+	}, {
+		0x6283, 0xffff, SW_TYPE_STR, SW_CLS_WARN,
+		.u.str = "Selected file invalidated",
+	}, {
+		0x6285, 0xffff, SW_TYPE_STR, SW_CLS_WARN,
+		.u.str = "Selected file in termination state",
+	}, {
+		0x62f1, 0xffff, SW_TYPE_STR, SW_CLS_WARN,
+		.u.str = "More data available",
+	}, {
+		0x62f2, 0xffff, SW_TYPE_STR, SW_CLS_WARN,
+		.u.str = "More data available and proactive command pending",
+	}, {
+		0x62f3, 0xffff, SW_TYPE_STR, SW_CLS_WARN,
+		.u.str = "Response data available",
+	}, {
+		0x63f1, 0xffff, SW_TYPE_STR, SW_CLS_WARN,
+		.u.str = "More data expected",
+	}, {
+		0x63c0, 0xfff0, SW_TYPE_STR, SW_CLS_WARN,
+		.u.str = "Verification falied, X retries remaining",
+	}, {
+		0x6400, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Execution - No information given, state of non-volatile memory unchanged",
+	}, {
+		0x6500, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Execution - No information given, state of non-volatile memory changed",
+	}, {
+		0x6581, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Execution - Memory problem",
+	}, {
+		0x6700, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Checking - Wrong length",
+	}, {
+		0x6700, 0xff00, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Checking - Command dependent error",
+	}, {
+		0x6b00, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Checking - Wrong parameter(s) P1-P2",
+	}, {
+		0x6d00, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Checking - Instruction code not supported or valid",
+	}, {
+		0x6e00, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Checking - Class not supported",
+	}, {
+		0x6f00, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Checking - Technical problem, no precise diagnostics",
+	}, {
+		0x6f00, 0xff00, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Checking - Command dependent error",
+	}, {
+		0x6800, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Function in CLA not supported - No information given",
+	}, {
+		0x6881, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Function in CLA not supported - Logical channel not supported",
+	}, {
+		0x6882, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Function in CLA not supportied - Secure messaging not supported",
+	}, {
+		0x6900, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Command not allowed - No information given",
+	}, {
+		0x6981, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Command not allowed - Command incompatible with file structure",
+	}, {
+		0x6982, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Command not allowed - Security status not satisfied",
+	}, {
+		0x6983, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Command not allowed - Authentication/PIN method blocked",
+	}, {
+		0x6984, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Command not allowed - Referenced data invalidated",
+	}, {
+		0x6985, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Command not allowed - Conditions of use not satisfied",
+	}, {
+		0x6986, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Command not allowed - Noe EF selected",
+	}, {
+		0x6989, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Command not allowed - secure channel - security not satisfied",
+	}, {
+		0x6a80, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Wrong parameters - Incorrect parameters in the data field",
+	}, {
+		0x6a81, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Wrong parameters - Function not supported",
+	}, {
+		0x6a82, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Wrong parameters - File not found",
+	}, {
+		0x6a83, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Wrong parameters - Record not found",
+	}, {
+		0x6a84, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Wrong parameters - Not enough memory space",
+	}, {
+		0x6a86, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Wrong parameters - Incorrect parameters P1 to P2",
+	}, {
+		0x6a87, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Wrong parameters - Lc inconsistent with P1 ot P2",
+	}, {
+		0x6a88, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Wrong parameters - Referenced data not found",
+	}, {
+		0x9850, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Application error - INCREASE cannot be performed, max value reached",
+	}, {
+		0x9862, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Application error - Authentication error, application specific",
+	}, {
+		0x9863, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Application error - Security session or association expired",
+	},
+	OSIM_CARD_SW_LAST
+};
+
+const struct value_string ts102221_fcp_vals[14] = {
+	{ UICC_FCP_T_FCP,		"File control parameters" },
+	{ UICC_FCP_T_FILE_SIZE,		"File size" },
+	{ UICC_FCP_T_TOT_F_SIZE,	"Total size of files" },
+	{ UICC_FCP_T_FILE_DESC,		"File descriptor" },
+	{ UICC_FCP_T_FILE_ID,		"File identifier" },
+	{ UICC_FCP_T_DF_NAME,		"DF name" },
+	{ UICC_FCP_T_SFID,		"Short file identifier" },
+	{ UICC_FCP_T_LIFEC_STS,		"Lifecycle status integer" },
+	{ UICC_FCP_T_SEC_ATTR_REFEXP,	"Security attributes (Referenced/Expanded)" },
+	{ UICC_FCP_T_SEC_ATTR_COMP,	"Security attributes (Compact)" },
+	{ UICC_FCP_T_PROPRIETARY,	"Proprietary" },
+	{ UICC_FCP_T_SEC_ATTR_EXP,	"Security attributes (Expanded)" },
+	{ UICC_FCP_T_PIN_STS_DO,	"PIN Status DO" },
+	{ 0, NULL }
+};
+
+/* FIXME: Ber-TLV ?? */
+const struct tlv_definition ts102221_fcp_tlv_def = {
+	.def = {
+		[UICC_FCP_T_FCP]		= { TLV_TYPE_TLV },
+		[UICC_FCP_T_FILE_SIZE]		= { TLV_TYPE_TLV },
+		[UICC_FCP_T_TOT_F_SIZE]		= { TLV_TYPE_TLV },
+		[UICC_FCP_T_FILE_DESC]		= { TLV_TYPE_TLV },
+		[UICC_FCP_T_FILE_ID]		= { TLV_TYPE_TLV },
+		[UICC_FCP_T_DF_NAME]		= { TLV_TYPE_TLV },
+		[UICC_FCP_T_SFID]		= { TLV_TYPE_TLV },
+		[UICC_FCP_T_LIFEC_STS]		= { TLV_TYPE_TLV },
+		[UICC_FCP_T_SEC_ATTR_REFEXP]	= { TLV_TYPE_TLV },
+		[UICC_FCP_T_SEC_ATTR_COMP]	= { TLV_TYPE_TLV },
+		[UICC_FCP_T_PROPRIETARY] 	= { TLV_TYPE_TLV },
+		[UICC_FCP_T_SEC_ATTR_EXP]	= { TLV_TYPE_TLV },
+		[UICC_FCP_T_PIN_STS_DO]		= { TLV_TYPE_TLV },
+	},
+};
+
+/* Annex E - TS 101 220 */
+static const uint8_t adf_uicc_aid[] = { 0xA0, 0x00, 0x00, 0x00, 0x87, 0x10, 0x01 };
diff --git a/src/sim/card_fs_usim.c b/src/sim/card_fs_usim.c
new file mode 100644
index 00000000..361c2e88
--- /dev/null
+++ b/src/sim/card_fs_usim.c
@@ -0,0 +1,288 @@
+
+#include <errno.h>
+#include <string.h>
+
+#include <osmocom/sim/sim.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/gsm/gsm48.h>
+
+#include "sim_int.h"
+#include "gsm_int.h"
+
+/* TS 31.102 Version 7.7.0 / Chapoter 7.3 */
+const struct osim_card_sw ts31_102_sw[] = {
+	{
+		0x9862, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Security management - Authentication error, incorrect MAC",
+	}, {
+		0x9864, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Security management - Authentication error, security context not supported",
+	}, {
+		0x9865, 0xffff, SW_TYPE_STR, SW_CLS_ERROR,
+		.u.str = "Security management - Key freshness error",
+	},
+	OSIM_CARD_SW_LAST
+};
+
+static const struct osim_card_sw *usim_card_sws[] = {
+	ts31_102_sw,
+	ts102221_uicc_sw,
+	NULL
+};
+
+
+static int default_decode(struct osim_decoded_data *dd,
+			  const struct osim_file_desc *desc,
+			  int len, uint8_t *data)
+{
+	struct osim_decoded_element *elem;
+
+	elem = element_alloc(dd, "Unknown Payload", ELEM_T_BYTES, ELEM_REPR_HEX);
+	elem->u.buf = talloc_memdup(elem, data, len);
+
+	return 0;
+}
+
+/* TS 102 221 Chapter 13.1 */
+static const struct osim_file_desc uicc_ef_in_mf[] = {
+	EF_LIN_FIX_N(0x2f00, "EF.DIR", 0,
+			"Application directory"),
+	EF_TRANSP_N(0x2FE2, "EF.ICCID", 0,
+			"ICC Identification"),
+	EF_TRANSP_N(0x2F05, "EF.PL", 0,
+			"Preferred Languages"),
+	EF_LIN_FIX_N(0x2F06, "EF.ARR", F_OPTIONAL,
+			"Access Rule Reference"),
+};
+
+static const struct osim_file_desc usim_ef_in_df_gsm_access[] = {
+	EF_TRANSP_N(0x4f20, "EF.Kc", 0,
+		"Ciphering Key Kc"),
+	EF_TRANSP_N(0x4f52, "EF.KcGPRS", 0,
+		"GPRS Ciphering key KcGPRS"),
+	EF_TRANSP_N(0x4f63, "EF.CPBCCH", F_OPTIONAL,
+		"CPBCCH Information"),
+	EF_TRANSP_N(0x4f64, "EF.invSCAN", F_OPTIONAL,
+		"Investigation Scan"),
+};
+
+/* 31.102 Chapter 4.2 */
+static const struct osim_file_desc usim_ef_in_adf_usim[] = {
+	EF_TRANSP(0x6F05, "EF.LI", 0,
+		"Language Indication", &gsm_lp_decode, NULL),
+	EF_TRANSP(0x6F07, "EF.IMSI", 0,
+		"IMSI", &gsm_imsi_decode, NULL),
+	EF_TRANSP_N(0x6F08, "EF.Keys", 0,
+		"Ciphering and Integrity Keys"),
+	EF_TRANSP_N(0x6F09, "EF.KeysPS", 0,
+		"Ciphering and Integrity Keys for Packet Switched domain"),
+	EF_TRANSP_N(0x6F60, "EF.PLMNwAcT", F_OPTIONAL,
+		"User controlled PLMN Selector with Access Technology"),
+	EF_TRANSP(0x6F31, "EF.HPPLMN", 0,
+		"Higher Priority PLMN search period", &gsm_hpplmn_decode, NULL),
+	EF_TRANSP_N(0x6F37, "EF.ACMmax", F_OPTIONAL,
+		"ACM maximum value"),
+	EF_TRANSP_N(0x6F38, "EF.UST", 0,
+		"USIM Service Table"),
+	EF_CYCLIC_N(0x6F39, "EF.ACM", F_OPTIONAL,
+		"Accumulated call meter"),
+	EF_TRANSP_N(0x6F3E, "EF.GID1", F_OPTIONAL,
+		"Group Identifier Level 1"),
+	EF_TRANSP_N(0x6F3F, "EF.GID2", F_OPTIONAL,
+		"Group Identifier Level 2"),
+	EF_TRANSP_N(0x6F46, "EF.SPN", F_OPTIONAL,
+		"Service Provider Name"),
+	EF_TRANSP_N(0x6F41, "EF.PUCT", F_OPTIONAL,
+		"Price per unit and currency table"),
+	EF_TRANSP_N(0x6F45, "EF.CBMI", F_OPTIONAL,
+		"Cell broadcast massage identifier selection"),
+	EF_TRANSP_N(0x6F78, "EF.ACC", 0,
+		"Access control class"),
+	EF_TRANSP_N(0x6F7B, "EF.FPLMN", 0,
+		"Forbidden PLMNs"),
+	EF_TRANSP_N(0x6F7E, "EF.LOCI", 0,
+		"Location information"),
+	EF_TRANSP_N(0x6FAD, "EF.AD", 0,
+		"Administrative data"),
+	EF_TRANSP_N(0x6F48, "EF.CBMID", F_OPTIONAL,
+		"Cell Broadcast Message Identifier for Data Download"),
+	EF_TRANSP_N(0x6FB7, "EF.ECC", F_OPTIONAL,
+		"Emergency Call Code"),
+	EF_TRANSP_N(0x6F50, "EF.CBMIR", F_OPTIONAL,
+		"Cell broadcast message identifier range selection"),
+	EF_TRANSP_N(0x6F73, "EF.PSLOCI", 0,
+		"Pacet Switched location information"),
+	EF_LIN_FIX_N(0x6F3B, "EF.FDN", F_OPTIONAL,
+		"Fixed dialling numbers"),
+	EF_LIN_FIX_N(0x6F3C, "EF.SMS", F_OPTIONAL,
+		"Short messages"),
+	EF_LIN_FIX_N(0x6F40, "EF.MSISDN", F_OPTIONAL,
+		"MSISDN"),
+	EF_LIN_FIX_N(0x6F42, "EF.SMSP", F_OPTIONAL,
+		"Short message service parameters"),
+	EF_TRANSP_N(0x6F43, "EF.SMSS", F_OPTIONAL,
+		"SMS Status"),
+	EF_LIN_FIX_N(0x6F49, "EF.SDN", F_OPTIONAL,
+		"Service Dialling Numbers"),
+	EF_LIN_FIX_N(0x6F4B, "EF.EXT2", F_OPTIONAL,
+		"Extension 2"),
+	EF_LIN_FIX_N(0x6F4C, "EF.EXT3", F_OPTIONAL,
+		"Extension 3"),
+	EF_LIN_FIX_N(0x6F47, "EF.SMSR", F_OPTIONAL,
+		"Short message status reports"),
+	EF_CYCLIC_N(0x6F80, "EF.ICI", F_OPTIONAL,
+		"Incoming Calling Information"),
+	EF_CYCLIC_N(0x6F81, "EF.OCI", F_OPTIONAL,
+		"Outgoing Calling Information"),
+	EF_CYCLIC_N(0x6F82, "EF.ICT", F_OPTIONAL,
+		"Incoming Call Timer"),
+	EF_CYCLIC_N(0x6F83, "EF.OCT", F_OPTIONAL,
+		"Outgoing Call Timer"),
+	EF_LIN_FIX_N(0x6F4E, "EF.EXT5", F_OPTIONAL,
+		"Extension 5"),
+	EF_LIN_FIX_N(0x6F4F, "EF.CCP2", F_OPTIONAL,
+		"Capability Configuration Parameters 2"),
+	EF_TRANSP_N(0x6FB5, "EF.eMLPP", F_OPTIONAL,
+		"enhanced Multi Level Precedence and Pre-emption"),
+	EF_TRANSP_N(0x6FB6, "EF.AAeM", F_OPTIONAL,
+		"Automatic Answer for eMLPP Service"),
+	EF_TRANSP_N(0x6FC3, "EF.Hiddenkey", F_OPTIONAL,
+		"Key for hidden phone book entries"),
+	EF_LIN_FIX_N(0x6F4D, "EF.BDN", F_OPTIONAL,
+		"Barred Dialling Numbers"),
+	EF_LIN_FIX_N(0x6F4E, "EF.EXT4", F_OPTIONAL,
+		"Extension 4"),
+	EF_LIN_FIX_N(0x6F58, "EF.CMI", F_OPTIONAL,
+		"Comparison Method Information"),
+	EF_TRANSP_N(0x6F56, "EF.EST", F_OPTIONAL,
+		"Enhanced Services Table"),
+	EF_TRANSP_N(0x6F57, "EF.ACL", F_OPTIONAL,
+		"Access Point Name Control List"),
+	EF_TRANSP_N(0x6F2C, "EF.DCK", F_OPTIONAL,
+		"Depersonalisation Control Keys"),
+	EF_TRANSP_N(0x6F32, "EF.CNL", F_OPTIONAL,
+		"Co-operative Network List"),
+	EF_TRANSP_N(0x6F5B, "EF.START-HFN", 0,
+		"Initialisation values for Hyperframe number"),
+	EF_TRANSP_N(0x6F5C, "EF.THRESHOLD", 0,
+		"Maximum value of START"),
+	EF_TRANSP_N(0x6F61, "EF.OPLMNwAcT", F_OPTIONAL,
+		"Operator controlled PLMN Selector with Access Technology"),
+	EF_TRANSP_N(0x6F62, "EF.HPLMNwAcT", F_OPTIONAL,
+		"HPLMN Selector with Access Technology"),
+	EF_LIN_FIX_N(0x6F06, "EF.ARR", 0,
+		"Access Rule Reference"),
+	EF_TRANSP_N(0x6FC4, "EF.NETPAR", 0,
+		"Network Parameters"),
+	EF_LIN_FIX_N(0x6FC5, "EF.PNN", F_OPTIONAL,
+		"PLMN Network Name"),
+	EF_LIN_FIX_N(0x6FC6, "EF.OPL", F_OPTIONAL,
+		"Operator PLMN List"),
+	EF_LIN_FIX_N(0x6FC7, "EF.MBDN", F_OPTIONAL,
+		"Mailbox Dialling Numbers"),
+	EF_LIN_FIX_N(0x6FC8, "EF.EXT6", F_OPTIONAL,
+		"Extension 6"),
+	EF_LIN_FIX_N(0x6FC9, "EF.MBI", F_OPTIONAL,
+		"Mailbox Identifier"),
+	EF_LIN_FIX_N(0x6FCA, "EF.MWIS", F_OPTIONAL,
+		"Message Waiting Indication Status"),
+	EF_LIN_FIX_N(0x6FCB, "EF.CFIS", F_OPTIONAL,
+		"Call Forwarding Indication Status"),
+	EF_LIN_FIX_N(0x6FCC, "EF.EXT7", F_OPTIONAL,
+		"Extension 7"),
+	EF_TRANSP_N(0x6FCD, "EF.SPDI", F_OPTIONAL,
+		"Service Provider Display Information"),
+	EF_LIN_FIX_N(0x6FCE, "EF.MMSN", F_OPTIONAL,
+		"MMS Notification"),
+	EF_LIN_FIX_N(0x6FCF, "EF.EXT8", F_OPTIONAL,
+		"Extension 8"),
+	EF_TRANSP_N(0x6FD0, "EF.MMSICP", F_OPTIONAL,
+		"MMS Issuer Connectivity Parameters"),
+	EF_LIN_FIX_N(0x6FD1, "EF.MMSUP", F_OPTIONAL,
+		"MMS User Preferences"),
+	EF_TRANSP_N(0x6FD2, "EF.MMSUCP", F_OPTIONAL,
+		"MMS User Connectivity Parameters"),
+	EF_LIN_FIX_N(0x6FD3, "EF.NIA", F_OPTIONAL,
+		"Network's Indication of Alerting"),
+	EF_TRANSP_N(0x6FB1, "EF.VGCS", F_OPTIONAL,
+		"Voice Group Call Service"),
+	EF_TRANSP_N(0x6FB2, "EF.VGCSS", F_OPTIONAL,
+		"Voice Group Call Service Status"),
+	EF_TRANSP_N(0x6FB3, "EF.VBS", F_OPTIONAL,
+		"Voice Broadcast Service"),
+	EF_TRANSP_N(0x6FB4, "EF.VBSS", F_OPTIONAL,
+		"Voice Broadcast Service Status"),
+	EF_TRANSP_N(0x6FD4, "EF.VGCSCA", F_OPTIONAL,
+		"Voice Group Call Service Ciphering Algorithm"),
+	EF_TRANSP_N(0x6FD5, "EF.VBSCA", F_OPTIONAL,
+		"Voice Broadcast Service Ciphering Algorithm"),
+	EF_TRANSP_N(0x6FD6, "EF.GBABP", F_OPTIONAL,
+		"GBA Bootstrapping parameters"),
+	EF_LIN_FIX_N(0x6FD7, "EF.MSK", F_OPTIONAL,
+		"MBMS Serviec Key List"),
+	EF_LIN_FIX_N(0x6FD8, "EF.MUK", F_OPTIONAL,
+		"MBMS User Key"),
+	EF_LIN_FIX_N(0x6FDA, "EF.GBANL", F_OPTIONAL,
+		"GBA NAF List"),
+	EF_TRANSP_N(0x6FD9, "EF.EHPLMN", F_OPTIONAL,
+		"Equivalent HPLMN"),
+};
+
+
+
+/* 31.102 Chapter 4.4.1 */
+static const struct osim_file_desc usim_ef_in_solsa[] = {
+	EF_TRANSP_N(0x4F30, "EF.SAI", F_OPTIONAL,
+		"SoLSA Access Indicator"),
+	EF_LIN_FIX_N(0x4F31, "EF.SLL", F_OPTIONAL,
+		"SoLSA LSA List"),
+	/* LSA descriptor files 4Fxx, hard to represent here */
+};
+
+/* Annex E - TS 101 220 */
+static const uint8_t adf_usim_aid[] = { 0xA0, 0x00, 0x00, 0x00, 0x87, 0x10, 0x02 };
+
+struct osim_card_profile *osim_cprof_usim(void *ctx)
+{
+	struct osim_card_profile *cprof;
+	struct osim_file_desc *mf, *gsm, *tc, *uadf;
+
+	cprof = talloc_zero(ctx, struct osim_card_profile);
+	cprof->name = "3GPP USIM";
+	cprof->sws = usim_card_sws;
+
+	mf = alloc_df(cprof, 0x3f00, "MF");
+
+	cprof->mf = mf;
+
+	/* Core UICC Files */
+	add_filedesc(mf, uicc_ef_in_mf, ARRAY_SIZE(uicc_ef_in_mf));
+
+	/* ADF.USIM with its EF siblings */
+	uadf = add_adf_with_ef(mf, adf_usim_aid, sizeof(adf_usim_aid),
+				"ADF.USIM", usim_ef_in_adf_usim,
+				ARRAY_SIZE(usim_ef_in_adf_usim));
+
+	/* DFs under ADF.USIM */
+	add_df_with_ef(uadf, 0x5F3A, "DF.PHONEBOOK", NULL, 0);
+	add_df_with_ef(uadf, 0x5F3B, "DF.GSM-ACCESS", usim_ef_in_df_gsm_access,
+			ARRAY_SIZE(usim_ef_in_df_gsm_access));
+	add_df_with_ef(uadf, 0x5F3C, "DF.MExE", NULL, 0);
+	add_df_with_ef(uadf, 0x5F40, "DF.WLAN", NULL, 0);
+	add_df_with_ef(uadf, 0x5F70, "DF.SoLSA", usim_ef_in_solsa, ARRAY_SIZE(usim_ef_in_solsa));
+
+#if 0
+	/* DF.TELECOM as sub-directory of MF */
+	tc = add_df_with_ef(mf, 0x7F10, "DF.TELECOM", sim_ef_in_telecom,
+			ARRAY_SIZE(sim_ef_in_telecom));
+	add_df_with_ef(tc, 0x5F50, "DF.GRAPHICS", sim_ef_in_graphics,
+			ARRAY_SIZE(sim_ef_in_graphics));
+
+	/* DF.GSM for backwards compatibility */
+	gsm = add_df_with_ef(mf, 0x7F20, "DF.GSM", sim_ef_in_gsm,
+			ARRAY_SIZE(sim_ef_in_gsm));
+	/* FIXME: DF's below DF.GSM  (51.011) */
+#endif
+
+	return cprof;
+}
diff --git a/src/sim/core.c b/src/sim/core.c
new file mode 100644
index 00000000..40a49cf2
--- /dev/null
+++ b/src/sim/core.c
@@ -0,0 +1,172 @@
+#include <stdlib.h>
+#include <stdint.h>
+
+#include <osmocom/core/talloc.h>
+#include <osmocom/sim/sim.h>
+
+static struct osim_decoded_element *
+__element_alloc(void *ctx, const char *name, enum osim_element_type type,
+		enum osim_element_repr repr)
+{
+	struct osim_decoded_element *elem;
+
+	elem = talloc_zero(ctx, struct osim_decoded_element);
+	if (!elem)
+		return NULL;
+	elem->name = name;
+	elem->type = type;
+	elem->representation = repr;
+
+	if (elem->type == ELEM_T_GROUP)
+		INIT_LLIST_HEAD(&elem->u.siblings);
+
+	return elem;
+}
+
+
+struct osim_decoded_element *
+element_alloc(struct osim_decoded_data *dd, const char *name,
+	      enum osim_element_type type, enum osim_element_repr repr)
+{
+	struct osim_decoded_element *elem;
+
+	elem = __element_alloc(dd, name, type, repr);
+	if (!elem)
+		return NULL;
+
+	llist_add_tail(&elem->list, &dd->decoded_elements);
+
+	return elem;
+}
+
+struct osim_decoded_element *
+element_alloc_sub(struct osim_decoded_element *ee, const char *name,
+	      enum osim_element_type type, enum osim_element_repr repr)
+{
+	struct osim_decoded_element *elem;
+
+	elem = __element_alloc(ee, name, type, repr);
+	if (!elem)
+		return NULL;
+
+	llist_add(&elem->list, &ee->u.siblings);
+
+	return elem;
+}
+
+
+void add_filedesc(struct osim_file_desc *root, const struct osim_file_desc *in, int num)
+{
+	int i;
+
+	for (i = 0; i < num; i++) {
+		struct osim_file_desc *ofd = talloc_memdup(root, &in[i], sizeof(*in));
+		llist_add_tail(&ofd->list, &root->child_list);
+	}
+}
+
+struct osim_file_desc *alloc_df(void *ctx, uint16_t fid, const char *name)
+{
+	struct osim_file_desc *mf;
+
+	mf = talloc_zero(ctx, struct osim_file_desc);
+	mf->type = TYPE_DF;
+	mf->fid = fid;
+	mf->short_name = name;
+	INIT_LLIST_HEAD(&mf->child_list);
+
+	return mf;
+}
+
+struct osim_file_desc *
+add_df_with_ef(struct osim_file_desc *parent,
+		uint16_t fid, const char *name,
+		const struct osim_file_desc *in, int num)
+{
+	struct osim_file_desc *df;
+
+	df = alloc_df(parent, fid, name);
+	df->parent = parent;
+	llist_add_tail(&df->list, &parent->child_list);
+	add_filedesc(df, in, num);
+
+	return df;
+}
+
+struct os