Skip to content
GitLab
Commit 6f24a048 authored by garciay's avatar garciay
Browse files

STF507: Bug fixed in mw_secCamPayload

parent 21f372c6
Hide whitespace changes
Inline Side-by-side
ttcn/AtsSecurity/AtsSecurity_Templates.ttcn3
View file @ 6f24a048
......@@ -37,7 +37,7 @@ module AtsSecurity_Templates {
template (present) Payload mw_secCamPayload := {
decodedPayload := {
btpPacket := mw_btpB(
btpPacket := mw_btpA(
PX_DESTINATION_PORT,
?,
mw_btpCamPayload
......
ttcn/AtsSecurity/ItsSecurity_TestCases.ttcn3
View file @ 6f24a048
......@@ -4431,7 +4431,6 @@ module ItsSecurity_TestCases {
// Preamble
f_prNeighbour();
f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
// Wait for the message with the certificate to retrieve the AA digest.
// Ask for the chain, containing AT and AA certificate
......@@ -4440,6 +4439,7 @@ module ItsSecurity_TestCases {
tc_ac.start;
f_askForCertificateChain(f_generateDefaultCam());
tc_ac.stop;
f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
// Test Body
tc_ac.start;
......@@ -4449,8 +4449,10 @@ module ItsSecurity_TestCases {
mw_geoNwSecPdu(
mdw_securedMessage(
superset(
mw_header_field_signer_info_certificate_chain
))))) {
mw_header_field_signer_info_certificate_chain(
superset(
mw_aa_certificate
))))))) {
tc_ac.stop;
log("*** " & testcasename() & ": PASS: AA certificate version set to " & int2char(c_certificate_version) & " ***");
f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);
......@@ -4654,7 +4656,7 @@ module ItsSecurity_TestCases {
if (v_vr.validity.region.region_type == e_rectangle) {
var RectangularRegions v_rects := v_vr.validity.region.region.rectangular_region;
if (lengthof(v_rects) > 6) {
log("*** " & testcasename() & ": FAIL: Rectangular regions count is more then 6 ***");
log("*** " & testcasename() & ": FAIL: Rectangular regions count is greather than 6 ***");
f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_error);
}
for (v_counter := 0; v_counter<lengthof(v_rects); v_counter := v_counter + 1) {
......@@ -4676,18 +4678,18 @@ module ItsSecurity_TestCases {
// Check for continuous rectangles
if (lengthof(v_rects) > 1) {
if (true != f_isContinuousRectangularRegions(v_rects)) {
if (true != f_isContinuousRectangularRegions(v_rects)) { // FIXME Not implemented
log("*** " & testcasename() & ": FAIL: Rectangular regions are not connected all together ***");
f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_error);
} else {
log("*** " & testcasename() & ": PASS: Certificate has a valid rectangular region restrictions ***");
f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);
}
}
} else {
log("*** " & testcasename() & ": INCONC: Certificate has other region type ***");
f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_timeout); // to be inconc
}
// FIXME Check holes
log("*** " & testcasename() & ": PASS: Certificate has a valid rectangular region restrictions ***");
f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);
} else {
log("*** " & testcasename() & ": PASS: Certificate doesn't have any location restrictions ***");
f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);
......@@ -4783,7 +4785,7 @@ module ItsSecurity_TestCases {
v_rects := v_vr.validity.region.region.rectangular_region;
log("v_rects=", v_rects);
if (lengthof(v_rects) > 6) {
log("*** " & testcasename() & ": FAIL: Rectangular regions count is more then 6 ***");
log("*** " & testcasename() & ": FAIL: Rectangular regions count is greather than 6 ***");
f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_error);
}
for (var integer j:=0; j<lengthof(v_rects); j:=j + 1) {
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment