cellular-infrastructure
/
osmo-bsc
mirror of https://gerrit.osmocom.org/osmo-bsc
9
0
Fork 0
Code Issues Releases Wiki Activity

auth: Add support for XOR test A3A8 algo (and vty commands) 

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
This commit is contained in:
Sylvain Munaut 2010-06-11 00:19:42 +02:00 committed by Harald Welte
parent c593cf100a
commit e824d9c2a1
3 changed files with 53 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openbsc/include/openbsc/gsm_data.h
View File

@ -211,6 +211,8 @@ struct neigh_meas_proc {
};
#define MAX_A5_KEY_LEN (128/8)
#define A38_XOR_MIN_KEY_LEN 12
#define A38_XOR_MAX_KEY_LEN 16
#define A38_COMP128_KEY_LEN 16
#define RSL_ENC_ALG_A5(x) (x+1)

25
openbsc/src/auth.c
View File

@ -30,6 +30,26 @@
#include <stdlib.h>
static int
_use_xor(struct gsm_auth_info *ainfo, struct gsm_auth_tuple *atuple)
{
int i, l = ainfo->a3a8_ki_len;
if ((l > A38_XOR_MAX_KEY_LEN) || (l < A38_XOR_MIN_KEY_LEN)) {
DEBUGP(DMM, "Invalid XOR key (len=%d) %s",
ainfo->a3a8_ki_len,
hexdump(ainfo->a3a8_ki, ainfo->a3a8_ki_len));
return -1;
}
for (i=0; i<4; i++)
atuple->sres[i] = atuple->rand[i] ^ ainfo->a3a8_ki[i];
for (i=8; i<12; i++)
atuple->kc[i-4] = atuple->rand[i] ^ ainfo->a3a8_ki[i];
return 0;
}
static int
_use_comp128_v1(struct gsm_auth_info *ainfo, struct gsm_auth_tuple *atuple)
{
@ -85,6 +105,11 @@ int auth_get_tuple_for_subscr(struct gsm_auth_tuple *atuple,
case AUTH_ALGO_NONE:
return 0;
case AUTH_ALGO_XOR:
if (_use_xor(&ainfo, atuple))
return 0;
break;
case AUTH_ALGO_COMP128v1:
if (_use_comp128_v1(&ainfo, atuple))
return 0;

39
openbsc/src/vty_interface_layer3.c
View File

@ -442,9 +442,10 @@ DEFUN(ena_subscr_extension,
return CMD_SUCCESS;
}
#define A3A8_ALG_TYPES "(none|comp128v1)"
#define A3A8_ALG_TYPES "(none|xor|comp128v1)"
#define A3A8_ALG_HELP \
"Use No A3A8 algorithm\n" \
"Use XOR algorithm\n" \
"Use COMP128v1 algorithm\n"
DEFUN(ena_subscr_a3a8,
@ -457,9 +458,9 @@ DEFUN(ena_subscr_a3a8,
struct gsm_subscriber *subscr =
get_subscr_by_argv(gsmnet, argv[0], argv[1]);
const char *alg_str = argv[2];
const char *ki_str = argv[3];
const char *ki_str = argc == 4 ? argv[3] : NULL;
struct gsm_auth_info ainfo;
int rc;
int rc, minlen, maxlen;
if (!subscr) {
vty_out(vty, "%% No subscriber found for %s %s%s",
@ -468,23 +469,35 @@ DEFUN(ena_subscr_a3a8,
}
if (!strcasecmp(alg_str, "none")) {
/* Just erase */
rc = db_sync_authinfo_for_subscr(NULL, subscr);
ainfo.auth_algo = AUTH_ALGO_NONE;
minlen = maxlen = 0;
} else if (!strcasecmp(alg_str, "xor")) {
ainfo.auth_algo = AUTH_ALGO_XOR;
minlen = A38_XOR_MIN_KEY_LEN;
maxlen = A38_XOR_MAX_KEY_LEN;
} else if (!strcasecmp(alg_str, "comp128v1")) {
/* Parse hex string Ki */
rc = hexparse(ki_str, ainfo.a3a8_ki, sizeof(ainfo.a3a8_ki));
if (rc != 16)
return CMD_WARNING;
/* Set the infos */
ainfo.auth_algo = AUTH_ALGO_COMP128v1;
ainfo.a3a8_ki_len = rc;
rc = db_sync_authinfo_for_subscr(&ainfo, subscr);
minlen = maxlen = A38_COMP128_KEY_LEN;
} else {
/* Unknown method */
return CMD_WARNING;
}
if (ki_str) {
rc = hexparse(ki_str, ainfo.a3a8_ki, sizeof(ainfo.a3a8_ki));
if ((rc > maxlen) || (rc < minlen))
return CMD_WARNING;
ainfo.a3a8_ki_len = rc;
} else {
ainfo.a3a8_ki_len = 0;
if (minlen)
return CMD_WARNING;
}
rc = db_sync_authinfo_for_subscr(
ainfo.auth_algo == AUTH_ALGO_NONE ? NULL : &ainfo,
subscr);
/* the last tuple probably invalid with the new auth settings */
db_sync_lastauthtuple_for_subscr(NULL, subscr);