msc_vlr_tests: clearly separate Ciph Mode from Security Mode checking
Clearly distinguish between Ciphering Mode Command on GERAN and Security Mode
Control on UTRAN.
Cosmetic: explicitly verify the key strings in the testing code (not only in
the expected output).
Change-Id: Ica93ed06c4c63dc6768736d25231de8068001114
diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c
index a9f76f4..97a2e5d 100644
--- a/tests/msc_vlr/msc_vlr_tests.c
+++ b/tests/msc_vlr/msc_vlr_tests.c
@@ -62,6 +62,10 @@
const char *auth_request_expect_autn;
bool cipher_mode_cmd_sent;
bool cipher_mode_cmd_sent_with_imeisv;
+const char *cipher_mode_expect_kc;
+bool security_mode_ctrl_sent;
+const char *security_mode_expect_ck;
+const char *security_mode_expect_ik;
bool iu_release_expected = false;
bool iu_release_sent = false;
@@ -387,6 +391,14 @@
auth_request_expect_rand = NULL;
auth_request_expect_autn = NULL;
+ cipher_mode_cmd_sent = false;
+ cipher_mode_cmd_sent_with_imeisv = false;
+ cipher_mode_expect_kc = NULL;
+
+ security_mode_ctrl_sent = false;
+ security_mode_expect_ck = NULL;
+ security_mode_expect_ik = NULL;
+
next_rand_byte = 0;
iu_release_expected = false;
@@ -720,6 +732,12 @@
btw("...key: %s", osmo_hexdump_nospc(ei->key, ei->key_len));
cipher_mode_cmd_sent = true;
cipher_mode_cmd_sent_with_imeisv = include_imeisv;
+
+ if (!cipher_mode_expect_kc
+ || strcmp(cipher_mode_expect_kc, osmo_hexdump_nospc(ei->key, ei->key_len))) {
+ log("FAILURE: expected kc=%s", cipher_mode_expect_kc ? : "NULL");
+ OSMO_ASSERT(false);
+ }
return 0;
}
@@ -734,8 +752,18 @@
btw("...ik=%s", osmo_hexdump_nospc(vec->ik, sizeof(vec->ik)));
if (send_ck)
btw("...ck=%s", osmo_hexdump_nospc(vec->ck, sizeof(vec->ck)));
- cipher_mode_cmd_sent = true;
- cipher_mode_cmd_sent_with_imeisv = false;
+ security_mode_ctrl_sent = true;
+ if (!security_mode_expect_ik
+ || strcmp(security_mode_expect_ik, osmo_hexdump_nospc(vec->ik, sizeof(vec->ik)))) {
+ log("FAILURE: expected ik=%s", security_mode_expect_ik ? : "NULL");
+ OSMO_ASSERT(false);
+ }
+ if (((!!send_ck) != (!!security_mode_expect_ck))
+ || (security_mode_expect_ck
+ && strcmp(security_mode_expect_ck, osmo_hexdump_nospc(vec->ck, sizeof(vec->ck))))) {
+ log("FAILURE: expected ck=%s", security_mode_expect_ck ? : "NULL");
+ OSMO_ASSERT(false);
+ }
return 0;
}