summaryrefslogtreecommitdiff
path: root/cesar
diff options
context:
space:
mode:
authormercadie2010-05-27 14:27:42 +0000
committermercadie2010-05-27 14:27:42 +0000
commit2c51d100dea2502898c3ac28e3150088a3409c5c (patch)
tree4c9ab2fc2ae82ffe73e61ebd9a64609b04c0e9e0 /cesar
parente95f798b7de1421afbe5ca4e40edbc086c713db9 (diff)
cesar/cp/msg/test: fix test test-msg-cm
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@7136 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cesar')
-rw-r--r--cesar/cp/msg/test/src/msg_cm.c21
1 files changed, 10 insertions, 11 deletions
diff --git a/cesar/cp/msg/test/src/msg_cm.c b/cesar/cp/msg/test/src/msg_cm.c
index 70146b5716..c76b7e507e 100644
--- a/cesar/cp/msg/test/src/msg_cm.c
+++ b/cesar/cp/msg/test/src/msg_cm.c
@@ -167,11 +167,10 @@ test_case_cm_set_key (test_t test)
{
bool ok;
- bitstream_direct_write (buffer, 66* 8, CP_MSG_KEY_NB, 8);
+ bitstream_direct_write (buffer, 68* 8, CP_MSG_KEY_NB, 8);
memset (&key_req, 0, sizeof (cp_msg_cm_set_key_req_t));
-
msg = cp_msg_mme_read_header (&cp, (u8*)buffer, buffer_len, 0xa, &fmi);
- bitstream_skip (&msg->bitstream, 47*8);
+ bitstream_skip (&msg->bitstream, 49*8);
msg->length = 57;
ok = cp_msg_cm_set_key_req_receive (&cp, msg, &key_req);
@@ -185,7 +184,7 @@ test_case_cm_set_key (test_t test)
test_fail_unless (msg->prun.pmn == prun.pmn, "Wrong PMN");
test_fail_unless (msg->prun.your_nonce == prun.my_nonce , "Wrong nonce");
- bitstream_direct_write (buffer, 66 * 8, CP_MSG_KEY_TEK, 8);
+ bitstream_direct_write (buffer, 68 * 8, CP_MSG_KEY_TEK, 8);
slab_release (msg);
}
@@ -195,11 +194,11 @@ test_case_cm_set_key (test_t test)
{
bool ok;
- bitstream_direct_write (buffer, 79* 8, CP_CCO_LEVEL_MAX + 1, 8);
+ bitstream_direct_write (buffer, 81* 8, CP_CCO_LEVEL_MAX + 1, 8);
memset (&key_req, 0, sizeof (cp_msg_cm_set_key_req_t));
msg = cp_msg_mme_read_header (&cp, (u8*)buffer, buffer_len, 0xa, &fmi);
- bitstream_skip (&msg->bitstream, 47*8);
+ bitstream_skip (&msg->bitstream, 49*8);
msg->length = 57;
ok = cp_msg_cm_set_key_req_receive (&cp, msg, &key_req);
@@ -213,7 +212,7 @@ test_case_cm_set_key (test_t test)
test_fail_unless (msg->prun.pmn == prun.pmn, "Wrong PMN");
test_fail_unless (msg->prun.your_nonce == prun.my_nonce , "Wrong nonce");
- bitstream_direct_write (buffer, 79 * 8, CP_CCO_LEVEL, 8);
+ bitstream_direct_write (buffer, 81 * 8, CP_CCO_LEVEL, 8);
slab_release (msg);
}
@@ -223,11 +222,11 @@ test_case_cm_set_key (test_t test)
{
bool ok;
- bitstream_direct_write_large (buffer, 80* 8, nid << 2, 56);
+ bitstream_direct_write_large (buffer, 82* 8, nid << 2, 56);
memset (&key_req, 0, sizeof (cp_msg_cm_set_key_req_t));
msg = cp_msg_mme_read_header (&cp, (u8*)buffer, buffer_len, 0xa, &fmi);
- bitstream_skip (&msg->bitstream, 47*8);
+ bitstream_skip (&msg->bitstream, 49*8);
ok = cp_msg_cm_set_key_req_receive (&cp, msg, &key_req);
@@ -240,7 +239,7 @@ test_case_cm_set_key (test_t test)
test_fail_unless (msg->prun.pmn == prun.pmn, "Wrong PMN");
test_fail_unless (msg->prun.your_nonce == prun.my_nonce , "Wrong nonce");
- bitstream_direct_write_large (buffer, 80* 8, nid, 56);
+ bitstream_direct_write_large (buffer, 82* 8, nid, 56);
slab_release (msg);
}
@@ -275,7 +274,7 @@ test_case_cm_set_key (test_t test)
bool ok;
memset (&key_cnf, 0, sizeof (cp_msg_cm_set_key_cnf_t));
- msg = cp_msg_mme_read_header (&cp, (u8*)buffer, 91, 0xa, &fmi);
+ msg = cp_msg_mme_read_header (&cp, (u8*)buffer, buffer_len, 0xa, &fmi);
ok = cp_msg_mme_read_header_enc (&cp, msg);
test_fail_unless (ok == true);
ok = cp_msg_cm_set_key_cnf_receive (&cp, msg, &key_cnf);