pespin has uploaded this change for review.
layer23: subscriber: Split gsm_subscr_generate_kc() internally per-backend
Change-Id: I88365d23773a4bdc50a51807c775b3caff0bd425
---
M src/host/layer23/include/osmocom/bb/common/subscriber.h
M src/host/layer23/src/common/subscriber.c
2 files changed, 85 insertions(+), 45 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/54/32754/1
diff --git a/src/host/layer23/include/osmocom/bb/common/subscriber.h b/src/host/layer23/include/osmocom/bb/common/subscriber.h
index 8119103..ac894e5 100644
--- a/src/host/layer23/include/osmocom/bb/common/subscriber.h
+++ b/src/host/layer23/include/osmocom/bb/common/subscriber.h
@@ -1,6 +1,8 @@
#ifndef _SUBSCRIBER_H
#define _SUBSCRIBER_H
+#include <stdbool.h>
+
#include <osmocom/core/utils.h>
#include <osmocom/gsm/protocol/gsm_23_003.h>
@@ -106,8 +108,8 @@
void gsm_subscr_sim_pin(struct osmocom_ms *ms, char *pin1, char *pin2,
int8_t mode);
int gsm_subscr_write_loci(struct osmocom_ms *ms);
-int gsm_subscr_generate_kc(struct osmocom_ms *ms, uint8_t key_seq,
- uint8_t *rand, uint8_t no_sim);
+int gsm_subscr_generate_kc(struct osmocom_ms *ms, uint8_t key_seq, const uint8_t *rand,
+ bool no_sim);
void new_sim_ustate(struct gsm_subscriber *subscr, int state);
int gsm_subscr_del_forbidden_plmn(struct gsm_subscriber *subscr, uint16_t mcc,
uint16_t mnc);
diff --git a/src/host/layer23/src/common/subscriber.c b/src/host/layer23/src/common/subscriber.c
index b623742..08559aa 100644
--- a/src/host/layer23/src/common/subscriber.c
+++ b/src/host/layer23/src/common/subscriber.c
@@ -51,6 +51,11 @@
static int gsm_subscr_remove_sapcard(struct osmocom_ms *ms);
+static int gsm_subscr_generate_kc_simcard(struct osmocom_ms *ms, uint8_t key_seq,
+ const uint8_t *rand, uint8_t no_sim);
+static int gsm_subscr_generate_kc_testcard(struct osmocom_ms *ms, uint8_t key_seq,
+ const uint8_t *rand, uint8_t no_sim);
+
static void subscr_sim_query_cb(struct osmocom_ms *ms, struct msgb *msg);
static void subscr_sim_update_cb(struct osmocom_ms *ms, struct msgb *msg);
static void subscr_sim_key_cb(struct osmocom_ms *ms, struct msgb *msg);
@@ -214,6 +219,40 @@
subscr->ustate = state;
}
+int gsm_subscr_generate_kc(struct osmocom_ms *ms, uint8_t key_seq, const uint8_t *rand,
+ bool no_sim)
+{
+ struct gsm_subscriber *subscr = &ms->subscr;
+ struct osmobb_l23_subscr_sim_auth_resp_sig_data sd;
+ int rc;
+
+ if (no_sim || subscr->sim_type == GSM_SIM_TYPE_NONE || !subscr->sim_valid) {
+ LOGP(DMM, LOGL_INFO, "Sending dummy authentication response\n");
+ sd.ms = ms;
+ sd.sres[0] = 0x12;
+ sd.sres[1] = 0x34;
+ sd.sres[2] = 0x56;
+ sd.sres[3] = 0x78;
+ osmo_signal_dispatch(SS_L23_SUBSCR, S_L23_SUBSCR_SIM_AUTH_RESP, &sd);
+ return 0;
+ }
+
+ switch (subscr->sim_type) {
+ case GSM_SIM_TYPE_TEST:
+ rc = gsm_subscr_generate_kc_testcard(ms, key_seq, rand, no_sim);
+ break;
+ case GSM_SIM_TYPE_L1PHY:
+ case GSM_SIM_TYPE_SAP:
+ /* trigger sim card reader process */
+ rc = gsm_subscr_generate_kc_simcard(ms, key_seq, rand, no_sim);
+ break;
+ default:
+ OSMO_ASSERT(0);
+ }
+
+ return rc;
+}
+
/*
* test card
*/
@@ -270,6 +309,37 @@
return 0;
}
+static int gsm_subscr_generate_kc_testcard(struct osmocom_ms *ms, uint8_t key_seq,
+ const uint8_t *rand, uint8_t no_sim)
+{
+ struct gsm_subscriber *subscr = &ms->subscr;
+ struct osmobb_l23_subscr_sim_auth_resp_sig_data sd;
+
+ struct gsm_settings *set = &ms->settings;
+ static struct osmo_sub_auth_data auth = {
+ .type = OSMO_AUTH_TYPE_GSM
+ };
+ struct osmo_auth_vector _vec;
+ struct osmo_auth_vector *vec = &_vec;
+
+ auth.algo = set->test_sim.ki_type;
+ memcpy(auth.u.gsm.ki, set->test_sim.ki, sizeof(auth.u.gsm.ki));
+ int ret = osmo_auth_gen_vec(vec, &auth, rand);
+ if (ret < 0)
+ return ret;
+
+ /* store sequence */
+ subscr->key_seq = key_seq;
+ memcpy(subscr->key, vec->kc, 8);
+
+ LOGP(DMM, LOGL_INFO, "Sending authentication response\n");
+ sd.ms = ms;
+ memcpy(sd.sres, vec->sres, 4);
+ osmo_signal_dispatch(SS_L23_SUBSCR, S_L23_SUBSCR_SIM_AUTH_RESP, &sd);
+
+ return 0;
+}
+
/*
* sim card
*/
@@ -933,53 +1003,12 @@
msgb_free(msg);
}
-int gsm_subscr_generate_kc(struct osmocom_ms *ms, uint8_t key_seq,
- uint8_t *rand, uint8_t no_sim)
+static int gsm_subscr_generate_kc_simcard(struct osmocom_ms *ms, uint8_t key_seq,
+ const uint8_t *rand, uint8_t no_sim)
{
struct gsm_subscriber *subscr = &ms->subscr;
struct msgb *nmsg;
struct sim_hdr *nsh;
- struct osmobb_l23_subscr_sim_auth_resp_sig_data sd;
-
- /* not a SIM */
- if ((subscr->sim_type != GSM_SIM_TYPE_TEST && !GSM_SIM_IS_READER(subscr->sim_type))
- || !subscr->sim_valid || no_sim) {
- LOGP(DMM, LOGL_INFO, "Sending dummy authentication response\n");
- sd.ms = ms;
- sd.sres[0] = 0x12;
- sd.sres[1] = 0x34;
- sd.sres[2] = 0x56;
- sd.sres[3] = 0x78;
- osmo_signal_dispatch(SS_L23_SUBSCR, S_L23_SUBSCR_SIM_AUTH_RESP, &sd);
- return 0;
- }
-
- /* test SIM */
- if (subscr->sim_type == GSM_SIM_TYPE_TEST) {
- struct gsm_settings *set = &ms->settings;
- static struct osmo_sub_auth_data auth = {
- .type = OSMO_AUTH_TYPE_GSM
- };
- struct osmo_auth_vector _vec;
- struct osmo_auth_vector *vec = &_vec;
-
- auth.algo = set->test_sim.ki_type;
- memcpy(auth.u.gsm.ki, set->test_sim.ki, sizeof(auth.u.gsm.ki));
- int ret = osmo_auth_gen_vec(vec, &auth, rand);
- if (ret < 0)
- return ret;
-
- /* store sequence */
- subscr->key_seq = key_seq;
- memcpy(subscr->key, vec->kc, 8);
-
- LOGP(DMM, LOGL_INFO, "Sending authentication response\n");
- sd.ms = ms;
- memcpy(sd.sres, vec->sres, 4);
- osmo_signal_dispatch(SS_L23_SUBSCR, S_L23_SUBSCR_SIM_AUTH_RESP, &sd);
-
- return 0;
- }
LOGP(DMM, LOGL_INFO, "Generating KEY at SIM\n");
To view, visit change 32754. To unsubscribe, or for help writing mail filters, visit settings.