diff options
Diffstat (limited to 'openbsc/include/openbsc/gsm_data_shared.h')
| -rw-r--r-- | openbsc/include/openbsc/gsm_data_shared.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/openbsc/include/openbsc/gsm_data_shared.h b/openbsc/include/openbsc/gsm_data_shared.h index 97fde835f..af7948554 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/common_cs.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]; |