ran the indent program on the source files to make them consistent.

This commit is contained in:
skarg
2006-02-18 22:34:36 +00:00
parent 21b373c75c
commit b1d46ffa8c
72 changed files with 10446 additions and 11551 deletions
+80 -124
View File
@@ -37,71 +37,56 @@
#include "bacdef.h"
// encode service
int abort_encode_apdu(
uint8_t *apdu,
uint8_t invoke_id,
uint8_t abort_reason)
int abort_encode_apdu(uint8_t * apdu,
uint8_t invoke_id, uint8_t abort_reason)
{
int apdu_len = 0; // total length of the apdu, return value
int apdu_len = 0; // total length of the apdu, return value
if (apdu)
{
apdu[0] = PDU_TYPE_ABORT;
apdu[1] = invoke_id;
apdu[2] = abort_reason;
apdu_len = 3;
}
return apdu_len;
if (apdu) {
apdu[0] = PDU_TYPE_ABORT;
apdu[1] = invoke_id;
apdu[2] = abort_reason;
apdu_len = 3;
}
return apdu_len;
}
// decode the service request only
int abort_decode_service_request(
uint8_t *apdu,
unsigned apdu_len,
uint8_t *invoke_id,
uint8_t *abort_reason)
int abort_decode_service_request(uint8_t * apdu,
unsigned apdu_len, uint8_t * invoke_id, uint8_t * abort_reason)
{
int len = 0;
int len = 0;
if (apdu_len)
{
if (invoke_id)
*invoke_id = apdu[0];
if (abort_reason)
*abort_reason = apdu[1];
}
return len;
if (apdu_len) {
if (invoke_id)
*invoke_id = apdu[0];
if (abort_reason)
*abort_reason = apdu[1];
}
return len;
}
// decode the whole APDU - mainly used for unit testing
int abort_decode_apdu(
uint8_t *apdu,
unsigned apdu_len,
uint8_t *invoke_id,
uint8_t *abort_reason)
int abort_decode_apdu(uint8_t * apdu,
unsigned apdu_len, uint8_t * invoke_id, uint8_t * abort_reason)
{
int len = 0;
int len = 0;
if (!apdu)
return -1;
// optional checking - most likely was already done prior to this call
if (apdu_len)
{
if (apdu[0] != PDU_TYPE_ABORT)
return -1;
if (apdu_len > 1)
{
len = abort_decode_service_request(
&apdu[1],
apdu_len - 1,
invoke_id,
abort_reason);
if (!apdu)
return -1;
// optional checking - most likely was already done prior to this call
if (apdu_len) {
if (apdu[0] != PDU_TYPE_ABORT)
return -1;
if (apdu_len > 1) {
len = abort_decode_service_request(&apdu[1],
apdu_len - 1, invoke_id, abort_reason);
}
}
}
return len;
return len;
}
#ifdef TEST
@@ -111,83 +96,54 @@ int abort_decode_apdu(
void testAbort(Test * pTest)
{
uint8_t apdu[480] = {0};
int len = 0;
int apdu_len = 0;
uint8_t invoke_id = 0;
uint8_t abort_reason = 0;
uint8_t test_invoke_id = 0;
uint8_t test_abort_reason = 0;
len = abort_encode_apdu(
&apdu[0],
invoke_id,
abort_reason);
ct_test(pTest, len != 0);
apdu_len = len;
uint8_t apdu[480] = { 0 };
int len = 0;
int apdu_len = 0;
uint8_t invoke_id = 0;
uint8_t abort_reason = 0;
uint8_t test_invoke_id = 0;
uint8_t test_abort_reason = 0;
len = abort_decode_apdu(
&apdu[0],
apdu_len,
&test_invoke_id,
&test_abort_reason);
ct_test(pTest, len != -1);
ct_test(pTest, test_invoke_id == invoke_id);
ct_test(pTest, test_abort_reason == abort_reason);
len = abort_encode_apdu(&apdu[0], invoke_id, abort_reason);
ct_test(pTest, len != 0);
apdu_len = len;
// change type to get negative response
apdu[0] = PDU_TYPE_REJECT;
len = abort_decode_apdu(
&apdu[0],
apdu_len,
&test_invoke_id,
&test_abort_reason);
ct_test(pTest, len == -1);
len = abort_decode_apdu(&apdu[0],
apdu_len, &test_invoke_id, &test_abort_reason);
ct_test(pTest, len != -1);
ct_test(pTest, test_invoke_id == invoke_id);
ct_test(pTest, test_abort_reason == abort_reason);
// test NULL APDU
len = abort_decode_apdu(
NULL,
apdu_len,
&test_invoke_id,
&test_abort_reason);
ct_test(pTest, len == -1);
// change type to get negative response
apdu[0] = PDU_TYPE_REJECT;
len = abort_decode_apdu(&apdu[0],
apdu_len, &test_invoke_id, &test_abort_reason);
ct_test(pTest, len == -1);
// force a zero length
len = abort_decode_apdu(
&apdu[0],
0,
&test_invoke_id,
&test_abort_reason);
ct_test(pTest, len == 0);
// check them all...
for (
invoke_id = 0;
invoke_id < 255;
invoke_id++)
{
for (
abort_reason = 0;
abort_reason < 255;
abort_reason++)
{
len = abort_encode_apdu(
&apdu[0],
invoke_id,
abort_reason);
apdu_len = len;
ct_test(pTest, len != 0);
len = abort_decode_apdu(
&apdu[0],
apdu_len,
&test_invoke_id,
&test_abort_reason);
ct_test(pTest, len != -1);
ct_test(pTest, test_invoke_id == invoke_id);
ct_test(pTest, test_abort_reason == abort_reason);
// test NULL APDU
len = abort_decode_apdu(NULL,
apdu_len, &test_invoke_id, &test_abort_reason);
ct_test(pTest, len == -1);
// force a zero length
len = abort_decode_apdu(&apdu[0],
0, &test_invoke_id, &test_abort_reason);
ct_test(pTest, len == 0);
// check them all...
for (invoke_id = 0; invoke_id < 255; invoke_id++) {
for (abort_reason = 0; abort_reason < 255; abort_reason++) {
len = abort_encode_apdu(&apdu[0], invoke_id, abort_reason);
apdu_len = len;
ct_test(pTest, len != 0);
len = abort_decode_apdu(&apdu[0],
apdu_len, &test_invoke_id, &test_abort_reason);
ct_test(pTest, len != -1);
ct_test(pTest, test_invoke_id == invoke_id);
ct_test(pTest, test_abort_reason == abort_reason);
}
}
}
}
#ifdef TEST_ABORT