diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2021-06-23 23:54:43 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2021-06-24 01:44:20 +0200 |
| commit | 73d093a80611551ba7eaff59d3bc31c97d64d05d (patch) | |
| tree | 4062cfa90e2f216ec10f1eb17b78ae4d9f2aec71 | |
| parent | db07fdcbfcacd8c72c9505e1a72b044b65f78716 (diff) | |
improve logging on encryption, for Ciphering and HOneels/a54
log the algorithm and all keys instead of just Kc.
Change-Id: If7871dedda2b1fb115e6f00da1379ff2e3d68a10
| -rw-r--r-- | src/libmsc/msc_a.c | 8 | ||||
| -rw-r--r-- | src/libmsc/msc_ho.c | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c index 4c38c562d..451220a11 100644 --- a/src/libmsc/msc_a.c +++ b/src/libmsc/msc_a.c @@ -345,8 +345,12 @@ static int msc_a_ran_enc_ciphering(struct msc_a *msc_a, bool umts_aka, bool retr } if (msc_a->geran_encr.key_len) - LOG_MSC_A(msc_a, LOGL_DEBUG, "RAN encoding chose ciphering key %s\n", - osmo_hexdump_nospc(msc_a->geran_encr.key, msc_a->geran_encr.key_len)); + LOG_MSC_A(msc_a, LOGL_DEBUG, "RAN encoding chose ciphering: A5/%d kc %s kc128 %s\n", + msc_a->geran_encr.alg_id - 1, + osmo_hexdump_nospc_c(OTC_SELECT, msc_a->geran_encr.key, msc_a->geran_encr.key_len), + msc_a->geran_encr.kc128_present ? + osmo_hexdump_nospc_c(OTC_SELECT, msc_a->geran_encr.kc128, sizeof(msc_a->geran_encr.kc128)) + : "-"); return 0; } diff --git a/src/libmsc/msc_ho.c b/src/libmsc/msc_ho.c index d89a24c5e..6b8960e09 100644 --- a/src/libmsc/msc_ho.c +++ b/src/libmsc/msc_ho.c @@ -408,6 +408,14 @@ static void msc_ho_send_handover_request(struct msc_a *msc_a) }, }; + if (msc_a->geran_encr.key_len) + LOG_MSC_A(msc_a, LOGL_DEBUG, "HO Request with ciphering: A5/%d kc %s kc128 %s\n", + msc_a->geran_encr.alg_id - 1, + osmo_hexdump_nospc_c(OTC_SELECT, msc_a->geran_encr.key, msc_a->geran_encr.key_len), + msc_a->geran_encr.kc128_present ? + osmo_hexdump_nospc_c(OTC_SELECT, msc_a->geran_encr.kc128, sizeof(msc_a->geran_encr.kc128)) + : "-"); + if (msc_a->cc.active_trans) { if (mncc_bearer_cap_to_channel_type(&channel_type, &msc_a->cc.active_trans->bearer_cap)) { msc_ho_failed(msc_a, GSM0808_CAUSE_EQUIPMENT_FAILURE, |