Skip to content
GitLab
Commit 6e49e225 authored by Yann Garcia's avatar Yann Garcia
Browse files

Bug fixed in TestCodec_Pki

parent 46566577
Hide whitespace changes
Inline Side-by-side
ttcn/AtsPki/ItsPki_TestCases.ttcn
View file @ 6e49e225
...@@ -96,7 +96,7 @@ module ItsPki_TestCases { ...@@ -96,7 +96,7 @@ module ItsPki_TestCases {
* @see ETSI TS ITS-00546v006 TP 2 * @see ETSI TS ITS-00546v006 TP 2
* @reference ETSI TS 102 941 [2], clause 6.1.3 * @reference ETSI TS 102 941 [2], clause 6.1.3
*/ */
testcase TC_SEC_PKI_ITSS_ENR_BV_01() runs on ItsMtc /*system ItsPkiItssSystem*/ { testcase TC_SEC_PKI_ITSS_ENR_BV_01() runs on ItsMtc system ItsPkiItssSystem {
// Local variables // Local variables
var Oct32 v_private_key; var Oct32 v_private_key;
var Oct32 v_publicKeyX; var Oct32 v_publicKeyX;
...@@ -175,11 +175,38 @@ module ItsPki_TestCases { ...@@ -175,11 +175,38 @@ module ItsPki_TestCases {
// Test Body // Test Body
tc_ac.start; tc_ac.start;
alt { alt {
[] pkiPort.receive( [PICS_SEC_NIST_P256 and p_compressedMode == 0] pkiPort.receive(
mw_innerEcRequest mw_innerEcRequest(
) { PICS_ITS_S_CANONICAL_ID,
mw_publicKeys(
mw_publicVerificationKey_ecdsaNistP256(
mw_eccP256CurvePoint_compressed_y_0(
p_publicKeyCompressed
)
),
omit
)
)
) {
log("*** " & testcasename() & ": INFO: InnerEcRequest received ***");
// TODO Send InnerEcResponse;
log("*** " & testcasename() & ": PASS: Message triggered ***");
f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);
}
[PICS_SEC_NIST_P256 and p_compressedMode == 1] pkiPort.receive(
mw_innerEcRequest(
PICS_ITS_S_CANONICAL_ID,
mw_publicKeys(
mw_publicVerificationKey_ecdsaNistP256(
mw_eccP256CurvePoint_compressed_y_1(
p_publicKeyCompressed
)
),
omit
)
)
) {
log("*** " & testcasename() & ": INFO: InnerEcRequest received ***"); log("*** " & testcasename() & ": INFO: InnerEcRequest received ***");
// TODO Check message content
// TODO Send InnerEcResponse; // TODO Send InnerEcResponse;
log("*** " & testcasename() & ": PASS: Message triggered ***"); log("*** " & testcasename() & ": PASS: Message triggered ***");
f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success); f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);
...@@ -227,7 +254,7 @@ module ItsPki_TestCases { ...@@ -227,7 +254,7 @@ module ItsPki_TestCases {
* @see ETSI TS ITS-00546v006 TP 3 * @see ETSI TS ITS-00546v006 TP 3
* @reference ETSI TS 102 941, clause 6.1.3 * @reference ETSI TS 102 941, clause 6.1.3
*/ */
testcase TC_SEC_PKI_ITSS_ENR_BV_02() runs on ItsMtc /*system ItsPkiItssSystem*/ { testcase TC_SEC_PKI_ITSS_ENR_BV_02() runs on ItsMtc system ItsPkiItssSystem {
// Local variables // Local variables
var Oct32 v_private_key; var Oct32 v_private_key;
var Oct32 v_publicKeyX; var Oct32 v_publicKeyX;
...@@ -268,7 +295,7 @@ module ItsPki_TestCases { ...@@ -268,7 +295,7 @@ module ItsPki_TestCases {
in octetstring p_private_key, in octetstring p_private_key,
in octetstring p_publicKeyCompressed, in octetstring p_publicKeyCompressed,
in integer p_compressedMode in integer p_compressedMode
) runs on ItsPkiItss /*system ItsPkiItssSystem*/ { ) runs on ItsPkiItss system ItsPkiItssSystem {
// Local variables // Local variables
// Test component configuration // Test component configuration
...@@ -292,7 +319,7 @@ module ItsPki_TestCases { ...@@ -292,7 +319,7 @@ module ItsPki_TestCases {
in octetstring p_private_key, in octetstring p_private_key,
in octetstring p_publicKeyCompressed, in octetstring p_publicKeyCompressed,
in integer p_compressedMode in integer p_compressedMode
) runs on ItsPkiHttp /*system ItsPkiHttpSystem*/ { ) runs on ItsPkiHttp system ItsPkiHttpSystem {
// Local variable // Local variable
var HttpMessage v_response; var HttpMessage v_response;
var EtsiTs102941Data v_etsi_ts_102941_data; var EtsiTs102941Data v_etsi_ts_102941_data;
...@@ -625,7 +652,7 @@ module ItsPki_TestCases { ...@@ -625,7 +652,7 @@ module ItsPki_TestCases {
} }
// Test component configuration // Test component configuration
LibItsPki_Functions.f_cfUp(); LibItsPki_Functions.f_cfUp(PICS_TS_CERTIFICATE_ID, PICS_IUT_EA_CERTIFICATE_ID);
// Test adapter configuration // Test adapter configuration
...@@ -635,7 +662,7 @@ module ItsPki_TestCases { ...@@ -635,7 +662,7 @@ module ItsPki_TestCases {
f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_error); f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_error);
stop; stop;
} }
f_sendAcPkiPrimitive(PICS_TS_EA_CERTIFICATE_ID, v_private_key, v_publicKeyCompressed, v_compressedMode); f_sendAcPkiPrimitive(PICS_TS_CERTIFICATE_ID, v_private_key, v_publicKeyCompressed, v_compressedMode);
f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success); f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
// Test Body // Test Body
......
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