5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix usim initialization if neither op nor opc are given

Browse Source
master
Andre Puschmann 6 years ago
parent 2f0020b7ca
commit e3387ea0b7
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File

21
srsue/src/upper/usim.cc
Unescape Escape View File

@ -39,7 +39,11 @@ int usim::init(usim_args_t *args, srslte::log *usim_log_)
const char *imsi_c = args->imsi.c_str(); const char *imsi_c = args->imsi.c_str();
const char *imei_c = args->imei.c_str(); const char *imei_c = args->imei.c_str();
uint32_t i;
auth_algo = auth_algo_milenage;
if ("xor" == args->algo) {
auth_algo = auth_algo_xor;
}
if(32 == args->k.length()) { if(32 == args->k.length()) {
str_to_hex(args->k, k); str_to_hex(args->k, k);
@ -48,6 +52,7 @@ int usim::init(usim_args_t *args, srslte::log *usim_log_)
usim_log->console("Invalid length for K: %zu should be %d\n", args->k.length(), 32); usim_log->console("Invalid length for K: %zu should be %d\n", args->k.length(), 32);
} }
if (auth_algo == auth_algo_milenage) {
if (args->using_op) { if (args->using_op) {
if (32 == args->op.length()) { if (32 == args->op.length()) {
str_to_hex(args->op, op); str_to_hex(args->op, op);
@ -56,8 +61,7 @@ int usim::init(usim_args_t *args, srslte::log *usim_log_)
usim_log->error("Invalid length for OP: %zu should be %d\n", args->op.length(), 32); usim_log->error("Invalid length for OP: %zu should be %d\n", args->op.length(), 32);
usim_log->console("Invalid length for OP: %zu should be %d\n", args->op.length(), 32); usim_log->console("Invalid length for OP: %zu should be %d\n", args->op.length(), 32);
} }
} } else {
else {
if (32 == args->opc.length()) { if (32 == args->opc.length()) {
str_to_hex(args->opc, opc); str_to_hex(args->opc, opc);
} else { } else {
@ -65,11 +69,11 @@ int usim::init(usim_args_t *args, srslte::log *usim_log_)
usim_log->console("Invalid length for OPc: %zu should be %d\n", args->opc.length(), 32); usim_log->console("Invalid length for OPc: %zu should be %d\n", args->opc.length(), 32);
} }
} }
}
if(15 == args->imsi.length()) { if(15 == args->imsi.length()) {
imsi = 0; imsi = 0;
for(i=0; i<15; i++) for (int i = 0; i < 15; i++) {
{
imsi *= 10; imsi *= 10;
imsi += imsi_c[i] - '0'; imsi += imsi_c[i] - '0';
} }
@ -80,8 +84,7 @@ int usim::init(usim_args_t *args, srslte::log *usim_log_)
if(15 == args->imei.length()) { if(15 == args->imei.length()) {
imei = 0; imei = 0;
for(i=0; i<15; i++) for (int i = 0; i < 15; i++) {
{
imei *= 10; imei *= 10;
imei += imei_c[i] - '0'; imei += imei_c[i] - '0';
} }
@ -90,10 +93,6 @@ int usim::init(usim_args_t *args, srslte::log *usim_log_)
usim_log->console("Invalid length for IMEI: %zu should be %d\n", args->imei.length(), 15); usim_log->console("Invalid length for IMEI: %zu should be %d\n", args->imei.length(), 15);
} }
auth_algo = auth_algo_milenage;
if("xor" == args->algo) {
auth_algo = auth_algo_xor;
}
initiated = true; initiated = true;
return SRSLTE_SUCCESS; return SRSLTE_SUCCESS;

Write Preview
Loading…
Cancel
Save