[PATCH] Accept opaque data in EF_ICCID.

[PATCH] Accept opaque data in EF_ICCID.

[Pekka Pessi]

[-- Attachment #1: Type: text/plain, Size: 974 bytes --]

---
 src/sim.c |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/sim.c b/src/sim.c
index c1c8340..1f4b944 100644
--- a/src/sim.c
+++ b/src/sim.c
@@ -1304,13 +1304,21 @@ static void sim_iccid_read_cb(int ok, int length, int record,
 	struct ofono_sim *sim = userdata;
 	const char *path = __ofono_atom_get_path(sim->atom);
 	DBusConnection *conn = ofono_dbus_get_connection();
-	char iccid[21]; /* ICCID max length is 20 + 1 for NULL */
+	char iccid[21]; /* ICCID max length is 20 + 1 for NUL */
+	int i;
 
 	if (!ok || length < 10)
 		return;
 
-	extract_bcd_number(data, length, iccid);
-	iccid[20] = '\0';
+	for (i = 0; i < 10; i++) {
+		unsigned char b = data[i];
+		sprintf(iccid + 2 * i, "%x%x", b & 0xf, b >> 4);
+	}
+
+	for (i = 20; i > 0 && iccid[i - 1] == 'f'; i--)
+		;
+	iccid[i] = '\0';
+
 	sim->iccid = g_strdup(iccid);
 
 	ofono_dbus_signal_property_changed(conn, path,
-- 
1.6.3.3

Re: [PATCH] Accept opaque data in EF_ICCID.

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 524 bytes --]

Hi Pekka,

> ---
>  src/sim.c |   14 +++++++++++---
>  1 files changed, 11 insertions(+), 3 deletions(-)

So I looked at the behavior of a few smartphones and they use ICCID as a BCD 
format, not opaque.  This is specified in the 2G and 3G version of the 
standards going back to 11.11.

I'm now leaning towards keeping the present behavior unless there are some 
good arguments for why we want this to be opaque.  Either way we don't satisfy 
someone and I'd rather be standards compliant.

Regards,
-Denis