Merge lp:~phablet-team/phablet-extras/ofono-sim-pin-support into lp:phablet-extras/ofono

[Tony Espy]

[rilmodem] Add SIM PIN/PUK support.

This merge adds SIM PIN/PUK support. It's based on code from Jolla that's been re-factored due to the fact that they're working on a older version of our code, and to remove some of the changes they made which were questionable.

https://github.com/nemomobile-packages/ofono/tree/master/ofono

Testing was performed on an un-flipped maguro, using the 20130629 build.

I tested an unlocked SIM, and only verified that I was able to make voice calls.

I tested a locked SIM. I manually started ofono. Before unlocked, the ofono DBus interfaces are restricted to VoiceCallManager and SimManager. I manually entered a pin via dbus-send:

I resorted to dbus-send, as I couldn't get the python enter-pin test script to run, but this was because it took me awhile to figure out that the 'pin_type' argument was the same as reported by the property ( eg. "pin" ). Here's the command I used:

# dbus-send --print-reply --system --dest=org.ofono /ril_0 org.ofono.SimManager.EnterPin string:"pin" string:"2112"

After entering the PIN, I verified that the rest of the modem initialization occurs, and I was able to make a phone call.

NOTE -- I did some minor cleanup of the branch before submitting, so this code definitely needs to be fully re-tested on maguro. It also needs to be tested on mako.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:47
http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-ci/49/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-saucy-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-saucy-armhf-ci/24/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-ofono-ci/49/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

435 + if (ril_util_parse_sim_status(sd->ril, message, &status, apps)) {
436 +
437 + if (status.num_apps) {

As you only cares about status.num_apps, you could check both at the same line (with &&), and that will save you one indentation level.

review: Needs Fixing

[Ricardo Salveti (rsalveti)]

521 +static void ril_query_passwd_state(struct ofono_sim *sim,
522 + ofono_sim_passwd_cb_t cb, void *data)
523 +{
524 + struct sim_data *sd = ofono_sim_get_data(sim);
525 +
526 + DBG("passwd_state %u", sd->passwd_state);
527 + CALLBACK_WITH_SUCCESS(cb, sd->passwd_state, data);
528 +}

You also might want to handle the case which the passwd_state is invalid, check how this is done with isi and qmimodem.

review: Needs Fixing

[lp:~phablet-team/phablet-extras/ofono-sim-pin-support]

48. By Tony Espy on 2013-07-08

[rilmodem] Minor re-factoring of PIN code.

49. By Tony Espy on 2013-07-08

Releasing 1.12phablet8

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:49
http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-ci/50/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-saucy-armhf-ci/25/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-ofono-ci/50/rebuild

review: Needs Fixing (continuous-integration)

[lp:~phablet-team/phablet-extras/ofono-sim-pin-support]

50. By Tony Espy on 2013-07-08

[rilmodem] Fix compile error.

[Tony Espy (awe)]

I re-factored sim_status_cb() and fixed the line length problem which still existed even after combining the "if" statements per the initial review comment.

I also fixed ril_query_passwd_state() to use CALLBACK_WITH_FAILURE if the passwd_state is invalid.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:50
http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-ci/52/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-saucy-armhf-ci/27/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-ofono-ci/52/rebuild

review: Needs Fixing (continuous-integration)

[lp:~phablet-team/phablet-extras/ofono-sim-pin-support]

51. By Tony Espy on 2013-07-08

[ril] Fix compile error.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:51
http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-ci/53/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-saucy-armhf-ci/28
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-saucy-armhf-ci/28/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-ofono-ci/53/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

750 + g_ril_append_print_buf(sd->ril, "(puk=%s,pin=%s,aid=%s)",
751 + old, new,
752 + sd->aid_str);

The debug is wrong here, it should be old=%s,new=%d instead.

Also, there's a memory corruption when copying the aid_str string to sd, as you basically just assign the pointer (line 435), instead of copying the value (the corruption happens once ril_util_free_sim_apps is called). Same happens with app_str.

With such fix in place I'm able to lock/unlock my sim card.

review: Needs Fixing

[lp:~phablet-team/phablet-extras/ofono-sim-pin-support]

52. By Tony Espy on 2013-07-09

[rildmodem] Fix SIM logic to make copies of aid/app strings.

[Tony Espy (awe)]

Both issues fixed, and pushed... Thanks!

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:52
http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-ci/54/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-saucy-armhf-ci/29
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-saucy-armhf-ci/29/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-ofono-ci/54/rebuild

review: Approve (continuous-integration)

[lp:~phablet-team/phablet-extras/ofono-sim-pin-support]

53. By Tony Espy on 2013-07-09

[rilmodem] Re-factor SIM aid/app string code to use g_strdup().

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:53
http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-ci/55/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-saucy-armhf-ci/30
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-saucy-armhf-ci/30/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-ofono-ci/55/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

Good, tested with mako and working as expected. Thanks.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-26 17:24:24 +0000
+++ debian/changelog	2013-07-09 19:18:24 +0000
@@ -1,3 +1,11 @@
+ofono (1.12phablet8) saucy; urgency=low
+
+  * [rilmodem] Added SIM PIN/PUK support.  This is
+    based on code from Jolla:
+    https://github.com/nemomobile-packages/ofono
+
+ -- Tony Espy <[e-mail]>  Mon, 08 Jul 2013 13:08:32 -0400
+
 ofono (1.12phablet7) saucy; urgency=low
 
   [ Tony Espy ]
 
=== modified file 'drivers/rilmodem/rilutil.c'
--- drivers/rilmodem/rilutil.c	2013-06-14 16:11:01 +0000
+++ drivers/rilmodem/rilutil.c	2013-07-09 19:18:24 +0000
@@ -394,24 +394,17 @@
 
 gboolean ril_util_parse_sim_status(GRil *gril,
 					struct ril_msg *message,
-					struct sim_app *app)
+					struct sim_status *status,
+					struct sim_app **apps)
 {
 	struct parcel rilp;
 	gboolean result = FALSE;
-	char *aid_str = NULL;
-	char *app_str = NULL;
-	int i, card_state, num_apps, pin_state, gsm_umts_index, ims_index;
-	int app_state, app_type, pin_replaced, pin1_state, pin2_state, perso_substate;
+	int i;
 
 	g_ril_append_print_buf(gril, "[%04d]< %s",
 			message->serial_no,
 			ril_request_id_to_string(message->req));
 
-	if (app) {
-		app->app_type = RIL_APPTYPE_UNKNOWN;
-		app->app_id = NULL;
-	}
-
 	ril_util_init_parcel(message, &rilp);
 
 	/*
@@ -420,24 +413,33 @@
 	 * This could be a runtime assertion, disconnect, drop/ignore
 	 * the message, ...
 	 *
-	 * Currently if the message is smaller than expected, our parcel
-	 * code happily walks off the end of the buffer and segfaults.
-	 *
 	 * 20 is the min length of RIL_CardStatus_v6 as the AppState
 	 * array can be 0-length.
 	 */
 	if (message->buf_len < 20) {
 		ofono_error("Size of SIM_STATUS reply too small: %d bytes",
 				message->buf_len);
-		goto done;
+		return FALSE;
 	}
 
-	card_state = parcel_r_int32(&rilp);
-	pin_state = parcel_r_int32(&rilp);
-	gsm_umts_index = parcel_r_int32(&rilp);
-	parcel_r_int32(&rilp); /* ignore: cdma_subscription_app_index */
-	ims_index = parcel_r_int32(&rilp);
-	num_apps = parcel_r_int32(&rilp);
+	status->card_state = parcel_r_int32(&rilp);
+
+	/*
+	 * NOTE:
+	 *
+	 * The global pin_status is used for multi-application
+	 * UICC cards.  For example, there are SIM cards that
+	 * can be used in both GSM and CDMA phones.  Instead
+	 * of managed PINs for both applications, a global PIN
+	 * is set instead.  It's not clear at this point if
+	 * such SIM cards are supported by ofono or RILD.
+	 */
+
+	status->pin_state = parcel_r_int32(&rilp);
+	status->gsm_umts_index = parcel_r_int32(&rilp);
+	status->cdma_index = parcel_r_int32(&rilp);
+	status->ims_index = parcel_r_int32(&rilp);
+	status->num_apps = parcel_r_int32(&rilp);
 
 	/* TODO:
 	 * How do we handle long (>80 chars) ril_append_print_buf strings?
@@ -446,60 +448,68 @@
 	 */
 	g_ril_append_print_buf(gril,
 				"(card_state=%d,universal_pin_state=%d,gsm_umts_index=%d,cdma_index=%d,ims_index=%d, ",
-				card_state,
-				pin_state,
-				gsm_umts_index,
-				-1,
-				ims_index);
-
-	for (i = 0; i < num_apps; i++) {
-		app_type = parcel_r_int32(&rilp);
-		app_state = parcel_r_int32(&rilp);
-		perso_substate = parcel_r_int32(&rilp);
+				status->card_state,
+				status->pin_state,
+				status->gsm_umts_index,
+				status->cdma_index,
+				status->ims_index);
+
+	if (status->card_state == RIL_CARDSTATE_PRESENT)
+		result = TRUE;
+	else
+		goto done;
+
+	if (status->num_apps > MAX_UICC_APPS) {
+		ofono_error("SIM error; too many apps: %d", status->num_apps);
+		status->num_apps = MAX_UICC_APPS;
+	}
+
+	for (i = 0; i < status->num_apps; i++) {
+		DBG("processing app[%d]", i);
+		apps[i] = g_try_new0(struct sim_app, 1);
+		if (apps[i] == NULL) {
+			ofono_error("Can't allocate app_data");
+			goto error;
+		}
+
+		apps[i]->app_type = parcel_r_int32(&rilp);
+		apps[i]->app_state = parcel_r_int32(&rilp);
+		apps[i]->perso_substate = parcel_r_int32(&rilp);
 
 		/* TODO: we need a way to instruct parcel to skip
 		 * a string, without allocating memory...
 		 */
-		aid_str = parcel_r_string(&rilp); /* application ID (AID) */
-		app_str = parcel_r_string(&rilp); /* application label */
+		apps[i]->aid_str = parcel_r_string(&rilp); /* application ID (AID) */
+		apps[i]->app_str = parcel_r_string(&rilp); /* application label */
 
-		pin_replaced = parcel_r_int32(&rilp);
-		pin1_state = parcel_r_int32(&rilp);
-		pin2_state = parcel_r_int32(&rilp);
+		apps[i]->pin_replaced = parcel_r_int32(&rilp);
+		apps[i]->pin1_state = parcel_r_int32(&rilp);
+		apps[i]->pin2_state = parcel_r_int32(&rilp);
 
 		g_ril_append_print_buf(gril,
 					"%s[app_type=%d,app_state=%d,perso_substate=%d,aid_ptr=%s,app_label_ptr=%s,pin1_replaced=%d,pin1=%d,pin2=%d],",
 					print_buf,
-					app_type,
-					app_state,
-					perso_substate,
-					aid_str,
-					app_str,
-					pin_replaced,
-					pin1_state,
-					pin2_state);
-
-		/* FIXME: CDMA/IMS -- see comment @ top-of-source. */
-		if (i == gsm_umts_index && app) {
-			if (aid_str) {
-				app->app_id = aid_str;
-				DBG("setting app_id (AID) to: %s", aid_str);
-			}
-
-			app->app_type = app_type;
-		} else
-			g_free(aid_str);
-
-		g_free(app_str);
+					apps[i]->app_type,
+					apps[i]->app_state,
+					apps[i]->perso_substate,
+					apps[i]->aid_str,
+					apps[i]->app_str,
+					apps[i]->pin_replaced,
+					apps[i]->pin1_state,
+					apps[i]->pin2_state);
 	}
 
-	g_ril_append_print_buf(gril, "%s}", print_buf);
-	g_ril_print_response(gril, message);
-
-	if (card_state == RIL_CARDSTATE_PRESENT)
-		result = TRUE;
 done:
+	g_ril_append_print_buf(gril, "%s}", print_buf);
+	g_ril_print_response(gril, message);
+
 	return result;
+
+error:
+	if (apps)
+		ril_util_free_sim_apps(apps, status->num_apps);
+
+	return FALSE;
 }
 
 gboolean ril_util_parse_reg(GRil *gril,
@@ -714,3 +724,13 @@
 
 	return -1;
 }
+
+void ril_util_free_sim_apps(struct sim_app **apps, guint num_apps) {
+	guint i;
+
+	for (i = 0; i < num_apps; i++) {
+		g_free(apps[i]->aid_str);
+		g_free(apps[i]->app_str);
+		g_free(apps[i]);
+	}
+}
 
=== modified file 'drivers/rilmodem/rilutil.h'
--- drivers/rilmodem/rilutil.h	2013-06-13 13:31:46 +0000
+++ drivers/rilmodem/rilutil.h	2013-07-09 19:18:24 +0000
@@ -62,21 +62,48 @@
 	RIL_UTIL_CHARSET_8859_H =	0x10000,
 };
 
+/* TODO: consider moving these to ril_constants.h */
+enum app_state {
+	APPSTATE_UNKNOWN,
+	APPSTATE_DETECTED,
+	APPSTATE_PIN,
+	APPSTATE_PUK,
+	APPSTATE_SUBSCRIPTION_PERSO,
+	APPSTATE_READY,
+};
+
 struct data_call {
-    int             status;
-    int             retry;
-    int             cid;
-    int             active;
-    char *          type;
-    char *          ifname;
-    char *          addresses;
-    char *          dnses;
-    char *          gateways;
+    int status;
+    int retry;
+    int cid;
+    int active;
+    char *type;
+    char *ifname;
+    char *addresses;
+    char *dnses;
+    char *gateways;
+};
+
+#define MAX_UICC_APPS 16
+
+struct sim_status {
+	guint card_state;
+	guint pin_state;
+	guint gsm_umts_index;
+	guint cdma_index;
+	guint ims_index;
+	guint num_apps;
 };
 
 struct sim_app {
-	char *app_id;
 	guint app_type;
+	guint app_state;
+	guint perso_substate;
+	char *aid_str;
+	char *app_str;
+	guint pin_replaced;
+	guint pin1_state;
+	guint pin2_state;
 };
 
 typedef void (*ril_util_sim_inserted_cb_t)(gboolean present, void *userdata);
@@ -101,7 +128,9 @@
 char *ril_util_parse_sim_io_rsp(GRil *gril, struct ril_msg *message,
 				int *sw1, int *sw2,
 				int *hex_len);
-gboolean ril_util_parse_sim_status(GRil *gril, struct ril_msg *message, struct sim_app *app);
+gboolean ril_util_parse_sim_status(GRil *gril, struct ril_msg *message,
+					struct sim_status *status,
+					struct sim_app **apps);
 gboolean ril_util_parse_reg(GRil *gril, struct ril_msg *message, int *status,
 				int *lac, int *ci, int *tech, int *max_calls);
 
@@ -109,6 +138,8 @@
 
 gint ril_util_get_signal(GRil *gril, struct ril_msg *message);
 
+void ril_util_free_sim_apps(struct sim_app **apps, guint num_apps);
+
 struct cb_data {
 	void *cb;
 	void *data;
 
=== modified file 'drivers/rilmodem/sim.c'
--- drivers/rilmodem/sim.c	2013-06-14 16:11:01 +0000
+++ drivers/rilmodem/sim.c	2013-07-09 19:18:24 +0000
@@ -35,6 +35,9 @@
 #include <ofono/log.h>
 #include <ofono/modem.h>
 #include <ofono/sim.h>
+
+#include "ofono.h"
+
 #include "simutil.h"
 #include "util.h"
 
@@ -64,6 +67,17 @@
 /* FID/path of SIM/USIM root directory */
 #define ROOTMF "3F00"
 
+/* RIL_Request* parameter counts */
+#define GET_IMSI_NUM_PARAMS 1
+#define ENTER_SIM_PIN_PARAMS 2
+#define SET_FACILITY_LOCK_PARAMS 5
+#define ENTER_SIM_PUK_PARAMS 3
+#define CHANGE_SIM_PIN_PARAMS 3
+
+/* RIL_FACILITY_LOCK parameters */
+#define RIL_FACILITY_UNLOCK "0"
+#define RIL_FACILITY_LOCK "1"
+
 /*
  * TODO: CDMA/IMS
  *
@@ -77,8 +91,12 @@
  */
 struct sim_data {
 	GRil *ril;
-	char *app_id;
+	gchar *aid_str;
 	guint app_type;
+	gchar *app_str;
+	guint app_index;
+	gboolean sim_registered;
+	enum ofono_sim_password_type passwd_state;
 };
 
 static void set_path(struct sim_data *sd, struct parcel *rilp,
@@ -245,7 +263,7 @@
 	parcel_w_int32(&rilp, 15);         /* P3 - max length */
 	parcel_w_string(&rilp, NULL);       /* data; only req'd for writes */
 	parcel_w_string(&rilp, NULL);       /* pin2; only req'd for writes */
-	parcel_w_string(&rilp, sd->app_id); /* AID (Application ID) */
+	parcel_w_string(&rilp, sd->aid_str); /* AID (Application ID) */
 
 	ret = g_ril_send(sd->ril,
 				request,
@@ -256,7 +274,7 @@
 	g_ril_append_print_buf(sd->ril,
 				"%s0,0,15,(null),pin2=(null),aid=%s)",
 				print_buf,
-				sd->app_id);
+				sd->aid_str);
 	g_ril_print_request(sd->ril, ret, RIL_REQUEST_SIM_IO);
 
 	parcel_free(&rilp);
@@ -330,7 +348,7 @@
 	parcel_w_int32(&rilp, length);         /* P3 */
 	parcel_w_string(&rilp, NULL);          /* data; only req'd for writes */
 	parcel_w_string(&rilp, NULL);          /* pin2; only req'd for writes */
-	parcel_w_string(&rilp, sd->app_id);    /* AID (Application ID) */
+	parcel_w_string(&rilp, sd->aid_str);
 
 	ret = g_ril_send(sd->ril,
 				request,
@@ -344,7 +362,7 @@
 				(start >> 8),
 				(start & 0xff),
 				length,
-				sd->app_id);
+				sd->aid_str);
 	g_ril_print_request(sd->ril, ret, request);
 
 	parcel_free(&rilp);
@@ -383,7 +401,7 @@
 	parcel_w_int32(&rilp, length);      /* P3 */
 	parcel_w_string(&rilp, NULL);       /* data; only req'd for writes */
 	parcel_w_string(&rilp, NULL);       /* pin2; only req'd for writes */
-	parcel_w_string(&rilp, sd->app_id); /* AID (Application ID) */
+	parcel_w_string(&rilp, sd->aid_str); /* AID (Application ID) */
 
 	ret = g_ril_send(sd->ril,
 				request,
@@ -397,7 +415,7 @@
 				record,
 				4,
 				length,
-				sd->app_id);
+				sd->aid_str);
 	g_ril_print_request(sd->ril, ret, request);
 
 	parcel_free(&rilp);
@@ -451,13 +469,13 @@
 	cbd->user = sd;
 
 	parcel_init(&rilp);
-	parcel_w_int32(&rilp, 1);            /* Number of params */
-	parcel_w_string(&rilp, sd->app_id);  /* AID (Application ID) */
+	parcel_w_int32(&rilp, GET_IMSI_NUM_PARAMS);
+	parcel_w_string(&rilp, sd->aid_str);
 
 	ret = g_ril_send(sd->ril, request,
 				rilp.data, rilp.size, ril_imsi_cb, cbd, g_free);
 
-	g_ril_append_print_buf(sd->ril, "(%s)", sd->app_id);
+	g_ril_append_print_buf(sd->ril, "(%s)", sd->aid_str);
 	g_ril_print_request(sd->ril, ret, request);
 
 	parcel_free(&rilp);
@@ -468,25 +486,90 @@
 	}
 }
 
+static void configure_active_app(struct sim_data *sd,
+					struct sim_app *app,
+					guint index)
+{
+	size_t aid_size = 0, app_size = 0;
+
+	sd->app_type = app->app_type;
+	sd->aid_str = g_strdup(app->aid_str);
+	sd->app_str = g_strdup(app->app_str);
+	sd->app_index = index;
+
+	DBG("setting aid_str (AID) to: %s", sd->aid_str);
+	switch (app->app_state) {
+	case APPSTATE_PIN:
+		sd->passwd_state = OFONO_SIM_PASSWORD_SIM_PIN;
+		break;
+	case APPSTATE_PUK:
+		sd->passwd_state = OFONO_SIM_PASSWORD_SIM_PUK;
+		break;
+	case APPSTATE_SUBSCRIPTION_PERSO:
+		/* TODO: Check out how to dig out exact
+		 * SIM lock.
+		 */
+		sd->passwd_state = OFONO_SIM_PASSWORD_PHSIM_PIN;
+		break;
+	case APPSTATE_READY:
+		sd->passwd_state = OFONO_SIM_PASSWORD_NONE;
+		break;
+	case APPSTATE_UNKNOWN:
+	case APPSTATE_DETECTED:
+	default:
+		sd->passwd_state = OFONO_SIM_PASSWORD_INVALID;
+		break;
+	}
+}
+
 static void sim_status_cb(struct ril_msg *message, gpointer user_data)
 {
 	struct ofono_sim *sim = user_data;
 	struct sim_data *sd = ofono_sim_get_data(sim);
-	struct sim_app app;
-
-	if (ril_util_parse_sim_status(sd->ril, message, &app)) {
-		if (app.app_id)
-			sd->app_id = app.app_id;
-
-		if (app.app_type != RIL_APPTYPE_UNKNOWN)
-			sd->app_type = app.app_type;
-
-		ofono_sim_register(sim);
+	struct sim_app *apps[MAX_UICC_APPS];
+	struct sim_status status;
+	guint i = 0;
+	guint search_index = -1;
+
+	if (ril_util_parse_sim_status(sd->ril, message,	&status, apps) &&
+		status.num_apps) {
+
+		DBG("num_apps: %d gsm_umts_index: %d", status.num_apps,
+			status.gsm_umts_index);
+
+		/* TODO(CDMA): need some kind of logic to
+		 * set the correct app_index,
+		 */
+		search_index = status.gsm_umts_index;
+
+		for (i = 0; i < status.num_apps; i++) {
+			if (i == search_index &&
+				apps[i]->app_type != RIL_APPTYPE_UNKNOWN) {
+				configure_active_app(sd, apps[i], i);
+				break;
+			}
+		}
+
+		if (sd->sim_registered == FALSE) {
+			ofono_sim_register(sim);
+			sd->sim_registered = TRUE;
+		} else
+			/* TODO: There doesn't seem to be any other
+			 * way to force the core SIM code to
+			 * recheck the PIN.
+			 * Wouldn't __ofono_sim_refresh be
+			 * more appropriate call here??
+			 * __ofono_sim_refresh(sim, NULL, TRUE, TRUE);
+			 */
+			__ofono_sim_recheck_pin(sim);
+
+		ril_util_free_sim_apps(apps, status.num_apps);
 	}
 
 	/* TODO: if no SIM present, handle emergency calling. */
 }
 
+
 static int send_get_sim_status(struct ofono_sim *sim)
 {
 	struct sim_data *sd = ofono_sim_get_data(sim);
@@ -501,13 +584,265 @@
 	return ret;
 }
 
+static void ril_sim_status_changed(struct ril_msg *message, gpointer user_data)
+{
+	struct ofono_sim *sim = (struct ofono_sim *) user_data;
+	struct sim_data *sd = ofono_sim_get_data(sim);
+
+	DBG("");
+
+	g_ril_print_unsol_no_args(sd->ril, message);
+
+	send_get_sim_status(sim);
+}
+
+static void ril_query_passwd_state(struct ofono_sim *sim,
+					ofono_sim_passwd_cb_t cb, void *data)
+{
+	struct sim_data *sd = ofono_sim_get_data(sim);
+	DBG("passwd_state %u", sd->passwd_state);
+
+	if (sd->passwd_state == OFONO_SIM_PASSWORD_INVALID)
+		CALLBACK_WITH_FAILURE(cb, -1, data);
+
+	CALLBACK_WITH_SUCCESS(cb, sd->passwd_state, data);
+}
+
+static void ril_pin_change_state_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_sim_lock_unlock_cb_t cb = cbd->cb;
+	struct sim_data *sd = cbd->user;
+
+	/* There is no reason to ask SIM status until
+	 * unsolicited sim status change indication
+	 * Looks like state does not change before that.
+	 */
+
+	/* TODO: re-bfactor to not use macro for FAILURE; doesn't return error! */
+	if (message->error == RIL_E_SUCCESS) {
+		CALLBACK_WITH_SUCCESS(cb, cbd->data);
+		g_ril_print_response_no_args(sd->ril, message);
+
+	} else
+		CALLBACK_WITH_FAILURE(cb, cbd->data);
+
+}
+
+static void ril_pin_send(struct ofono_sim *sim, const char *passwd,
+				ofono_sim_lock_unlock_cb_t cb, void *data)
+{
+	struct sim_data *sd = ofono_sim_get_data(sim);
+	struct cb_data *cbd = cb_data_new(cb, data);
+	struct parcel rilp;
+	int request = RIL_REQUEST_ENTER_SIM_PIN;
+	int ret;
+
+	cbd->user = sd;
+
+	parcel_init(&rilp);
+
+	parcel_w_int32(&rilp, ENTER_SIM_PIN_PARAMS);
+	parcel_w_string(&rilp, (char *) passwd);
+	parcel_w_string(&rilp, sd->aid_str);
+
+	ret = g_ril_send(sd->ril, request,
+				rilp.data, rilp.size, ril_pin_change_state_cb,
+				cbd, g_free);
+
+	g_ril_append_print_buf(sd->ril, "(%s,aid=%s)", passwd, sd->aid_str);
+	g_ril_print_request(sd->ril, ret, request);
+
+	parcel_free(&rilp);
+
+	if (ret <= 0) {
+		g_free(cbd);
+		CALLBACK_WITH_FAILURE(cb, data);
+	}
+}
+
+static void ril_pin_change_state(struct ofono_sim *sim,
+					enum ofono_sim_password_type passwd_type,
+					int enable, const char *passwd,
+					ofono_sim_lock_unlock_cb_t cb, void *data)
+{
+	struct sim_data *sd = ofono_sim_get_data(sim);
+	struct cb_data *cbd = cb_data_new(cb, data);
+	struct parcel rilp;
+	int request = RIL_REQUEST_SET_FACILITY_LOCK;
+	int ret = 0;
+
+	cbd->user = sd;
+
+	parcel_init(&rilp);
+	parcel_w_int32(&rilp, SET_FACILITY_LOCK_PARAMS);
+
+	/*
+	 * TODO: clean up the use of string literals &
+	 * the multiple g_ril_append_print_buf() calls
+	 * by using a table lookup as does the core sim code
+	 */
+	switch (passwd_type) {
+	case OFONO_SIM_PASSWORD_SIM_PIN:
+		g_ril_append_print_buf(sd->ril, "(SC,");
+		parcel_w_string(&rilp, "SC");
+		break;
+	case OFONO_SIM_PASSWORD_PHSIM_PIN:
+		g_ril_append_print_buf(sd->ril, "(PS,");
+		parcel_w_string(&rilp, "PS");
+		break;
+	case OFONO_SIM_PASSWORD_PHFSIM_PIN:
+		g_ril_append_print_buf(sd->ril, "(PF,");
+		parcel_w_string(&rilp, "PF");
+		break;
+	case OFONO_SIM_PASSWORD_SIM_PIN2:
+		g_ril_append_print_buf(sd->ril, "(P2,");
+		parcel_w_string(&rilp, "P2");
+		break;
+	case OFONO_SIM_PASSWORD_PHNET_PIN:
+		g_ril_append_print_buf(sd->ril, "(PN,");
+		parcel_w_string(&rilp, "PN");
+		break;
+	case OFONO_SIM_PASSWORD_PHNETSUB_PIN:
+		g_ril_append_print_buf(sd->ril, "(PU,");
+		parcel_w_string(&rilp, "PU");
+		break;
+	case OFONO_SIM_PASSWORD_PHSP_PIN:
+		g_ril_append_print_buf(sd->ril, "(PP,");
+		parcel_w_string(&rilp, "PP");
+		break;
+	case OFONO_SIM_PASSWORD_PHCORP_PIN:
+		g_ril_append_print_buf(sd->ril, "(PC,");
+		parcel_w_string(&rilp, "PC");
+		break;
+	default:
+		CALLBACK_WITH_FAILURE(cb, data);
+		return;
+	}
+
+	if (enable)
+		parcel_w_string(&rilp, RIL_FACILITY_LOCK);
+	else
+		parcel_w_string(&rilp, RIL_FACILITY_UNLOCK);
+
+	parcel_w_string(&rilp, (char *) passwd);
+
+	/* TODO: make this a constant... */
+	parcel_w_string(&rilp, "0");		/* class */
+
+	parcel_w_string(&rilp, sd->aid_str);
+
+	ret = g_ril_send(sd->ril, request,
+				rilp.data, rilp.size, ril_pin_change_state_cb,
+				cbd, g_free);
+
+	g_ril_append_print_buf(sd->ril, "%s,%d,%s,0,aid=%s)",
+				print_buf,
+				enable,
+				passwd,
+				sd->aid_str);
+
+	g_ril_print_request(sd->ril, ret, request);
+
+	parcel_free(&rilp);
+
+	if (ret <= 0) {
+		g_free(cbd);
+		CALLBACK_WITH_FAILURE(cb, data);
+	}
+}
+
+static void ril_pin_send_puk(struct ofono_sim *sim,
+				const char *puk, const char *passwd,
+				ofono_sim_lock_unlock_cb_t cb, void *data)
+{
+	struct sim_data *sd = ofono_sim_get_data(sim);
+	struct cb_data *cbd = cb_data_new(cb, data);
+	struct parcel rilp;
+	int request = RIL_REQUEST_ENTER_SIM_PUK;
+	int ret = 0;
+
+	cbd->user = sd;
+
+	parcel_init(&rilp);
+
+	parcel_w_int32(&rilp, ENTER_SIM_PUK_PARAMS);
+	parcel_w_string(&rilp, (char *) puk);
+	parcel_w_string(&rilp, (char *) passwd);
+	parcel_w_string(&rilp, sd->aid_str);
+
+	ret = g_ril_send(sd->ril, request,
+			rilp.data, rilp.size, ril_pin_change_state_cb,
+			cbd, g_free);
+
+	g_ril_append_print_buf(sd->ril, "(puk=%s,pin=%s,aid=%s)",
+				puk, passwd,
+				sd->aid_str);
+
+	g_ril_print_request(sd->ril, ret, request);
+
+	parcel_free(&rilp);
+
+	if (ret <= 0) {
+		g_free(cbd);
+		CALLBACK_WITH_FAILURE(cb, data);
+	}
+}
+
+static void ril_change_passwd(struct ofono_sim *sim,
+				enum ofono_sim_password_type passwd_type,
+				const char *old, const char *new,
+				ofono_sim_lock_unlock_cb_t cb, void *data)
+{
+	struct sim_data *sd = ofono_sim_get_data(sim);
+	struct cb_data *cbd = cb_data_new(cb, data);
+	struct parcel rilp;
+	int request = RIL_REQUEST_CHANGE_SIM_PIN;
+	int ret = 0;
+
+	cbd->user = sd;
+
+	parcel_init(&rilp);
+
+	parcel_w_int32(&rilp, CHANGE_SIM_PIN_PARAMS);
+	parcel_w_string(&rilp, (char *) old);	/* PUK */
+	parcel_w_string(&rilp, (char *) new);	/* PIN */
+	parcel_w_string(&rilp, sd->aid_str);
+
+	if (passwd_type == OFONO_SIM_PASSWORD_SIM_PIN2)
+		request = RIL_REQUEST_CHANGE_SIM_PIN2;
+
+	ret = g_ril_send(sd->ril, request, rilp.data, rilp.size,
+			ril_pin_change_state_cb, cbd, g_free);
+
+	g_ril_append_print_buf(sd->ril, "(old=%s,new=%s,aid=%s)",
+				old, new,
+				sd->aid_str);
+
+	g_ril_print_request(sd->ril, ret, request);
+
+	parcel_free(&rilp);
+
+	if (ret <= 0) {
+		g_free(cbd);
+		CALLBACK_WITH_FAILURE(cb, data);
+	}
+}
+
 static gboolean ril_sim_register(gpointer user)
 {
 	struct ofono_sim *sim = user;
-
-	DBG("");
-
-	send_get_sim_status(sim);
+	struct sim_data *sd = ofono_sim_get_data(sim);
+
+ 	DBG("");
+
+ 	send_get_sim_status(sim);
+
+	g_ril_register(sd->ril, RIL_UNSOL_RESPONSE_SIM_STATUS_CHANGED,
+			(GRilNotifyFunc) ril_sim_status_changed, sim);
+
+	/* TODO: should we also register for RIL_UNSOL_SIM_REFRESH? */
+
 	return FALSE;
 }
 
@@ -519,8 +854,11 @@
 
 	sd = g_new0(struct sim_data, 1);
 	sd->ril = g_ril_clone(ril);
-	sd->app_id = NULL;
+	sd->aid_str = NULL;
+	sd->app_str = NULL;
 	sd->app_type = RIL_APPTYPE_UNKNOWN;
+	sd->passwd_state = OFONO_SIM_PASSWORD_NONE;
+	sd->sim_registered = FALSE;
 
 	ofono_sim_set_data(sim, sd);
 
@@ -559,6 +897,11 @@
 	.read_file_linear	= ril_sim_read_record,
 	.read_file_cyclic	= ril_sim_read_record,
  	.read_imsi		= ril_read_imsi,
+	.query_passwd_state	= ril_query_passwd_state,
+	.send_passwd		= ril_pin_send,
+	.lock			= ril_pin_change_state,
+	.reset_passwd		= ril_pin_send_puk,
+	.change_passwd		= ril_change_passwd,
 /*
  * TODO: Implmenting PIN/PUK support requires defining
  * the following driver methods.
@@ -568,12 +911,7 @@
  * presence of query_passwd_state, and if null, then the
  * function sim_initialize_after_pin() is called.
  *
- *	.query_passwd_state	= ril_pin_query,
  *	.query_pin_retries	= ril_pin_retries_query,
- *	.send_passwd		= ril_pin_send,
- *	.reset_passwd		= ril_pin_send_puk,
- *	.lock			= ril_pin_enable,
- *	.change_passwd		= ril_change_passwd,
  *	.query_locked		= ril_pin_query_enabled,
  *
  * TODO: Implementing SIM write file IO support requires
 
=== modified file 'plugins/ril.c'
--- plugins/ril.c	2013-06-17 17:17:45 +0000
+++ plugins/ril.c	2013-07-09 19:18:24 +0000
@@ -131,6 +131,9 @@
 {
 	struct ofono_modem *modem = user_data;
 	struct ril_data *ril = ofono_modem_get_data(modem);
+	struct sim_status status;
+	struct sim_app *apps[MAX_UICC_APPS];
+	guint i = 0;
 
 	DBG("");
 
@@ -153,12 +156,16 @@
 		else
 			ofono_error("Max retries for GET_SIM_STATUS exceeded!");
 	} else {
+
 		/* Returns TRUE if cardstate == PRESENT */
-		if (ril_util_parse_sim_status(ril->modem, message, NULL)) {
-			DBG("have_sim = TRUE; powering on modem.");
-
-			/* TODO: check PinState=DISABLED, for now just
-			 * set state to valid... */
+		if (ril_util_parse_sim_status(ril->modem, message,
+						&status, apps)) {
+			DBG("have_sim = TRUE; powering on modem; num_apps: %d",
+				status.num_apps);
+
+			if (status.num_apps)
+				ril_util_free_sim_apps(apps, status.num_apps);
+
 			ril->have_sim = TRUE;
 			power_on(modem);
 		} else