ran the indent program on the source files to make them consistent.
This commit is contained in:
+80
-124
@@ -37,71 +37,56 @@
|
||||
#include "bacdef.h"
|
||||
|
||||
// encode service
|
||||
int reject_encode_apdu(
|
||||
uint8_t *apdu,
|
||||
uint8_t invoke_id,
|
||||
uint8_t reject_reason)
|
||||
int reject_encode_apdu(uint8_t * apdu,
|
||||
uint8_t invoke_id, uint8_t reject_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_REJECT;
|
||||
apdu[1] = invoke_id;
|
||||
apdu[2] = reject_reason;
|
||||
apdu_len = 3;
|
||||
}
|
||||
|
||||
return apdu_len;
|
||||
if (apdu) {
|
||||
apdu[0] = PDU_TYPE_REJECT;
|
||||
apdu[1] = invoke_id;
|
||||
apdu[2] = reject_reason;
|
||||
apdu_len = 3;
|
||||
}
|
||||
|
||||
return apdu_len;
|
||||
}
|
||||
|
||||
// decode the service request only
|
||||
int reject_decode_service_request(
|
||||
uint8_t *apdu,
|
||||
unsigned apdu_len,
|
||||
uint8_t *invoke_id,
|
||||
uint8_t *reject_reason)
|
||||
int reject_decode_service_request(uint8_t * apdu,
|
||||
unsigned apdu_len, uint8_t * invoke_id, uint8_t * reject_reason)
|
||||
{
|
||||
int len = 0;
|
||||
int len = 0;
|
||||
|
||||
if (apdu_len)
|
||||
{
|
||||
if (invoke_id)
|
||||
*invoke_id = apdu[0];
|
||||
if (reject_reason)
|
||||
*reject_reason = apdu[1];
|
||||
}
|
||||
|
||||
return len;
|
||||
if (apdu_len) {
|
||||
if (invoke_id)
|
||||
*invoke_id = apdu[0];
|
||||
if (reject_reason)
|
||||
*reject_reason = apdu[1];
|
||||
}
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
// decode the whole APDU - mainly used for unit testing
|
||||
int reject_decode_apdu(
|
||||
uint8_t *apdu,
|
||||
unsigned apdu_len,
|
||||
uint8_t *invoke_id,
|
||||
uint8_t *reject_reason)
|
||||
int reject_decode_apdu(uint8_t * apdu,
|
||||
unsigned apdu_len, uint8_t * invoke_id, uint8_t * reject_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_REJECT)
|
||||
return -1;
|
||||
if (apdu_len > 1)
|
||||
{
|
||||
len = reject_decode_service_request(
|
||||
&apdu[1],
|
||||
apdu_len - 1,
|
||||
invoke_id,
|
||||
reject_reason);
|
||||
if (!apdu)
|
||||
return -1;
|
||||
// optional checking - most likely was already done prior to this call
|
||||
if (apdu_len) {
|
||||
if (apdu[0] != PDU_TYPE_REJECT)
|
||||
return -1;
|
||||
if (apdu_len > 1) {
|
||||
len = reject_decode_service_request(&apdu[1],
|
||||
apdu_len - 1, invoke_id, reject_reason);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return len;
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
#ifdef TEST
|
||||
@@ -111,83 +96,54 @@ int reject_decode_apdu(
|
||||
|
||||
void testReject(Test * pTest)
|
||||
{
|
||||
uint8_t apdu[480] = {0};
|
||||
int len = 0;
|
||||
int apdu_len = 0;
|
||||
uint8_t invoke_id = 0;
|
||||
uint8_t reject_reason = 0;
|
||||
uint8_t test_invoke_id = 0;
|
||||
uint8_t test_reject_reason = 0;
|
||||
|
||||
len = reject_encode_apdu(
|
||||
&apdu[0],
|
||||
invoke_id,
|
||||
reject_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 reject_reason = 0;
|
||||
uint8_t test_invoke_id = 0;
|
||||
uint8_t test_reject_reason = 0;
|
||||
|
||||
len = reject_decode_apdu(
|
||||
&apdu[0],
|
||||
apdu_len,
|
||||
&test_invoke_id,
|
||||
&test_reject_reason);
|
||||
ct_test(pTest, len != -1);
|
||||
ct_test(pTest, test_invoke_id == invoke_id);
|
||||
ct_test(pTest, test_reject_reason == reject_reason);
|
||||
len = reject_encode_apdu(&apdu[0], invoke_id, reject_reason);
|
||||
ct_test(pTest, len != 0);
|
||||
apdu_len = len;
|
||||
|
||||
// change type to get negative response
|
||||
apdu[0] = PDU_TYPE_ABORT;
|
||||
len = reject_decode_apdu(
|
||||
&apdu[0],
|
||||
apdu_len,
|
||||
&test_invoke_id,
|
||||
&test_reject_reason);
|
||||
ct_test(pTest, len == -1);
|
||||
len = reject_decode_apdu(&apdu[0],
|
||||
apdu_len, &test_invoke_id, &test_reject_reason);
|
||||
ct_test(pTest, len != -1);
|
||||
ct_test(pTest, test_invoke_id == invoke_id);
|
||||
ct_test(pTest, test_reject_reason == reject_reason);
|
||||
|
||||
// test NULL APDU
|
||||
len = reject_decode_apdu(
|
||||
NULL,
|
||||
apdu_len,
|
||||
&test_invoke_id,
|
||||
&test_reject_reason);
|
||||
ct_test(pTest, len == -1);
|
||||
// change type to get negative response
|
||||
apdu[0] = PDU_TYPE_ABORT;
|
||||
len = reject_decode_apdu(&apdu[0],
|
||||
apdu_len, &test_invoke_id, &test_reject_reason);
|
||||
ct_test(pTest, len == -1);
|
||||
|
||||
// force a zero length
|
||||
len = reject_decode_apdu(
|
||||
&apdu[0],
|
||||
0,
|
||||
&test_invoke_id,
|
||||
&test_reject_reason);
|
||||
ct_test(pTest, len == 0);
|
||||
|
||||
|
||||
// check them all...
|
||||
for (
|
||||
invoke_id = 0;
|
||||
invoke_id < 255;
|
||||
invoke_id++)
|
||||
{
|
||||
for (
|
||||
reject_reason = 0;
|
||||
reject_reason < 255;
|
||||
reject_reason++)
|
||||
{
|
||||
len = reject_encode_apdu(
|
||||
&apdu[0],
|
||||
invoke_id,
|
||||
reject_reason);
|
||||
apdu_len = len;
|
||||
ct_test(pTest, len != 0);
|
||||
len = reject_decode_apdu(
|
||||
&apdu[0],
|
||||
apdu_len,
|
||||
&test_invoke_id,
|
||||
&test_reject_reason);
|
||||
ct_test(pTest, len != -1);
|
||||
ct_test(pTest, test_invoke_id == invoke_id);
|
||||
ct_test(pTest, test_reject_reason == reject_reason);
|
||||
// test NULL APDU
|
||||
len = reject_decode_apdu(NULL,
|
||||
apdu_len, &test_invoke_id, &test_reject_reason);
|
||||
ct_test(pTest, len == -1);
|
||||
|
||||
// force a zero length
|
||||
len = reject_decode_apdu(&apdu[0],
|
||||
0, &test_invoke_id, &test_reject_reason);
|
||||
ct_test(pTest, len == 0);
|
||||
|
||||
|
||||
// check them all...
|
||||
for (invoke_id = 0; invoke_id < 255; invoke_id++) {
|
||||
for (reject_reason = 0; reject_reason < 255; reject_reason++) {
|
||||
len = reject_encode_apdu(&apdu[0], invoke_id, reject_reason);
|
||||
apdu_len = len;
|
||||
ct_test(pTest, len != 0);
|
||||
len = reject_decode_apdu(&apdu[0],
|
||||
apdu_len, &test_invoke_id, &test_reject_reason);
|
||||
ct_test(pTest, len != -1);
|
||||
ct_test(pTest, test_invoke_id == invoke_id);
|
||||
ct_test(pTest, test_reject_reason == reject_reason);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef TEST_REJECT
|
||||
|
||||
Reference in New Issue
Block a user