diff options
| author | Andreas Eversberg <jolly@eversberg.eu> | 2013-06-20 20:10:46 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2015-09-22 16:41:29 +0200 |
| commit | f5aaf523c58dd7bc2f57f840b717da359d08bb5c (patch) | |
| tree | ae693eb5be3bb89c2e2b6319e406f4eb3ef5808e | |
| parent | 8c8998e55156629679dbe1ca42684bc451d06262 (diff) | |
TRX: If no cipher algorithm is given, or if it is a5/0, reset cipher state
| -rw-r--r-- | src/osmo-bts-trx/scheduler.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/osmo-bts-trx/scheduler.c b/src/osmo-bts-trx/scheduler.c index 9aa05390..5a22c5c3 100644 --- a/src/osmo-bts-trx/scheduler.c +++ b/src/osmo-bts-trx/scheduler.c @@ -2573,7 +2573,10 @@ int trx_sched_set_cipher(struct trx_l1h *l1h, uint8_t chan_nr, int downlink, int rc = -EINVAL; struct trx_chan_state *chan_state; - if (algo < 0 || key_len > 8 || (algo && key_len != 8)) { + /* no algorithm given means a5/0 */ + if (algo <= 0) + algo = 0; + else if (key_len != 8) { LOGP(DL1C, LOGL_ERROR, "Algo A5/%d not supported with given " "key len=%d\n", algo, key_len); return -ENOTSUP; |