sysmocom
/
open5gs
forked from acouzens/open5gs
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix the encryption bug

This commit is contained in:
Sukchan Lee 2018-05-22 17:39:43 +09:00
parent 056fc43d34
commit c906b243a2
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/mme/nas_security.c
View File

@ -65,11 +65,6 @@ status_t nas_security_encode(
d_assert(nas_plain_encode(&new, message) == CORE_OK,
return CORE_ERROR, "NAS encoding error");
/* encode sequence number */
d_assert(CORE_OK == pkbuf_header(new, 1),
pkbuf_free(new);return CORE_ERROR, "pkbuf_header error");
*(c_uint8_t *)(new->payload) = h.sequence_number;
if (ciphered)
{
/* encrypt NAS message */
@ -78,6 +73,11 @@ status_t nas_security_encode(
NAS_SECURITY_DOWNLINK_DIRECTION, new);
}
/* encode sequence number */
d_assert(CORE_OK == pkbuf_header(new, 1),
pkbuf_free(new);return CORE_ERROR, "pkbuf_header error");
*(c_uint8_t *)(new->payload) = h.sequence_number;
if (integrity_protected)
{
c_uint8_t mac[NAS_SECURITY_MAC_SIZE];
@ -199,13 +199,6 @@ status_t nas_security_decode(mme_ue_t *mme_ue,
mme_ue->ul_count.overflow++;
mme_ue->ul_count.sqn = h->sequence_number;
if (security_header_type.ciphered)
{
/* decrypt NAS message */
nas_encrypt(mme_ue->selected_enc_algorithm,
mme_ue->knas_enc, mme_ue->ul_count.i32, NAS_SECURITY_BEARER,
NAS_SECURITY_UPLINK_DIRECTION, pkbuf);
}
if (security_header_type.integrity_protected)
{
c_uint8_t mac[NAS_SECURITY_MAC_SIZE];
@ -230,6 +223,14 @@ status_t nas_security_decode(mme_ue_t *mme_ue,
/* NAS EMM Header or ESM Header */
d_assert(CORE_OK == pkbuf_header(pkbuf, -1),
return CORE_ERROR, "pkbuf_header error");
if (security_header_type.ciphered)
{
/* decrypt NAS message */
nas_encrypt(mme_ue->selected_enc_algorithm,
mme_ue->knas_enc, mme_ue->ul_count.i32, NAS_SECURITY_BEARER,
NAS_SECURITY_UPLINK_DIRECTION, pkbuf);
}
}
return CORE_OK;