From 242b2b13964bc38e9f8ac29b88efa9389a61b4c8 Mon Sep 17 00:00:00 2001
From: Lionel Gauthier <lionel.gauthier@eurecom.fr>
Date: Thu, 28 May 2015 15:04:44 +0000
Subject: [PATCH] clean commented code
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7485 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
openair-cn/OPENAIRHSS/auc/fx.c | 26 --------------------------
openair-cn/OPENAIRHSS/auc/kdf.c | 3 +--
2 files changed, 1 insertion(+), 28 deletions(-)
diff --git a/openair-cn/OPENAIRHSS/auc/fx.c b/openair-cn/OPENAIRHSS/auc/fx.c
index 446599a86d..31d8d05b22 100644
--- a/openair-cn/OPENAIRHSS/auc/fx.c
+++ b/openair-cn/OPENAIRHSS/auc/fx.c
@@ -65,11 +65,6 @@ void f1 ( const uint8_t const opc[16], const uint8_t const k[16], const uint8_t
uint8_t rijndaelInput[16];
uint8_t i;
RijndaelKeySchedule( k );
- /*
- if (hss_config.valid_op > 0) {
- SetOP(hss_config.operator_key);
- ComputeOPc( opc );
- }*/
for (i=0; i<16; i++)
rijndaelInput[i] = _rand[i] ^ opc[i];
@@ -123,11 +118,6 @@ void f2345 ( const uint8_t const opc[16], const uint8_t const k[16], const uint8
uint8_t i;
RijndaelKeySchedule( k );
- /*if (hss_config.valid_op > 0) {
- SetOP(hss_config.operator_key);
- ComputeOPc( opc );
- }*/
-
for (i=0; i<16; i++)
rijndaelInput[i] = _rand[i] ^ opc[i];
@@ -203,14 +193,6 @@ void f1star( const uint8_t const opc[16], const uint8_t const k[16], const uint8
uint8_t rijndaelInput[16];
uint8_t i;
RijndaelKeySchedule( k );
- /*if (hss_config.valid_opc == 0) {
- SetOP(hss_config.operator_key);
- ComputeOPc( opc );
- } else {
- printf("Using opc: %02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X\n",
- opc[0],opc[1],opc[2],opc[3],opc[4],opc[5],opc[6],opc[7],
- opc[8],opc[9],opc[10],opc[11],opc[12],opc[13],opc[14],opc[15] );
- }*/
for (i=0; i<16; i++)
rijndaelInput[i] = _rand[i] ^ opc[i];
@@ -264,14 +246,6 @@ void f5star( const uint8_t const opc[16], const uint8_t const k[16], const uint8
uint8_t i;
RijndaelKeySchedule( k );
- /*if (hss_config.valid_opc == 0) {
- SetOP(hss_config.operator_key);
- ComputeOPc(opc);
- } else {
- printf("Using OPc: %02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X\n",
- opc[0],opc[1],opc[2],opc[3],opc[4],opc[5],opc[6],opc[7],
- opc[8],opc[9],opc[10],opc[11],opc[12],opc[13],opc[14],opc[15]);
- }*/
for (i=0; i<16; i++)
rijndaelInput[i] = _rand[i] ^ opc[i];
diff --git a/openair-cn/OPENAIRHSS/auc/kdf.c b/openair-cn/OPENAIRHSS/auc/kdf.c
index 8c83c9665a..a806513cbc 100644
--- a/openair-cn/OPENAIRHSS/auc/kdf.c
+++ b/openair-cn/OPENAIRHSS/auc/kdf.c
@@ -138,8 +138,7 @@ int generate_vector(const uint8_t const opc[16], uint64_t imsi, uint8_t key[16],
* - KASME
*/
- //uint8_t amf[] = { 0x80, 0x00 };
- uint8_t amf[] = { 0x90, 0x01 };
+ uint8_t amf[] = { 0x80, 0x00 };
uint8_t mac_a[8];
uint8_t ck[16];
uint8_t ik[16];
--
GitLab