summaryrefslogtreecommitdiff
path: root/cp/secu
diff options
context:
space:
mode:
authorGuillaume2008-01-03 10:56:22 +0000
committerGuillaume2008-01-03 10:56:22 +0000
commita6c83054024a437300506bb6f96cd0fb45541d1d (patch)
tree10df4da6aa2e2320c435e26c2a79a62a22c592de /cp/secu
parent92104a95e8dbb23623a902efec526feaf45f2171 (diff)
work in progress
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@1201 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cp/secu')
-rw-r--r--cp/secu/inc/secu_p_run.h2
-rw-r--r--cp/secu/inc/secu_types.h6
-rw-r--r--cp/secu/src/secu_p_run.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/cp/secu/inc/secu_p_run.h b/cp/secu/inc/secu_p_run.h
index b90dad849c..0d0444bd60 100644
--- a/cp/secu/inc/secu_p_run.h
+++ b/cp/secu/inc/secu_p_run.h
@@ -35,7 +35,7 @@ secu_gen_nonce (const tei_t tei);
* \return error code or 0 if success
*/
void
-secu_start_new_protocol_run(const tei_t tei, const pid_t pid, protocol_run_t *p_run);
+secu_start_new_protocol_run(const tei_t tei, const cp_pid_t pid, protocol_run_t *p_run);
/**
* Check parameters of received protocol run
diff --git a/cp/secu/inc/secu_types.h b/cp/secu/inc/secu_types.h
index bc74c3c71a..552967bbaa 100644
--- a/cp/secu/inc/secu_types.h
+++ b/cp/secu/inc/secu_types.h
@@ -67,17 +67,17 @@ typedef enum sec_level_t
typedef enum sec_state_t
{ JOIN, ADD, ACCEPT} sec_state_t;
-typedef enum pid_t
+typedef enum cp_pid_t
{ AUTH_REQ_BY_NEW_STA = 0x0,
PROV_AUTH_STA_WITH_NEK = 0x1,
PROV_STA_WITH_NMK_U_DAK = 0x2,
PROV_STA_WITH_NMK_U_UKE = 0x3,
HLE_PRO = 0x4
-} pid_t;
+} cp_pid_t;
typedef struct protocol_run_t
{
- pid_t pid; // Protocol ID
+ cp_pid_t pid; // Protocol ID
s16 prn; // Protocol Run Number
u8 pmn; // Protocol Message Number
s32 nonce;
diff --git a/cp/secu/src/secu_p_run.c b/cp/secu/src/secu_p_run.c
index 101c3a274d..2161c9e4aa 100644
--- a/cp/secu/src/secu_p_run.c
+++ b/cp/secu/src/secu_p_run.c
@@ -41,7 +41,7 @@ secu_gen_nonce (const tei_t tei)
void
-secu_start_new_protocol_run(const tei_t tei, const pid_t pid, protocol_run_t *p_run)
+secu_start_new_protocol_run(const tei_t tei, const cp_pid_t pid, protocol_run_t *p_run)
{
u8 rand_num[AES_KEY_SIZE];