From 324ba02481050a4f36479d50725ff4d346908d6c Mon Sep 17 00:00:00 2001 From: Paul Sutton Date: Sun, 3 Dec 2017 18:16:05 +0000 Subject: [PATCH] Fix for PDCP EEA1 --- lib/src/upper/pdcp_entity.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/src/upper/pdcp_entity.cc b/lib/src/upper/pdcp_entity.cc index 0ac426a6e..731245e4f 100644 --- a/lib/src/upper/pdcp_entity.cc +++ b/lib/src/upper/pdcp_entity.cc @@ -301,6 +301,7 @@ void pdcp_entity::cipher_decrypt(uint8_t *ct, ct, ct_len, msg_tmp.msg); + memcpy(msg, msg_tmp.msg, ct_len); break; case CIPHERING_ALGORITHM_ID_128_EEA2: security_128_eea2(&(k_enc[16]), @@ -311,9 +312,9 @@ void pdcp_entity::cipher_decrypt(uint8_t *ct, ct_len, msg_tmp.msg); memcpy(msg, msg_tmp.msg, ct_len); - break; - default: - break; + break; + default: + break; } } @@ -325,7 +326,8 @@ void pdcp_entity::run_thread() while(running) { rx_pdu_queue.read(&pdu); - log->info_hex(pdu->msg, pdu->N_bytes, "RX %s PDU", get_rb_name(lcid)); + log->info_hex(pdu->msg, pdu->N_bytes, "RX %s PDU, do_integrity = %s, do_encryption = %s", + get_rb_name(lcid), (do_integrity) ? "true" : "false", (do_encryption) ? "true" : "false"); // Handle SRB messages switch(lcid)