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

security header type is fixed to meet standard

This commit is contained in:
Sukchan Lee 2017-04-26 11:59:05 +09:00
parent e0a2758dd0
commit f48bbbd35b
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/nas/nas_decoder.c
View File

@ -26,7 +26,7 @@
/*******************************************************************************
* This file had been created by gtpv2c_tlv.py script v0.1.0
* Please do not modify this file but regenerate it via script.
* Created on: 2017-04-26 09:49:09.303927 by acetcom
* Created on: 2017-04-26 11:58:32.367002 by acetcom
* from 24301-d80.docx
******************************************************************************/
@ -1666,7 +1666,7 @@ status_t nas_emm_decode(nas_message_t *message, pkbuf_t *pkbuf)
memcpy(&message->emm.h, pkbuf->payload - size, size);
decoded += size;
if (message->emm.h.security_header_type ==
if (message->emm.h.security_header_type >=
NAS_SECURITY_HEADER_FOR_SERVICE_REQUEST_MESSAGE)
{
size = nas_decode_service_request(message, pkbuf);

4
lib/nas/nas_encoder.c
View File

@ -26,7 +26,7 @@
/*******************************************************************************
* This file had been created by gtpv2c_tlv.py script v0.1.0
* Please do not modify this file but regenerate it via script.
* Created on: 2017-04-26 09:49:09.323438 by acetcom
* Created on: 2017-04-26 11:58:32.382927 by acetcom
* from 24301-d80.docx
******************************************************************************/
@ -1904,7 +1904,7 @@ status_t nas_emm_encode(pkbuf_t **pkbuf, nas_message_t *message)
memcpy((*pkbuf)->payload - size, &message->emm.h, size);
encoded += size;
if (message->emm.h.security_header_type ==
if (message->emm.h.security_header_type >=
NAS_SECURITY_HEADER_FOR_SERVICE_REQUEST_MESSAGE)
{
size = nas_encode_service_request(*pkbuf, message);

2
lib/nas/nas_ies.c
View File

@ -26,7 +26,7 @@
/*******************************************************************************
* This file had been created by gtpv2c_tlv.py script v0.1.0
* Please do not modify this file but regenerate it via script.
* Created on: 2017-04-26 09:49:09.274175 by acetcom
* Created on: 2017-04-26 11:58:32.330203 by acetcom
* from 24301-d80.docx
******************************************************************************/

2
lib/nas/nas_ies.h
View File

@ -26,7 +26,7 @@
/*******************************************************************************
* This file had been created by gtpv2c_tlv.py script v0.1.0
* Please do not modify this file but regenerate it via script.
* Created on: 2017-04-26 09:49:09.269775 by acetcom
* Created on: 2017-04-26 11:58:32.323731 by acetcom
* from 24301-d80.docx
******************************************************************************/

4
lib/nas/nas_message.h
View File

@ -26,7 +26,7 @@
/*******************************************************************************
* This file had been created by gtpv2c_tlv.py script v0.1.0
* Please do not modify this file but regenerate it via script.
* Created on: 2017-04-26 09:49:09.287767 by acetcom
* Created on: 2017-04-26 11:58:32.345942 by acetcom
* from 24301-d80.docx
******************************************************************************/
@ -49,7 +49,7 @@ extern "C" {
#define NAS_SECURITY_HEADER_INTEGRITY_PROTECTED_AND_NEW_SECURITY_CONTEXT 3
#define NAS_SECURITY_HEADER_INTEGRITY_PROTECTED_AND_CIPHTERD_WITH_NEW_INTEGRITY_CONTEXT 4
#define NAS_SECURITY_HEADER_INTEGRITY_PROTECTED_AND_PARTICALLY_CIPHTERD 5
#define NAS_SECURITY_HEADER_FOR_SERVICE_REQUEST_MESSAGE 6
#define NAS_SECURITY_HEADER_FOR_SERVICE_REQUEST_MESSAGE 12
#define NAS_PROTOCOL_DISCRIMINATOR_ESM 0x2
#define NAS_PROTOCOL_DISCRIMINATOR_EMM 0x7

6
lib/nas/support/nas_message.py
View File

@ -492,7 +492,7 @@ extern "C" {
#define NAS_SECURITY_HEADER_INTEGRITY_PROTECTED_AND_NEW_SECURITY_CONTEXT 3
#define NAS_SECURITY_HEADER_INTEGRITY_PROTECTED_AND_CIPHTERD_WITH_NEW_INTEGRITY_CONTEXT 4
#define NAS_SECURITY_HEADER_INTEGRITY_PROTECTED_AND_PARTICALLY_CIPHTERD 5
#define NAS_SECURITY_HEADER_FOR_SERVICE_REQUEST_MESSAGE 6
#define NAS_SECURITY_HEADER_FOR_SERVICE_REQUEST_MESSAGE 12
#define NAS_PROTOCOL_DISCRIMINATOR_ESM 0x2
#define NAS_PROTOCOL_DISCRIMINATOR_EMM 0x7
@ -700,7 +700,7 @@ f.write("""status_t nas_emm_decode(nas_message_t *message, pkbuf_t *pkbuf)
memcpy(&message->emm.h, pkbuf->payload - size, size);
decoded += size;
if (message->emm.h.security_header_type ==
if (message->emm.h.security_header_type >=
NAS_SECURITY_HEADER_FOR_SERVICE_REQUEST_MESSAGE)
{
size = nas_decode_service_request(message, pkbuf);
@ -869,7 +869,7 @@ f.write("""status_t nas_emm_encode(pkbuf_t **pkbuf, nas_message_t *message)
memcpy((*pkbuf)->payload - size, &message->emm.h, size);
encoded += size;
if (message->emm.h.security_header_type ==
if (message->emm.h.security_header_type >=
NAS_SECURITY_HEADER_FOR_SERVICE_REQUEST_MESSAGE)
{
size = nas_encode_service_request(*pkbuf, message);