summaryrefslogtreecommitdiff
path: root/cp
diff options
context:
space:
mode:
authorlaranjeiro2008-04-03 07:17:19 +0000
committerlaranjeiro2008-04-03 07:17:19 +0000
commit135530bdcebf8a2480f3d28f5bbd7c90c866d40f (patch)
tree958dc55a0c7bd65c978407f75a26eade25ce5f71 /cp
parentb75bbd48b30020b8b55248d7b66d2834c656c808 (diff)
Removed the secu in the beacons.
The context secu in beacons is provided but never use nether asserted if it is null. git-svn-id: svn+ssh://pessac/svn/cesar/trunk@1738 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cp')
-rw-r--r--cp/beacon/src/beacons.c7
-rw-r--r--cp/beacon/src/bentry.c4
-rw-r--r--cp/beacon/test/cco/Makefile2
-rw-r--r--cp/beacon/test/central_beacon/Makefile8
-rw-r--r--cp/beacon/test/central_beacon/src/bentry_test.c10
-rw-r--r--cp/beacon/test/central_beacon/src/cco_request_discover_beacon.c2
-rw-r--r--cp/beacon/test/central_beacon/src/central_beacon.c3
-rw-r--r--cp/beacon/test/central_beacon/src/usta.c4
-rw-r--r--cp/beacon/test/overide/cp/secu/Module1
-rw-r--r--cp/beacon/test/overide/cp/secu/inc/context.h24
-rw-r--r--cp/beacon/test/overide/cp/secu/secu.h58
-rw-r--r--cp/beacon/test/overide/cp/secu/src/secu.c74
12 files changed, 22 insertions, 175 deletions
diff --git a/cp/beacon/src/beacons.c b/cp/beacon/src/beacons.c
index 470410996b..e8e802a3e7 100644
--- a/cp/beacon/src/beacons.c
+++ b/cp/beacon/src/beacons.c
@@ -63,7 +63,12 @@ cp_beacon_init(interface_t *interface, phy_t *phy, cp_sta_t *sta,
dbg_assert(interface);
dbg_assert(phy);
dbg_assert(sta);
- dbg_assert(secu);
+
+ /* Laranjeiro 03/04/2008
+ * removed the test on secu, shall not be use actually in the beacons
+ * until the new version of the CP is not ready.
+ */
+ //dbg_assert(secu);
dbg_assert(ca);
dbg_assert(mac_store);
dbg_assert(pbproc);
diff --git a/cp/beacon/src/bentry.c b/cp/beacon/src/bentry.c
index f18aa52402..82fd2df480 100644
--- a/cp/beacon/src/bentry.c
+++ b/cp/beacon/src/bentry.c
@@ -454,8 +454,8 @@ cp_bentry_encryption_key_change (cp_beacon_t *ctx, u8 *bentry_addr)
CP_BENTRY_BYTE_SIZEOF(CP_BENTRY_HEADER));
data.kccd = ctx->bentries_data.kccd;
- data.kbc = cp_secu_get_kbc (ctx->secu);
- data.new_eks = cp_secu_get_eks (ctx->secu);
+ data.kbc = 0x0;
+ data.new_eks = 0x0;
bitstream_init (&bitstream, data_addr, CP_BENTRY_BIT_SIZE_EKC,
BITSTREAM_WRITE);
diff --git a/cp/beacon/test/cco/Makefile b/cp/beacon/test/cco/Makefile
index f63de1cfcb..f740421477 100644
--- a/cp/beacon/test/cco/Makefile
+++ b/cp/beacon/test/cco/Makefile
@@ -11,7 +11,6 @@ ucco_SOURCES = ucco.c phy_stub.c ca_stub.c cl_stub.c sar_stub.c ipmbox_stub.c \
ucco_MODULES = lib mac/common cp/beacon hal/timer hal/leon/unit-test \
interface interface/sniffer \
cp/beacon/test/overide/cp/station \
- cp/beacon/test/overide/cp/secu \
cp/beacon/test/overide/cp/cco
cco_SOURCES = cco.c phy_stub.c ca_stub.c cl_stub.c sar_stub.c ipmbox_stub.c \
@@ -19,7 +18,6 @@ cco_SOURCES = cco.c phy_stub.c ca_stub.c cl_stub.c sar_stub.c ipmbox_stub.c \
cco_MODULES = lib mac/common cp/beacon hal/timer hal/leon/unit-test \
interface interface/sniffer \
cp/beacon/test/overide/cp/station \
- cp/beacon/test/overide/cp/secu \
cp/beacon/test/overide/cp/cco
cp_beacon_MODULE_SOURCES = beacons.c bentry.c
diff --git a/cp/beacon/test/central_beacon/Makefile b/cp/beacon/test/central_beacon/Makefile
index 14a02e7fd1..4d964fcdf5 100644
--- a/cp/beacon/test/central_beacon/Makefile
+++ b/cp/beacon/test/central_beacon/Makefile
@@ -11,36 +11,31 @@ ac_line_SOURCES = ac_line_test.c phy_stub.c pbproc_stub.c ca_stub.c \
ac_line_MODULES = lib mac/common cp/beacon hal/timer hal/leon/unit-test \
interface interface/sniffer \
cp/beacon/test/overide/cp/station \
- cp/beacon/test/overide/cp/secu \
- cp/beacon/test/overide/cp/cco
+ cp/beacon/test/overide/cp/cco
estimation_SOURCES = bts_bto_bp.c phy_stub.c pbproc_stub.c ca_stub.c \
cl_stub.c sar_stub.c ipmbox_stub.c hle_stub.c
estimation_MODULES = lib mac/common cp/beacon hal/timer hal/leon/unit-test \
interface interface/sniffer \
cp/beacon/test/overide/cp/station \
- cp/beacon/test/overide/cp/secu \
cp/beacon/test/overide/cp/cco
central_beacon_SOURCES = central_beacon.c phy_stub.c cl_stub.c sar_stub.c ipmbox_stub.c hle_stub.c
central_beacon_MODULES = lib mac/common cp/beacon hal/timer hal/leon/unit-test \
interface interface/sniffer \
cp/beacon/test/overide/cp/station \
- cp/beacon/test/overide/cp/secu \
cp/beacon/test/overide/cp/cco
usta_SOURCES = usta.c phy_stub.c pbproc_stub.c cl_stub.c sar_stub.c ipmbox_stub.c hle_stub.c
usta_MODULES = lib mac/common cp/beacon hal/timer hal/leon/unit-test \
interface interface/sniffer \
cp/beacon/test/overide/cp/station \
- cp/beacon/test/overide/cp/secu \
cp/beacon/test/overide/cp/cco
bentry_test_SOURCES = bentry_test.c phy_stub.c cl_stub.c sar_stub.c ipmbox_stub.c hle_stub.c
bentry_test_MODULES = lib mac/common cp/beacon hal/timer hal/leon/unit-test \
interface interface/sniffer \
cp/beacon/test/overide/cp/station \
- cp/beacon/test/overide/cp/secu \
cp/beacon/test/overide/cp/cco
@@ -50,7 +45,6 @@ cco_request_discover_MODULES = lib mac/common cp/beacon hal/timer \
hal/leon/unit-test \
interface interface/sniffer \
cp/beacon/test/overide/cp/station \
- cp/beacon/test/overide/cp/secu \
cp/beacon/test/overide/cp/cco
diff --git a/cp/beacon/test/central_beacon/src/bentry_test.c b/cp/beacon/test/central_beacon/src/bentry_test.c
index 1a173833a2..317fdb202c 100644
--- a/cp/beacon/test/central_beacon/src/bentry_test.c
+++ b/cp/beacon/test/central_beacon/src/bentry_test.c
@@ -36,7 +36,7 @@
#include "cp/cco/inc/context.h"
#include "cp/station/inc/context.h"
-#include "cp/secu/inc/context.h"
+#include "cp/secu/inc/secu_types.h"
#include "hal/timer/timer.h"
@@ -482,8 +482,14 @@ test_security_key_change (void)
test_begin (test, "Key change")
{
test_fail_if (data.kccd != cp_beacon->bentries_data.kccd, "Wrong kccd countdown");
- test_fail_if (data.kbc != secu->kbc, "Wrong kbc");
+
+ /* TODO not tested cause of the modifications of the CP
+ * 03/04/2008.
+ * Laranjeiro
+ */
+ /*test_fail_if (data.kbc != secu->kbc, "Wrong kbc");
test_fail_if (data.new_eks != secu->eks, "Wrong eks");
+ */
}
test_end;
}
diff --git a/cp/beacon/test/central_beacon/src/cco_request_discover_beacon.c b/cp/beacon/test/central_beacon/src/cco_request_discover_beacon.c
index 9edc426783..7ea232cec3 100644
--- a/cp/beacon/test/central_beacon/src/cco_request_discover_beacon.c
+++ b/cp/beacon/test/central_beacon/src/cco_request_discover_beacon.c
@@ -38,7 +38,7 @@
#include "cp/cco/inc/context.h"
#include "cp/station/inc/context.h"
-#include "cp/secu/inc/context.h"
+#include "cp/secu/inc/secu_types.h"
#include "hal/timer/timer.h"
diff --git a/cp/beacon/test/central_beacon/src/central_beacon.c b/cp/beacon/test/central_beacon/src/central_beacon.c
index f1600e1e08..f33eeb753e 100644
--- a/cp/beacon/test/central_beacon/src/central_beacon.c
+++ b/cp/beacon/test/central_beacon/src/central_beacon.c
@@ -37,7 +37,8 @@
#include "cp/cco/inc/context.h"
#include "cp/station/inc/context.h"
-#include "cp/secu/inc/context.h"
+//#include "cp/secu/inc/context.h"
+#include "cp/secu/inc/secu_types.h"
#include "hal/timer/timer.h"
diff --git a/cp/beacon/test/central_beacon/src/usta.c b/cp/beacon/test/central_beacon/src/usta.c
index 2176a038ae..35501755c9 100644
--- a/cp/beacon/test/central_beacon/src/usta.c
+++ b/cp/beacon/test/central_beacon/src/usta.c
@@ -72,7 +72,7 @@ main (void)
cco = cp_cco_init ();
sta = cp_station_init (mac_store, cl, pbproc, mac_config);
- secu = cp_secu_init ();
+// secu = cp_secu_init ();
mac_ntb_init (phy, mac_config);
timer = hal_timer_init (phy);
@@ -86,7 +86,7 @@ main (void)
mac_store_uninit (mac_store);
cp_beacon_uninit (cp_beacon);
hal_timer_uninit (timer);
- cp_secu_uninit (secu);
+// cp_secu_uninit (secu);
cp_station_uninit (sta);
blk_release (phy);
blk_release (mac_config);
diff --git a/cp/beacon/test/overide/cp/secu/Module b/cp/beacon/test/overide/cp/secu/Module
deleted file mode 100644
index 9087aae87c..0000000000
--- a/cp/beacon/test/overide/cp/secu/Module
+++ /dev/null
@@ -1 +0,0 @@
-SOURCES:=secu.c
diff --git a/cp/beacon/test/overide/cp/secu/inc/context.h b/cp/beacon/test/overide/cp/secu/inc/context.h
deleted file mode 100644
index f7772ad9bc..0000000000
--- a/cp/beacon/test/overide/cp/secu/inc/context.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef cp_beacon_test_central_beacon_overide_cp_secu_inc_context_h
-#define cp_beacon_test_central_beacon_overide_cp_secu_inc_context_h
-/* Cesar project {{{
- *
- * Copyright (C) 2008 Spidcom
- *
- * <<<Licence>>>
- *
- * }}} */
-/**
- * \file cp/beacon/test/central_beacon/overide/cp/secu/inc/context.h
- * \brief « brief description »
- * \ingroup « module »
- *
- * « long description »
- */
-
-struct cp_secu_t
-{
- bool kbc;
- u8 eks;
-};
-
-#endif /* cp_beacon_test_central_beacon_overide_cp_secu_inc_context_h */
diff --git a/cp/beacon/test/overide/cp/secu/secu.h b/cp/beacon/test/overide/cp/secu/secu.h
deleted file mode 100644
index c571679059..0000000000
--- a/cp/beacon/test/overide/cp/secu/secu.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef cp_beacon_test_central_beacon_overide_cp_secu_secu_h
-#define cp_beacon_test_central_beacon_overide_cp_secu_secu_h
-/* Cesar project {{{
- *
- * Copyright (C) 2008 Spidcom
- *
- * <<<Licence>>>
- *
- * }}} */
-/**
- * \file cp/beacon/test/central_beacon/overide/cp/secu/secu.h
- * \brief « brief description »
- * \ingroup « module »
- *
- * « long description »
- */
-
-#include "cp/secu/secu.h"
-
-typedef struct cp_secu_t cp_secu_t;
-
-/**
- * Initialize the security layer
- *
- * \return the security context.
- */
-cp_secu_t *
-cp_secu_init (void);
-
-/**
- * Uninitialize the seucurity layer
- *
- * \param ctx the security context.
- */
-void
-cp_secu_uninit (cp_secu_t *ctx);
-
-/**
- * Get Key being change
- * 0 for a frame level encyption key NEK.
- * 1 for a payload encryption key.
- *
- * \param ctx the security context.
- * \return the boolean value
- */
-bool
-cp_secu_get_kbc (cp_secu_t *ctx);
-
-/**
- * Get the new EKS for the next beacon period.
- *
- * \param ctx the security context
- * \return the eks value.
- */
-u8
-cp_secu_get_eks (cp_secu_t *ctx);
-
-#endif /* cp_beacon_test_central_beacon_overide_cp_secu_secu_h */
diff --git a/cp/beacon/test/overide/cp/secu/src/secu.c b/cp/beacon/test/overide/cp/secu/src/secu.c
deleted file mode 100644
index b2fa99d671..0000000000
--- a/cp/beacon/test/overide/cp/secu/src/secu.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Cesar project {{{
- *
- * Copyright (C) 2008 Spidcom
- *
- * <<<Licence>>>
- *
- * }}} */
-/**
- * \file cp/beacon/test/central_beacon/overide/cp/secu/src/secu.c
- * \brief « brief description »
- * \ingroup « module »
- *
- * « long description »
- */
-#include "common/std.h"
-
-#include "cp/secu/secu.h"
-#include "cp/secu/inc/context.h"
-
-// static declaration
-static cp_secu_t secu_global;
-
-/**
- * Initialize the security layer
- *
- * \return the security context.
- */
-cp_secu_t *
-cp_secu_init (void)
-{
- return &secu_global;
-}
-
-/**
- * Uninitialize the seucurity layer
- *
- * \param ctx the security context.
- */
-void
-cp_secu_uninit (cp_secu_t *ctx)
-{
- dbg_assert (ctx);
-}
-
-/**
- * Get Key being change
- * 0 for a frame level encyption key NEK.
- * 1 for a payload encryption key.
- *
- * \param ctx the security context.
- * \return the boolean value
- */
-bool
-cp_secu_get_kbc (cp_secu_t *ctx)
-{
- dbg_assert (ctx);
-
- return ctx->kbc;
-}
-
-/**
- * Get the new EKS for the next beacon period.
- *
- * \param ctx the security context
- * \return the eks value.
- */
-u8
-cp_secu_get_eks (cp_secu_t *ctx)
-{
- dbg_assert (ctx);
-
- return ctx->eks;
-}
-