5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Adding OPc option to security functions."

Browse Source 
This reverts commit 0eeb70bede.
master
Pedro Alvarez 7 years ago
parent 0eeb70bede
commit e3d1cff4a3
7 changed files with 24 additions and 47 deletions
Show Stats Download Patch File Download Diff File

11
lib/include/srslte/common/liblte_security.h
Unescape Escape View File

@ -122,13 +122,6 @@ typedef enum{
static const char liblte_security_integrity_algorithm_id_text[LIBLTE_SECURITY_INTEGRITY_ALGORITHM_ID_N_ITEMS][20] = {"EIA0",
"128-EIA1",
"128-EIA2"};
typedef enum
{
AUTH_OP,
AUTH_OPC
}AUTH_OPERATOR_CODE_TYPE;
// Structs
// Functions
LIBLTE_ERROR_ENUM liblte_security_generate_k_nas(uint8 *k_asme,
@ -285,7 +278,6 @@ LIBLTE_ERROR_ENUM liblte_security_decryption_eea2(uint8 *key,
// Structs
// Functions
LIBLTE_ERROR_ENUM liblte_security_milenage_f1(uint8 *k,
AUTH_OPERATOR_CODE_TYPE opc_t,
uint8 *op,
uint8 *rand,
uint8 *sqn,
@ -307,7 +299,6 @@ LIBLTE_ERROR_ENUM liblte_security_milenage_f1(uint8 *k,
// Structs
// Functions
LIBLTE_ERROR_ENUM liblte_security_milenage_f1_star(uint8 *k,
AUTH_OPERATOR_CODE_TYPE opc_t,
uint8 *op,
uint8 *rand,
uint8 *sqn,
@ -329,7 +320,6 @@ LIBLTE_ERROR_ENUM liblte_security_milenage_f1_star(uint8 *k,
// Structs
// Functions
LIBLTE_ERROR_ENUM liblte_security_milenage_f2345(uint8 *k,
AUTH_OPERATOR_CODE_TYPE opc_t,
uint8 *op,
uint8 *rand,
uint8 *res,
@ -351,7 +341,6 @@ LIBLTE_ERROR_ENUM liblte_security_milenage_f2345(uint8 *k,
// Structs
// Functions
LIBLTE_ERROR_ENUM liblte_security_milenage_f5_star(uint8 *k,
AUTH_OPERATOR_CODE_TYPE opc_t,
uint8 *op,
uint8 *rand,
uint8 *ak);

8
lib/include/srslte/common/security.h
Unescape Escape View File

@ -33,7 +33,7 @@
#include "srslte/common/common.h"
#include "srslte/common/liblte_security.h"
#define SECURITY_DIRECTION_UPLINK 0
#define SECURITY_DIRECTION_DOWNLINK 1
@ -58,6 +58,12 @@ typedef enum{
static const char integrity_algorithm_id_text[INTEGRITY_ALGORITHM_ID_N_ITEMS][20] = {"EIA0",
"128-EIA1",
"128-EIA2"};
typedef enum
{
AUTH_OP,
AUTH_OPC
} AUTH_OPERATOR_CODE_TYPE;
/******************************************************************************
* Key Generation
*****************************************************************************/

4
lib/src/common/liblte_security.cc
Unescape Escape View File

@ -1099,7 +1099,6 @@ LIBLTE_ERROR_ENUM liblte_security_decryption_eea2(uint8 *key,
Document Reference: 35.206 v10.0.0 Annex 3
*********************************************************************/
LIBLTE_ERROR_ENUM liblte_security_milenage_f1(uint8 *k,
AUTH_OPERATOR_CODE_TYPE opc_t,
uint8 *op,
uint8 *rand,
uint8 *sqn,
@ -1189,7 +1188,6 @@ LIBLTE_ERROR_ENUM liblte_security_milenage_f1(uint8 *k,
Document Reference: 35.206 v10.0.0 Annex 3
*********************************************************************/
LIBLTE_ERROR_ENUM liblte_security_milenage_f1_star(uint8 *k,
AUTH_OPERATOR_CODE_TYPE opc_t,
uint8 *op,
uint8 *rand,
uint8 *sqn,
@ -1279,7 +1277,6 @@ LIBLTE_ERROR_ENUM liblte_security_milenage_f1_star(uint8 *k,
Document Reference: 35.206 v10.0.0 Annex 3
*********************************************************************/
LIBLTE_ERROR_ENUM liblte_security_milenage_f2345(uint8 *k,
AUTH_OPERATOR_CODE_TYPE opc_t,
uint8 *op,
uint8 *rand,
uint8 *res,
@ -1394,7 +1391,6 @@ LIBLTE_ERROR_ENUM liblte_security_milenage_f2345(uint8 *k,
Document Reference: 35.206 v10.0.0 Annex 3
*********************************************************************/
LIBLTE_ERROR_ENUM liblte_security_milenage_f5_star(uint8 *k,
AUTH_OPERATOR_CODE_TYPE opc_t,
uint8 *op,
uint8 *rand,
uint8 *ak)

9
lib/src/common/security.cc
Unescape Escape View File

@ -26,6 +26,7 @@
#include "srslte/common/security.h"
#include "srslte/common/liblte_security.h"
#include "srslte/common/snow_3g.h"
#ifdef HAVE_MBEDTLS
@ -230,7 +231,6 @@ uint8_t security_128_eea2(uint8_t *key,
*****************************************************************************/
uint8_t security_milenage_f1( uint8_t *k,
AUTH_OPERATOR_CODE_TYPE opc_t,
uint8_t *op,
uint8_t *rand,
uint8_t *sqn,
@ -238,7 +238,6 @@ uint8_t security_milenage_f1( uint8_t *k,
uint8_t *mac_a)
{
return liblte_security_milenage_f1(k,
opc_t,
op,
rand,
sqn,
@ -247,7 +246,6 @@ uint8_t security_milenage_f1( uint8_t *k,
}
uint8_t security_milenage_f1_star( uint8_t *k,
AUTH_OPERATOR_CODE_TYPE opc_t,
uint8_t *op,
uint8_t *rand,
uint8_t *sqn,
@ -255,7 +253,6 @@ uint8_t security_milenage_f1_star( uint8_t *k,
uint8_t *mac_s)
{
return liblte_security_milenage_f1_star(k,
opc_t,
op,
rand,
sqn,
@ -264,7 +261,6 @@ uint8_t security_milenage_f1_star( uint8_t *k,
}
uint8_t security_milenage_f2345( uint8_t *k,
AUTH_OPERATOR_CODE_TYPE opc_t,
uint8_t *op,
uint8_t *rand,
uint8_t *res,
@ -273,7 +269,6 @@ uint8_t security_milenage_f2345( uint8_t *k,
uint8_t *ak)
{
return liblte_security_milenage_f2345(k,
opc_t,
op,
rand,
res,
@ -283,13 +278,11 @@ uint8_t security_milenage_f2345( uint8_t *k,
}
uint8_t security_milenage_f5_star( uint8_t *k,
AUTH_OPERATOR_CODE_TYPE opc_t,
uint8_t *op,
uint8_t *rand,
uint8_t *ak)
{
return liblte_security_milenage_f5_star(k,
opc_t,
op,
rand,
ak);

22
lib/test/common/test_f12345.cc
Unescape Escape View File

@ -49,6 +49,8 @@ void arrprint(uint8_t const * const a, uint32 len) {
/*
* Functions
*/
void test_set_2()
{
LIBLTE_ERROR_ENUM err_lte = LIBLTE_ERROR_INVALID_INPUTS;
@ -59,18 +61,17 @@ void test_set_2()
uint8_t sqn[] = {0xff, 0x9b, 0xb4, 0xd0, 0xb6, 0x07};
uint8_t amf[] = {0xb9, 0xb9};
uint8_t op[] = {0xcd, 0xc2, 0x02, 0xd5, 0x12, 0x3e, 0x20, 0xf6, 0x2b, 0x6d, 0x67, 0x6a, 0xc7, 0x2c, 0xb3, 0x18};
// f1
uint8_t mac_o[8];
uint8_t mac_o[8];
err_lte = liblte_security_milenage_f1(k,
AUTH_OP,
op,
rand,
sqn,
amf,
mac_o);
assert(err_lte == LIBLTE_SUCCESS);
arrprint(mac_o, sizeof(mac_o));
uint8_t mac_a[] = {0x4a, 0x9f, 0xfa, 0xc3, 0x54, 0xdf, 0xaf, 0xb3};
@ -80,9 +81,9 @@ void test_set_2()
assert(err_cmp == 0);
// f1 star
uint8_t mac_so[8];
err_lte = liblte_security_milenage_f1_star(k,
AUTH_OP,
op,
rand,
sqn,
@ -105,7 +106,6 @@ void test_set_2()
uint8_t ak_o[6];
err_lte = liblte_security_milenage_f2345(k,
AUTH_OP,
op,
rand,
res_o,
@ -145,11 +145,7 @@ void test_set_2()
// f star
uint8_t ak_star_o[6];
err_lte = liblte_security_milenage_f5_star(k,
AUTH_OP,
op,
rand,
ak_star_o);
err_lte = liblte_security_milenage_f5_star(k, op, rand, ak_star_o);
assert(err_lte == LIBLTE_SUCCESS);
arrprint(ak_star_o, sizeof(ak_star_o));
@ -162,10 +158,10 @@ void test_set_2()
/*
Own test sets
*/
int main(int argc, char * argv[]) {
test_set_2();
int main(int argc, char * argv[]) {
/*
test_set_2();
test_set_3();
test_set_4();
test_set_5();

1
srsue/hdr/upper/usim.h
Unescape Escape View File

@ -109,7 +109,6 @@ private:
// User data
auth_algo_t auth_algo;
uint8_t amf[2]; // 3GPP 33.102 v10.0.0 Annex H
AUTH_OPERATOR_CODE_TYPE opc_t;
uint8_t op[16];
uint64_t imsi;
uint64_t imei;

2
srsue/src/upper/usim.cc
Unescape Escape View File

@ -341,7 +341,6 @@ auth_result_t usim::gen_auth_res_milenage(uint8_t *rand,
// Use RAND and K to compute RES, CK, IK and AK
security_milenage_f2345( k,
opc_t,
op,
rand,
res,
@ -364,7 +363,6 @@ auth_result_t usim::gen_auth_res_milenage(uint8_t *rand,
// Generate MAC
security_milenage_f1( k,
opc_t,
op,
rand,
sqn,

Write Preview
Loading…
Cancel
Save