cellular-infrastructure
/
osmo-iuh
mirror of https://gerrit.osmocom.org/osmo-iuh
9
0
Fork 0
Code Issues Releases Wiki Activity

ranap_msg_factory: Add keystatus parameter for security mode cmd

This commit is contained in:
Daniel Willmann 2016-04-20 10:16:37 +02:00
parent 5ad72b91bb
commit f44d12ce27
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/osmocom/ranap/ranap_msg_factory.h
View File

@ -11,7 +11,7 @@
struct msgb *ranap_new_msg_dt(uint8_t sapi, const uint8_t *nas, unsigned int nas_len);
/*! \brief generate RANAP SECURITY MODE COMMAND message */
struct msgb *ranap_new_msg_sec_mod_cmd(const uint8_t *ik, const uint8_t *ck);
struct msgb *ranap_new_msg_sec_mod_cmd(const uint8_t *ik, const uint8_t *ck, enum RANAP_KeyStatus status);
/*! \brief generate RANAP SECURITY MODE COMPLETE message */
struct msgb *ranap_new_msg_sec_mod_compl(

4
src/ranap_msg_factory.c
View File

@ -209,7 +209,7 @@ static const RANAP_EncryptionAlgorithm_t enc_alg[2] = {
};
/*! \brief generate RANAP SECURITY MODE COMMAND message */
struct msgb *ranap_new_msg_sec_mod_cmd(const uint8_t *ik, const uint8_t *ck)
struct msgb *ranap_new_msg_sec_mod_cmd(const uint8_t *ik, const uint8_t *ck, enum RANAP_KeyStatus status)
{
RANAP_SecurityModeCommandIEs_t ies;
RANAP_SecurityModeCommand_t out;
@ -241,7 +241,7 @@ struct msgb *ranap_new_msg_sec_mod_cmd(const uint8_t *ik, const uint8_t *ck)
BIT_STRING_fromBuf(&ies.encryptionInformation.key, ck, 16*8);
}
ies.keyStatus = RANAP_KeyStatus_new; /* FIXME */
ies.keyStatus = status;
/* ies -> out */
rc = ranap_encode_securitymodecommandies(&out, &ies);

2
src/tests/hnb-test.c
View File

@ -980,7 +980,7 @@ int main(int argc, char **argv)
rua = rua_new_udt(msg);
osmo_wqueue_enqueue(&g_hnb_test.wqueue, rua);
msg = ranap_new_msg_sec_mod_cmd(ik, ik);
msg = ranap_new_msg_sec_mod_cmd(ik, ik, RANAP_KeyStatus_new);
rua = rua_new_udt(msg);
osmo_wqueue_enqueue(&g_hnb_test.wqueue, rua);

2
src/tests/test-ranap.c
View File

@ -64,7 +64,7 @@ int main(int argc, char **argv)
msgb_free(msg);
printf("\n==> SECURITY MODE COMMAND\n");
msg = ranap_new_msg_sec_mod_cmd(ik, ck);
msg = ranap_new_msg_sec_mod_cmd(ik, ck, RANAP_KeyStatus_new);
if (msg)
printf("%s\n", msgb_hexdump(msg));
msgb_free(msg);