summaryrefslogtreecommitdiff
path: root/cp/secu
diff options
context:
space:
mode:
authorchertier2008-04-02 09:55:03 +0000
committerchertier2008-04-02 09:55:03 +0000
commit15b706f128f2dd468b87e71fb97c35ec74da5461 (patch)
treee4716c9086d124b30099804a817e00cf6045c06d /cp/secu
parent406fd1686bd8d9234e06bed098ba022f059c6657 (diff)
replaced "sec_t" type definition by "cp_secu_t"
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@1731 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cp/secu')
-rw-r--r--cp/secu/inc/secu_types.h4
-rw-r--r--cp/secu/secu.h12
-rw-r--r--cp/secu/src/secu_lib.c14
3 files changed, 15 insertions, 15 deletions
diff --git a/cp/secu/inc/secu_types.h b/cp/secu/inc/secu_types.h
index 84bbe5f204..4d29da5857 100644
--- a/cp/secu/inc/secu_types.h
+++ b/cp/secu/inc/secu_types.h
@@ -114,13 +114,13 @@ typedef struct gen_key_t //(7.10.7.2) parameters for key generation
int count; // internal counter
} gen_key_t;
-typedef struct sec_t /* TODO : should be preferably renamed "cp_secu_t" ? */
+typedef struct cp_secu_t
{
sec_state_t sec_state; // (Join, Add, Accept)
security_parameters_t security_parameters;
tek_t tek;
bool kbc;
u8 eks;
-} sec_t; /* TODO : should be preferably renamed "cp_secu_t" ? */
+} cp_secu_t;
#endif
diff --git a/cp/secu/secu.h b/cp/secu/secu.h
index b33c4db636..6d1f614a8b 100644
--- a/cp/secu/secu.h
+++ b/cp/secu/secu.h
@@ -26,7 +26,7 @@
* \param ctx the security context
*/
void
-secu_init (sec_t *ctx);
+secu_init (cp_secu_t *ctx);
/**
* Uninitialize the security layer
@@ -34,7 +34,7 @@ secu_init (sec_t *ctx);
* \param ctx the security context
*/
void
-secu_uninit (sec_t *ctx);
+secu_uninit (cp_secu_t *ctx);
/**
* hash data or password.
@@ -96,7 +96,7 @@ E_ErrCode secu_npw2nmk(char *npw, u8 *nmk);
* \return the boolean value
*/
bool
-secu_get_kbc (sec_t *ctx);
+secu_get_kbc (cp_secu_t *ctx);
/**
* Get Key being changed.
@@ -107,7 +107,7 @@ secu_get_kbc (sec_t *ctx);
* \return the boolean value
*/
bool
-cp_secu_get_kbc (sec_t *ctx);
+cp_secu_get_kbc (cp_secu_t *ctx);
/**
* Get the new EKS for the next beacon period.
@@ -116,7 +116,7 @@ cp_secu_get_kbc (sec_t *ctx);
* \return the eks value.
*/
u8
-secu_get_eks (sec_t *ctx);
+secu_get_eks (cp_secu_t *ctx);
/**
* Get the new EKS for the next beacon period.
@@ -125,7 +125,7 @@ secu_get_eks (sec_t *ctx);
* \return the eks value.
*/
u8
-cp_secu_get_eks (sec_t *ctx);
+cp_secu_get_eks (cp_secu_t *ctx);
#endif
diff --git a/cp/secu/src/secu_lib.c b/cp/secu/src/secu_lib.c
index c29be6d87c..73e9ddd45b 100644
--- a/cp/secu/src/secu_lib.c
+++ b/cp/secu/src/secu_lib.c
@@ -24,11 +24,11 @@ static aes_key_t m_nmk;
void
-secu_init (sec_t *p_sec)
+secu_init (cp_secu_t *p_sec)
{
dbg_assert (p_sec);
- memset (p_sec, 0, sizeof(sec_t));
+ memset (p_sec, 0, sizeof(cp_secu_t));
memset (m_dak, 0, sizeof(m_dak));
memset (m_tek, 0, sizeof(m_tek));
@@ -56,7 +56,7 @@ secu_init (sec_t *p_sec)
}
void
-cp_secu_uninit (sec_t *ctx)
+cp_secu_uninit (cp_secu_t *ctx)
{
dbg_assert (ctx);
}
@@ -199,7 +199,7 @@ E_ErrCode secu_npw2nmk(char *npw, u8 *nmk)
}
bool
-secu_get_kbc (sec_t *ctx)
+secu_get_kbc (cp_secu_t *ctx)
{
dbg_assert (ctx);
@@ -207,7 +207,7 @@ secu_get_kbc (sec_t *ctx)
}
bool
-cp_secu_get_kbc (sec_t *ctx)
+cp_secu_get_kbc (cp_secu_t *ctx)
{
dbg_assert (ctx);
@@ -215,7 +215,7 @@ cp_secu_get_kbc (sec_t *ctx)
}
u8
-secu_get_eks (sec_t *ctx)
+secu_get_eks (cp_secu_t *ctx)
{
dbg_assert (ctx);
@@ -223,7 +223,7 @@ secu_get_eks (sec_t *ctx)
}
u8
-cp_secu_get_eks (sec_t *ctx)
+cp_secu_get_eks (cp_secu_t *ctx)
{
dbg_assert (ctx);