Commit 019f1b7f authored by garciay's avatar garciay
Browse files

STF545: Validate full support of ECIES encryption

parent f8c50b98
......@@ -117,13 +117,13 @@ module ItsGeoNetworking_TpFunctions {
f_sleep(PX_TAC);
if(0 < lengthof(vc_utInds)) {
log("*** " & testcasename() & ": PASS: GN was transmitted to upper layer***");
log("*** " & testcasename() & ": PASS: GN was transmitted to upper layer ***");
//flush received upper indications
vc_utInds := {};
f_selfOrClientSyncAndVerdict(c_prDone, e_success);
}
else {
log("*** " & testcasename() & ": INCONC: GN was not transmitted to upper layer***");
log("*** " & testcasename() & ": INCONC: GN was not transmitted to upper layer ***");
f_selfOrClientSyncAndVerdict(c_prDone, e_error);
}
......@@ -135,11 +135,11 @@ module ItsGeoNetworking_TpFunctions {
f_sleep(PX_TAC);
if(0 != lengthof(vc_utInds)) {
log("*** " & testcasename() & ": FAIL: GN was transmitted to upper layer***");
log("*** " & testcasename() & ": FAIL: GN was transmitted to upper layer ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
}
else {
log("*** " & testcasename() & ": PASS: GN was discarded and not transmitted to upper layer***");
log("*** " & testcasename() & ": PASS: GN was discarded and not transmitted to upper layer ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
}
......@@ -6701,11 +6701,11 @@ module ItsGeoNetworking_TpFunctions {
// empty on purpose
}
if(i < lengthof(vc_utInds)) {
log("*** " & testcasename() & ": PASS: GN was transmitted to upper layer***");
log("*** " & testcasename() & ": PASS: GN was transmitted to upper layer ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
}
else {
log("*** " & testcasename() & ": FAIL: GN was not transmitted to upper layer***");
log("*** " & testcasename() & ": FAIL: GN was not transmitted to upper layer ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
}
......@@ -7738,13 +7738,13 @@ module ItsGeoNetworking_TpFunctions {
// empty on purpose
}
if(i < lengthof(vc_utInds)) {
log("*** " & testcasename() & ": PASS: GN was transmitted to upper layer***");
log("*** " & testcasename() & ": PASS: GN was transmitted to upper layer ***");
//flush received upper indications
vc_utInds := {};
f_selfOrClientSyncAndVerdict(c_prDone, e_success);
}
else {
log("*** " & testcasename() & ": INCONC: GN was not transmitted to upper layer***");
log("*** " & testcasename() & ": INCONC: GN was not transmitted to upper layer ***");
f_selfOrClientSyncAndVerdict(c_prDone, e_error);
}
......@@ -7754,11 +7754,11 @@ module ItsGeoNetworking_TpFunctions {
f_sleep(PX_TAC);
if(0 != lengthof(vc_utInds)) {
log("*** " & testcasename() & ": FAIL: GN was transmitted to upper layer***");
log("*** " & testcasename() & ": FAIL: GN was transmitted to upper layer ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
}
else {
log("*** " & testcasename() & ": PASS: GN was not transmitted to upper layer***");
log("*** " & testcasename() & ": PASS: GN was not transmitted to upper layer ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
}
......@@ -8955,11 +8955,11 @@ module ItsGeoNetworking_TpFunctions {
// empty on purpose
}
if(i < lengthof(vc_utInds)) {
log("*** " & testcasename() & ": PASS: GN was transmitted to upper layer***");
log("*** " & testcasename() & ": PASS: GN was transmitted to upper layer ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
}
else {
log("*** " & testcasename() & ": FAIL: GN was not transmitted to upper layer***");
log("*** " & testcasename() & ": FAIL: GN was not transmitted to upper layer ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
}
......@@ -9057,13 +9057,13 @@ module ItsGeoNetworking_TpFunctions {
// empty on purpose
}
if(i < lengthof(vc_utInds)) {
log("*** " & testcasename() & ": PASS: GN was transmitted to upper layer***");
log("*** " & testcasename() & ": PASS: GN was transmitted to upper layer ***");
//flush received upper indications
vc_utInds := {};
f_selfOrClientSyncAndVerdict(c_prDone, e_success);
}
else {
log("*** " & testcasename() & ": INCONC: GN was not transmitted to upper layer***");
log("*** " & testcasename() & ": INCONC: GN was not transmitted to upper layer ***");
f_selfOrClientSyncAndVerdict(c_prDone, e_error);
}
......@@ -9071,11 +9071,11 @@ module ItsGeoNetworking_TpFunctions {
f_sleep(PX_TAC);
if(0 != lengthof(vc_utInds)) {
log("*** " & testcasename() & ": FAIL: GN was transmitted to upper layer***");
log("*** " & testcasename() & ": FAIL: GN was transmitted to upper layer ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
}
else {
log("*** " & testcasename() & ": PASS: GN was NOT transmitted to upper layer***");
log("*** " & testcasename() & ": PASS: GN was NOT transmitted to upper layer ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
}
......@@ -9169,11 +9169,11 @@ module ItsGeoNetworking_TpFunctions {
f_sleep(PX_TAC);
if(0 != lengthof(vc_utInds)) {
log("*** " & testcasename() & ": FAIL: GN was transmitted to upper layer***");
log("*** " & testcasename() & ": FAIL: GN was transmitted to upper layer ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
}
else {
log("*** " & testcasename() & ": PASS: GN was NOT transmitted to upper layer***");
log("*** " & testcasename() & ": PASS: GN was NOT transmitted to upper layer ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
}
......@@ -10525,11 +10525,11 @@ module ItsGeoNetworking_TpFunctions {
// empty on purpose
}
if(i < lengthof(vc_utInds)) {
log("*** " & testcasename() & ": PASS: GN was transmitted to upper layer***");
log("*** " & testcasename() & ": PASS: GN was transmitted to upper layer ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
}
else {
log("*** " & testcasename() & ": FAIL: GN was not transmitted to upper layer***");
log("*** " & testcasename() & ": FAIL: GN was not transmitted to upper layer ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
}
......@@ -10627,7 +10627,7 @@ module ItsGeoNetworking_TpFunctions {
f_selfOrClientSyncAndVerdict(c_prDone, e_success);
}
else {
log("*** " & testcasename() & ": INCONC: TSB was not transmitted to upper layer***");
log("*** " & testcasename() & ": INCONC: TSB was not transmitted to upper layer ***");
f_selfOrClientSyncAndVerdict(c_prDone, e_error);
}
}
......@@ -10645,7 +10645,7 @@ module ItsGeoNetworking_TpFunctions {
// empty on purpose
}
if(i < lengthof(vc_utInds)) {
log("*** " & testcasename() & ": FAIL: Same TSB packet was transmitted to upper layer***");
log("*** " & testcasename() & ": FAIL: Same TSB packet was transmitted to upper layer ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
}
else {
......@@ -10871,11 +10871,11 @@ module ItsGeoNetworking_TpFunctions {
// empty on purpose
}
if(i < lengthof(vc_utInds)) {
log("*** " & testcasename() & ": PASS: GN was transmitted to upper layer***");
log("*** " & testcasename() & ": PASS: GN was transmitted to upper layer ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
}
else {
log("*** " & testcasename() & ": FAIL: GN was not transmitted to upper layer***");
log("*** " & testcasename() & ": FAIL: GN was not transmitted to upper layer ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
}
......@@ -11851,15 +11851,15 @@ module ItsGeoNetworking_TpFunctions {
// empty on purpose
}
if(i < lengthof(vc_utInds)) {
log("*** " & testcasename() & ": PASS: GN was transmitted to upper layer***");
log("*** " & testcasename() & ": PASS: GN was transmitted to upper layer ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
}
else {
log("*** " & testcasename() & ": FAIL: GN was not transmitted to upper layer***");
log("*** " & testcasename() & ": FAIL: GN was not transmitted to upper layer ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
}
log("*** " & testcasename() & ": GAC packet passed to Upper layer \***");
log("*** " & testcasename() & ": GAC packet passed to Upper layer ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
// Postamble
......@@ -11935,12 +11935,12 @@ module ItsGeoNetworking_TpFunctions {
// empty on purpose
}
if(i < lengthof(vc_utInds)) {
log("*** " & testcasename() & ": PASS: GN was transmitted to upper layer***");
log("*** " & testcasename() & ": PASS: GN was transmitted to upper layer ***");
vc_utInds := {};
f_selfOrClientSyncAndVerdict(c_prDone, e_success);
}
else {
log("*** " & testcasename() & ": INCONC: GN was not transmitted to upper layer***");
log("*** " & testcasename() & ": INCONC: GN was not transmitted to upper layer ***");
f_selfOrClientSyncAndVerdict(c_prDone, e_error);
}
......@@ -11951,11 +11951,11 @@ module ItsGeoNetworking_TpFunctions {
f_sleep(PX_TAC);
if(0 != lengthof(vc_utInds)) {
log("*** " & testcasename() & ": FAIL: GN was transmitted to upper layer***");
log("*** " & testcasename() & ": FAIL: GN was transmitted to upper layer ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
}
else {
log("*** " & testcasename() & ": PASS: GN was NOT transmitted to upper layer***");
log("*** " & testcasename() & ": PASS: GN was NOT transmitted to upper layer ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
}
......@@ -12038,11 +12038,11 @@ module ItsGeoNetworking_TpFunctions {
f_sleep(PX_TAC);
if(0 != lengthof(vc_utInds)) {
log("*** " & testcasename() & ": FAIL: GN was transmitted to upper layer***");
log("*** " & testcasename() & ": FAIL: GN was transmitted to upper layer ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
}
else {
log("*** " & testcasename() & ": PASS: GN was NOT transmitted to upper layer***");
log("*** " & testcasename() & ": PASS: GN was NOT transmitted to upper layer ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
}
......
......@@ -6848,7 +6848,7 @@ module ItsSecurity_TestCases {
)))))) -> value v_geoNwInd {
tc_ac.stop;
if (f_decrypt(f_getSecuredMessage(v_geoNwInd.msgIn), v_decryptedMsg) == false) {
if (f_decrypt(vc_encryptPrivateKey, f_getSecuredMessage(v_geoNwInd.msgIn), v_decryptedMsg) == false) {
log("*** " & testcasename() & ": FAIL: Unable to process encryption data ***");
f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_error);
} else if (match(v_decryptedMsg, mw_etsiTs103097Data) == false) {
......@@ -6937,7 +6937,7 @@ module ItsSecurity_TestCases {
)))))) -> value v_geoNwInd {
tc_ac.stop;
if (f_decrypt(f_getSecuredMessage(v_geoNwInd.msgIn), v_decryptedMsg) == false) {
if (f_decrypt(vc_encryptPrivateKey, f_getSecuredMessage(v_geoNwInd.msgIn), v_decryptedMsg) == false) {
log("*** " & testcasename() & ": FAIL: Unable to process encryption data ***");
f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_error);
} else if (match(v_decryptedMsg, mw_etsiTs103097Data_signed) == false) {
Markdown is supported
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