Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenXG
OpenXG-RAN
Commits
de7bc130
Commit
de7bc130
authored
Apr 23, 2024
by
Cedric Roux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor: rename stream_security_container_create() to stream_security_container_init()
parent
fac5c1f6
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
13 deletions
+13
-13
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
+2
-2
openair3/NAS/NR_UE/nr_nas_msg_sim.c
openair3/NAS/NR_UE/nr_nas_msg_sim.c
+2
-2
openair3/NAS/UE/EMM/SecurityModeControl.c
openair3/NAS/UE/EMM/SecurityModeControl.c
+1
-1
openair3/SECU/secu_defs.c
openair3/SECU/secu_defs.c
+4
-4
openair3/SECU/secu_defs.h
openair3/SECU/secu_defs.h
+4
-4
No files found.
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
View file @
de7bc130
...
@@ -2128,8 +2128,8 @@ pdcp_config_set_security(
...
@@ -2128,8 +2128,8 @@ pdcp_config_set_security(
kRRCint
!=
NULL
?
memcpy
(
pdcp_pP
->
kRRCint
,
kRRCint
+
16
,
16
)
:
memset
(
pdcp_pP
->
kRRCint
,
0
,
16
);
kRRCint
!=
NULL
?
memcpy
(
pdcp_pP
->
kRRCint
,
kRRCint
+
16
,
16
)
:
memset
(
pdcp_pP
->
kRRCint
,
0
,
16
);
kUPenc
!=
NULL
?
memcpy
(
pdcp_pP
->
kUPenc
,
kUPenc
+
16
,
16
)
:
memset
(
pdcp_pP
->
kUPenc
,
0
,
16
);
kUPenc
!=
NULL
?
memcpy
(
pdcp_pP
->
kUPenc
,
kUPenc
+
16
,
16
)
:
memset
(
pdcp_pP
->
kUPenc
,
0
,
16
);
pdcp_pP
->
security_container_rrc
=
stream_security_container_
create
(
pdcp_pP
->
cipheringAlgorithm
,
pdcp_pP
->
integrityProtAlgorithm
,
pdcp_pP
->
kRRCenc
,
pdcp_pP
->
kRRCint
);
pdcp_pP
->
security_container_rrc
=
stream_security_container_
init
(
pdcp_pP
->
cipheringAlgorithm
,
pdcp_pP
->
integrityProtAlgorithm
,
pdcp_pP
->
kRRCenc
,
pdcp_pP
->
kRRCint
);
pdcp_pP
->
security_container_up
=
stream_security_container_
create
(
pdcp_pP
->
cipheringAlgorithm
,
0
,
pdcp_pP
->
kUPenc
,
NULL
);
pdcp_pP
->
security_container_up
=
stream_security_container_
init
(
pdcp_pP
->
cipheringAlgorithm
,
0
,
pdcp_pP
->
kUPenc
,
NULL
);
/* Activate security */
/* Activate security */
pdcp_pP
->
security_activated
=
1
;
pdcp_pP
->
security_activated
=
1
;
...
...
openair3/NAS/NR_UE/nr_nas_msg_sim.c
View file @
de7bc130
...
@@ -516,9 +516,9 @@ static void generateAuthenticationResp(nr_ue_nas_t *nas, as_nas_info_t *initialN
...
@@ -516,9 +516,9 @@ static void generateAuthenticationResp(nr_ue_nas_t *nas, as_nas_info_t *initialN
{
{
derive_ue_keys
(
buf
,
nas
);
derive_ue_keys
(
buf
,
nas
);
/* todo: as of now, nia2 is hardcoded in derive_ue_keys(), remove this hardcoding, use NAS signalling for getting proper algorithm */
/* todo: as of now, nia2 is hardcoded in derive_ue_keys(), remove this hardcoding, use NAS signalling for getting proper algorithm */
/* todo: deal with ciphering for this stream_security_container_
create
() (handle ciphering in general) */
/* todo: deal with ciphering for this stream_security_container_
init
() (handle ciphering in general) */
/* todo: stream_security_container_delete() is not called anywhere, deal with that */
/* todo: stream_security_container_delete() is not called anywhere, deal with that */
nas
->
security_container
=
stream_security_container_
create
(
0
,
2
/* hardcoded: nia2 */
,
NULL
,
nas
->
security
.
knas_int
);
nas
->
security_container
=
stream_security_container_
init
(
0
,
2
/* hardcoded: nia2 */
,
NULL
,
nas
->
security
.
knas_int
);
OctetString
res
;
OctetString
res
;
res
.
length
=
16
;
res
.
length
=
16
;
res
.
value
=
calloc
(
1
,
16
);
res
.
value
=
calloc
(
1
,
16
);
...
...
openair3/NAS/UE/EMM/SecurityModeControl.c
View file @
de7bc130
...
@@ -267,7 +267,7 @@ int emm_proc_security_mode_command(nas_user_t *user, int native_ksi, int ksi,
...
@@ -267,7 +267,7 @@ int emm_proc_security_mode_command(nas_user_t *user, int native_ksi, int ksi,
/* Set new security context indicator */
/* Set new security context indicator */
security_context_is_new
=
true
;
security_context_is_new
=
true
;
/* create contexts */
/* create contexts */
user
->
emm_data
->
security
->
security_container
=
stream_security_container_
create
(
user
->
emm_data
->
security
->
security_container
=
stream_security_container_
init
(
seea
,
seea
,
seia
,
seia
,
user
->
emm_data
->
non_current
->
knas_enc
.
value
,
user
->
emm_data
->
non_current
->
knas_enc
.
value
,
...
...
openair3/SECU/secu_defs.c
View file @
de7bc130
...
@@ -104,10 +104,10 @@ void stream_ciphering_free(int ciphering_algorithm, stream_security_context_t *c
...
@@ -104,10 +104,10 @@ void stream_ciphering_free(int ciphering_algorithm, stream_security_context_t *c
}
}
}
}
stream_security_container_t
*
stream_security_container_
create
(
int
ciphering_algorithm
,
stream_security_container_t
*
stream_security_container_
init
(
int
ciphering_algorithm
,
int
integrity_algorithm
,
int
integrity_algorithm
,
const
uint8_t
*
ciphering_key
,
const
uint8_t
*
ciphering_key
,
const
uint8_t
*
integrity_key
)
const
uint8_t
*
integrity_key
)
{
{
stream_security_container_t
*
container
=
calloc
(
1
,
sizeof
(
*
container
));
stream_security_container_t
*
container
=
calloc
(
1
,
sizeof
(
*
container
));
AssertFatal
(
container
!=
NULL
,
"out of memory
\n
"
);
AssertFatal
(
container
!=
NULL
,
"out of memory
\n
"
);
...
...
openair3/SECU/secu_defs.h
View file @
de7bc130
...
@@ -58,10 +58,10 @@ stream_security_context_t *stream_ciphering_init(int ciphering_algorithm, const
...
@@ -58,10 +58,10 @@ stream_security_context_t *stream_ciphering_init(int ciphering_algorithm, const
void
stream_integrity_free
(
int
integrity_algorithm
,
stream_security_context_t
*
integrity_context
);
void
stream_integrity_free
(
int
integrity_algorithm
,
stream_security_context_t
*
integrity_context
);
void
stream_ciphering_free
(
int
ciphering_algorithm
,
stream_security_context_t
*
ciphering_context
);
void
stream_ciphering_free
(
int
ciphering_algorithm
,
stream_security_context_t
*
ciphering_context
);
stream_security_container_t
*
stream_security_container_
create
(
int
ciphering_algorithm
,
stream_security_container_t
*
stream_security_container_
init
(
int
ciphering_algorithm
,
int
integrity_algorithm
,
int
integrity_algorithm
,
const
uint8_t
*
ciphering_key
,
const
uint8_t
*
ciphering_key
,
const
uint8_t
*
integrity_key
);
const
uint8_t
*
integrity_key
);
void
stream_security_container_delete
(
stream_security_container_t
*
container
);
void
stream_security_container_delete
(
stream_security_container_t
*
container
);
/*!
/*!
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment