diff mbox series

[4/4] qmi: sim: implement change_passwd(ChangePin method)

Message ID 1732352735-31944-5-git-send-email-ivo.g.dimitrov.75@gmail.com (mailing list archive)
State Under Review
Headers show
Series qmi: implement missing pin functions | expand

Commit Message

Ivaylo Dimitrov Nov. 23, 2024, 9:05 a.m. UTC 
---
 drivers/qmimodem/sim.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++
 drivers/qmimodem/uim.h |  1 +
 2 files changed, 77 insertions(+)

Comments

Denis Kenzior Nov. 23, 2024, 4:29 p.m. UTC | #1 
Hi Ivo,

On 11/23/24 3:05 AM, Ivaylo Dimitrov wrote:
> ---
>   drivers/qmimodem/sim.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++
>   drivers/qmimodem/uim.h |  1 +
>   2 files changed, 77 insertions(+)
> 

<snip>

>   
> +static void qmi_change_passwd(struct ofono_sim *sim,
> +				enum ofono_sim_password_type passwd_type,
> +				const char *old_pwd, const char *new_pwd,
> +				ofono_sim_lock_unlock_cb_t cb, void *user_data)
> +{
> +	struct sim_data *data = ofono_sim_get_data(sim);
> +	struct cb_data *cbd = cb_data_new(cb, user_data);
> +	int old_pwd_len;
> +	int new_pwd_len;

I changed these to uint8_t since strlen returns a 'size_t'

<snip>

> +	switch (passwd_type) {
> +	case OFONO_SIM_PASSWORD_SIM_PIN:
> +		pin_id = 0x01;
> +		break;
> +	case OFONO_SIM_PASSWORD_SIM_PIN2:
> +		pin_id = 0x02;
> +		break;
> +	default:
> +		CALLBACK_WITH_CME_ERROR(cb, 4, cbd->data);

Added l_free(cbd) here

> +		return;
> +	}
> +
> +	old_pwd_len = strlen(old_pwd);
> +	new_pwd_len = strlen(new_pwd);
> +
> +	/* info */
> +	info1_len = sizeof(*info1) + old_pwd_len;
> +	info2_len = sizeof(*info2) + new_pwd_len;
> +	info_len = info1_len + info2_len;
> +
> +	info1 = alloca(info_len);
> +	info1->id = pin_id;
> +	info1->length = (uint8_t) old_pwd_len;

Dropped the cast

> +	memcpy(info1->pin, old_pwd, old_pwd_len);
> +
> +	info2 = (void *)&info1->pin[old_pwd_len];
> +	info2->length = (uint8_t) new_pwd_len;

Ditto

> +	memcpy(info2->pin, new_pwd, new_pwd_len);
> +
> +	param = qmi_param_new();
> +	qmi_param_append(param, QMI_UIM_PARAM_MESSAGE_INFO, info_len, info1);
> +

Applied.

Regards,
-Denis
diff mbox series

Patch

diff --git a/drivers/qmimodem/sim.c b/drivers/qmimodem/sim.c
index c980203..06ff86d 100644
--- a/drivers/qmimodem/sim.c
+++ b/drivers/qmimodem/sim.c
@@ -883,6 +883,81 @@  static void qmi_lock(struct ofono_sim *sim,
 	l_free(cbd);
 }
 
+static void qmi_change_passwd(struct ofono_sim *sim,
+				enum ofono_sim_password_type passwd_type,
+				const char *old_pwd, const char *new_pwd,
+				ofono_sim_lock_unlock_cb_t cb, void *user_data)
+{
+	struct sim_data *data = ofono_sim_get_data(sim);
+	struct cb_data *cbd = cb_data_new(cb, user_data);
+	int old_pwd_len;
+	int new_pwd_len;
+	uint16_t info_len;
+	uint16_t info1_len;
+	uint16_t info2_len;
+	uint8_t pin_id;
+	struct qmi_param *param;
+	struct qmi_uim_param_session_info session;
+	struct {
+		uint8_t id;
+		uint8_t length;
+		uint8_t pin[0];
+	} __attribute__((__packed__)) *info1;
+	struct {
+		uint8_t length;
+		uint8_t pin[0];
+	} __attribute__((__packed__)) *info2;
+
+	DBG("");
+
+	switch (passwd_type) {
+	case OFONO_SIM_PASSWORD_SIM_PIN:
+		pin_id = 0x01;
+		break;
+	case OFONO_SIM_PASSWORD_SIM_PIN2:
+		pin_id = 0x02;
+		break;
+	default:
+		CALLBACK_WITH_CME_ERROR(cb, 4, cbd->data);
+		return;
+	}
+
+	old_pwd_len = strlen(old_pwd);
+	new_pwd_len = strlen(new_pwd);
+
+	/* info */
+	info1_len = sizeof(*info1) + old_pwd_len;
+	info2_len = sizeof(*info2) + new_pwd_len;
+	info_len = info1_len + info2_len;
+
+	info1 = alloca(info_len);
+	info1->id = pin_id;
+	info1->length = (uint8_t) old_pwd_len;
+	memcpy(info1->pin, old_pwd, old_pwd_len);
+
+	info2 = (void *)&info1->pin[old_pwd_len];
+	info2->length = (uint8_t) new_pwd_len;
+	memcpy(info2->pin, new_pwd, new_pwd_len);
+
+	param = qmi_param_new();
+	qmi_param_append(param, QMI_UIM_PARAM_MESSAGE_INFO, info_len, info1);
+
+	/* session */
+	session.type = QMI_UIM_SESSION_TYPE_CS1;
+	session.aid_length = 0;
+	qmi_param_append(param, QMI_UIM_PARAM_MESSAGE_SESSION_INFO,
+					sizeof(session), &session);
+
+	if (qmi_service_send(data->uim, QMI_UIM_CHANGE_PIN, param,
+					pin_send_cb, cbd, cb_data_unref) > 0)
+		return;
+
+	qmi_param_free(param);
+
+	CALLBACK_WITH_FAILURE(cb, cbd->data);
+	l_free(cbd);
+}
+
 static void get_card_status_cb(struct qmi_result *result, void *user_data)
 {
 	struct ofono_sim *sim = user_data;
@@ -1027,6 +1102,7 @@  static const struct ofono_sim_driver driver = {
 	.send_passwd		= qmi_pin_send,
 	.query_facility_lock	= qmi_query_locked,
 	.lock			= qmi_lock,
+	.change_passwd		= qmi_change_passwd,
 };
 
 OFONO_ATOM_DRIVER_BUILTIN(sim, qmimodem, &driver)
diff --git a/drivers/qmimodem/uim.h b/drivers/qmimodem/uim.h
index 95ba053..f3c4fb0 100644
--- a/drivers/qmimodem/uim.h
+++ b/drivers/qmimodem/uim.h
@@ -13,6 +13,7 @@ 
 
 #define QMI_UIM_ENABLE_PIN		37	/* Set PIN protection */
 #define QMI_UIM_VERIFY_PIN		38	/* Verify PIN */
+#define QMI_UIM_CHANGE_PIN		40	/* Change PIN */
 
 #define QMI_UIM_EVENT_REGISTRATION	46	/* Register for indications */
 #define QMI_UIM_GET_CARD_STATUS		47	/* Get card status */