diff options
| author | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-05-10 13:30:17 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-11-12 15:50:33 +0100 |
| commit | 2ac47f62ae395902e03f5d7f60598ce937639a8d (patch) | |
| tree | 7cab805b7be662db1eeb6fbc958b46cea06449ca /openbsc/include/openbsc | |
| parent | 624e2bbb684531c02f549b381f7849b53a64172d (diff) | |
factor out & introduce struct gsm_encr, in xsc.h
Factor out encryption info from struct gsm_lchan as struct gsm_encr, placed in
xsc.h.
Change-Id: I94015fb9dd511c37c1e3058a0963c780b3f700ac
Future: this will be used by libmsc's subscriber connection, for osmo-cscn.
Diffstat (limited to 'openbsc/include/openbsc')
| -rw-r--r-- | openbsc/include/openbsc/gsm_data_shared.h | 9 | ||||
| -rw-r--r-- | openbsc/include/openbsc/xsc.h | 8 |
2 files changed, 11 insertions, 6 deletions
diff --git a/openbsc/include/openbsc/gsm_data_shared.h b/openbsc/include/openbsc/gsm_data_shared.h index 97fde835f..03b6d8e82 100644 --- a/openbsc/include/openbsc/gsm_data_shared.h +++ b/openbsc/include/openbsc/gsm_data_shared.h @@ -24,6 +24,8 @@ #include <osmocom/gsm/lapdm.h> #endif +#include <openbsc/xsc.h> + struct osmo_bsc_data; struct osmo_bsc_sccp_con; @@ -117,7 +119,6 @@ struct om2k_mo { struct osmo_fsm_inst *fsm; }; -#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 @@ -219,11 +220,7 @@ struct gsm_lchan { uint8_t bs_power; uint8_t ms_power; /* Encryption information */ - struct { - uint8_t alg_id; - uint8_t key_len; - uint8_t key[MAX_A5_KEY_LEN]; - } encr; + struct gsm_encr encr; /* AMR bits */ uint8_t mr_ms_lv[7]; diff --git a/openbsc/include/openbsc/xsc.h b/openbsc/include/openbsc/xsc.h index 8549a837b..172d6e621 100644 --- a/openbsc/include/openbsc/xsc.h +++ b/openbsc/include/openbsc/xsc.h @@ -7,6 +7,14 @@ struct gsm_network; typedef int (*mncc_recv_cb_t)(struct gsm_network *, struct msgb *); +#define MAX_A5_KEY_LEN (128/8) + +struct gsm_encr { + uint8_t alg_id; + uint8_t key_len; + uint8_t key[MAX_A5_KEY_LEN]; +}; + struct gsm_network *gsm_network_init(void *ctx, uint16_t country_code, uint16_t network_code, |