mirror of https://github.com/PentHertz/srsLTE.git
Merge branch 'crypto' into mobility_crypto
This commit is contained in:
commit
3607ac6154
|
@ -314,6 +314,7 @@ void pdcp_entity::cipher_decrypt(uint8_t *ct,
|
||||||
ct,
|
ct,
|
||||||
ct_len,
|
ct_len,
|
||||||
msg_tmp.msg);
|
msg_tmp.msg);
|
||||||
|
memcpy(msg, msg_tmp.msg, ct_len);
|
||||||
break;
|
break;
|
||||||
case CIPHERING_ALGORITHM_ID_128_EEA2:
|
case CIPHERING_ALGORITHM_ID_128_EEA2:
|
||||||
security_128_eea2(&(k_enc[16]),
|
security_128_eea2(&(k_enc[16]),
|
||||||
|
@ -324,9 +325,9 @@ void pdcp_entity::cipher_decrypt(uint8_t *ct,
|
||||||
ct_len,
|
ct_len,
|
||||||
msg_tmp.msg);
|
msg_tmp.msg);
|
||||||
memcpy(msg, msg_tmp.msg, ct_len);
|
memcpy(msg, msg_tmp.msg, ct_len);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -338,7 +339,8 @@ void pdcp_entity::run_thread()
|
||||||
|
|
||||||
while(running) {
|
while(running) {
|
||||||
rx_pdu_queue.read(&pdu);
|
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
|
// Handle SRB messages
|
||||||
switch(lcid)
|
switch(lcid)
|
||||||
|
|
Loading…
Reference in New Issue