Merge branch 'crypto' into mobility_crypto

lib/src/upper/pdcp_entity.cc

@@ -314,6 +314,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]),
@@ -324,9 +325,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;
   }
 }
 
@@ -338,7 +339,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)