Commit 676b55a2 authored by Swetank Srivastava's avatar Swetank Srivastava Committed by Vijay C

Working 8.2.1.6 on Rebased Branch

parent 9e1f2bc5
...@@ -7125,9 +7125,6 @@ void rrc_eNB_as_security_configuration_req( ...@@ -7125,9 +7125,6 @@ void rrc_eNB_as_security_configuration_req(
for (int i = 0; i < MAX_RBS; i++) for (int i = 0; i < MAX_RBS; i++)
{ {
uint8_t *kRRCenc = NULL;
uint8_t *kRRCint = NULL;
uint8_t *kUPenc = NULL;
if (i < 3) if (i < 3)
{ {
rbid_ = i; rbid_ = i;
...@@ -7174,22 +7171,15 @@ void rrc_eNB_as_security_configuration_req( ...@@ -7174,22 +7171,15 @@ void rrc_eNB_as_security_configuration_req(
* Each RB entry will be freed invidually when the pdcp_remove_ue is invoked * Each RB entry will be freed invidually when the pdcp_remove_ue is invoked
* during the UE release process. * during the UE release process.
*/ */
kRRCint = CALLOC(1,32);
kUPenc = CALLOC(1,16);
kRRCenc = CALLOC(1,16);
if (ASSecConfReq->Integrity.kRRCint) memcpy(kRRCint,ASSecConfReq->Integrity.kRRCint, 32);
if (ASSecConfReq->Ciphering.kUPenc) memcpy(kUPenc,ASSecConfReq->Ciphering.kUPenc, 16);
if (ASSecConfReq->Ciphering.kRRCenc) memcpy(kRRCenc,ASSecConfReq->Ciphering.kRRCenc, 16);
pdcp_config_set_security( pdcp_config_set_security(
ctxt_pP, ctxt_pP,
pdcp_p, pdcp_p,
rbid_, rbid_,
rbid_+2, rbid_+2,
(ciphering_algorithm ) |(integrity_algorithm << 4), (ciphering_algorithm ) |(integrity_algorithm << 4),
kRRCenc, ASSecConfReq->Ciphering.kRRCenc,
kRRCint, ASSecConfReq->Integrity.kRRCint,
kUPenc); ASSecConfReq->Ciphering.kUPenc);
rb_idx++; rb_idx++;
LOG_I(RRC,"Updated PDCP for rb_id %d integrityProtAlgorithm=%d cipheringAlgorithm=%d \n", LOG_I(RRC,"Updated PDCP for rb_id %d integrityProtAlgorithm=%d cipheringAlgorithm=%d \n",
rb_idx, integrity_algorithm, ciphering_algorithm); rb_idx, integrity_algorithm, ciphering_algorithm);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment