Commit bf42b34b authored by garciay's avatar garciay
Browse files

STF507 week#9:

.  Implement additional TPs
.  Review of the PICS, TSS&TPs & PIXITs documents
.  Start validation using simulation
.      Minor bug fixed in TA
parent 439176d0
......@@ -118,7 +118,7 @@ module AtsSecurity_Functions {
*/
function f_prepareSecuredCam_Bo(
in charstring p_configId,
in integer p_protocolVersion := c_protocol_version,
in UInt8 p_protocolVersion := c_protocol_version,
in integer p_trailerStatus := 0,
in template (omit) HeaderFields p_headerFields := omit,
in SignerInfoType p_signerInfoType := e_certificate_digest_with_sha256,
......@@ -168,6 +168,7 @@ module AtsSecurity_Functions {
);
// Return secured Gn packet
log("f_prepareSecuredCam_Bo: ", m_geoNwSecPdu(v_gnNonSecuredPacket, v_securedMessage));
return valueof(m_geoNwSecPdu(v_gnNonSecuredPacket, v_securedMessage));
} // End of function f_prepareSecuredCam_Bo
......@@ -207,7 +208,7 @@ module AtsSecurity_Functions {
*/
function f_sendSecuredCam_Bo(
in charstring p_configId,
in integer p_protocolVersion := c_protocol_version,
in UInt8 p_protocolVersion := c_protocol_version,
in integer p_trailerStatus := 1,
in template (omit) HeaderFields p_headerFields := omit,
in SignerInfoType p_signerInfoType := e_certificate_digest_with_sha256
......@@ -216,6 +217,7 @@ module AtsSecurity_Functions {
// Local variables
var GeoNetworkingPdu v_securedGnPdu := f_prepareSecuredCam_Bo(p_configId, p_protocolVersion, p_trailerStatus, p_headerFields, p_signerInfoType);
log("v_securedGnPdu = ", v_securedGnPdu);
f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(v_securedGnPdu));
return v_securedGnPdu;
......@@ -310,7 +312,7 @@ module AtsSecurity_Functions {
*/
function f_prepareSecuredDenm_Bo(
in charstring p_configId,
in integer p_protocolVersion := c_protocol_version,
in UInt8 p_protocolVersion := c_protocol_version,
in integer p_trailerStatus := 0,
in template (omit) HeaderFields p_headerFields := omit,
in SignerInfoType p_signerInfoType := e_certificate,
......@@ -408,7 +410,7 @@ module AtsSecurity_Functions {
*/
function f_sendSecuredDenm_Bo(
in charstring p_configId,
in integer p_protocolVersion := c_protocol_version,
in UInt8 p_protocolVersion := c_protocol_version,
in integer p_trailerStatus := 1,
in template (omit) HeaderFields p_headerFields := omit,
in SignerInfoType p_signerInfoType := e_certificate_digest_with_sha256
......@@ -494,7 +496,7 @@ module AtsSecurity_Functions {
*/
function f_prepareSecuredBeacon_Bo(
in charstring p_configId,
in integer p_protocolVersion := c_protocol_version,
in UInt8 p_protocolVersion := c_protocol_version,
in integer p_trailerStatus := 0,
in template (omit) HeaderFields p_headerFields := omit,
in SignerInfoType p_signerInfoType := e_certificate,
......@@ -576,7 +578,7 @@ module AtsSecurity_Functions {
*/
function f_sendSecuredBeacon_Bo(
in charstring p_configId,
in integer p_protocolVersion := c_protocol_version,
in UInt8 p_protocolVersion := c_protocol_version,
in integer p_trailerStatus := 1,
in template (omit) HeaderFields p_headerFields := omit,
in SignerInfoType p_signerInfoType := e_certificate_digest_with_sha256
......
......@@ -66,8 +66,6 @@ module ItsSecurity_TestControl {
if (PICS_USE_IDENTIFIED_REGION) {
execute(TC_SEC_ITSS_SND_DENM_05_05_BV());
}
} else {
execute(TC_SEC_ITSS_SND_DENM_05_06_BV());
}
execute(TC_SEC_ITSS_SND_DENM_08_01_BV());
execute(TC_SEC_ITSS_SND_DENM_10_01_BV());
......@@ -118,9 +116,11 @@ module ItsSecurity_TestControl {
execute(TC_SEC_ITSS_SND_CERT_06_01_BV());
execute(TC_SEC_ITSS_SND_CERT_06_02_BV());
}
}
execute(TC_SEC_ITSS_SND_CERT_07_01_BV());
if (PICS_USE_IDENTIFIED_REGION) {
execute(TC_SEC_ITSS_SND_CERT_07_02_BV());
}
}
execute(TC_SEC_ITSS_SND_CERT_08_01_BV());
execute(TC_SEC_ITSS_SND_CERT_09_01_BV());
execute(TC_SEC_ITSS_SND_CERT_09_02_BV());
......@@ -186,6 +186,7 @@ module ItsSecurity_TestControl {
execute(TC_SEC_ITSS_RCV_CAM_05_02_BO());
execute(TC_SEC_ITSS_RCV_CAM_05_03_BO());
execute(TC_SEC_ITSS_RCV_CAM_05_04_BO());
execute(TC_SEC_ITSS_RCV_CAM_05_05_BO());
execute(TC_SEC_ITSS_RCV_CAM_06_01_BO());
execute(TC_SEC_ITSS_RCV_CAM_06_02_BO());
if (PICS_ITS_C2C_MODE) {
......@@ -199,10 +200,12 @@ module ItsSecurity_TestControl {
execute(TC_SEC_ITSS_RCV_CAM_09_04_BO());
execute(TC_SEC_ITSS_RCV_CAM_09_05_BO());
execute(TC_SEC_ITSS_RCV_CAM_09_06_BO());
execute(TC_SEC_ITSS_RCV_CAM_09_07_BO());
execute(TC_SEC_ITSS_RCV_CAM_10_01_BO());
execute(TC_SEC_ITSS_RCV_CAM_10_02_BO());
execute(TC_SEC_ITSS_RCV_CAM_11_01_BO());
execute(TC_SEC_ITSS_RCV_CAM_11_02_BO());
execute(TC_SEC_ITSS_RCV_CAM_11_03_BO());
execute(TC_SEC_ITSS_RCV_CAM_12_01_BO());
execute(TC_SEC_ITSS_RCV_CAM_12_02_BO());
execute(TC_SEC_ITSS_RCV_CAM_12_03_BO());
......@@ -247,9 +250,11 @@ module ItsSecurity_TestControl {
execute(TC_SEC_ITSS_RCV_DENM_04_11_BO());
execute(TC_SEC_ITSS_RCV_DENM_04_12_BO());
execute(TC_SEC_ITSS_RCV_DENM_04_13_BO());
execute(TC_SEC_ITSS_RCV_DENM_04_14_BO());
execute(TC_SEC_ITSS_RCV_DENM_05_01_BO());
execute(TC_SEC_ITSS_RCV_DENM_05_02_BO());
execute(TC_SEC_ITSS_RCV_DENM_05_03_BO());
execute(TC_SEC_ITSS_RCV_DENM_05_04_BO());
execute(TC_SEC_ITSS_RCV_DENM_06_01_BO());
execute(TC_SEC_ITSS_RCV_DENM_06_02_BO());
if (PICS_ITS_C2C_MODE) {
......@@ -274,6 +279,7 @@ module ItsSecurity_TestControl {
execute(TC_SEC_ITSS_RCV_DENM_10_01_BO());
execute(TC_SEC_ITSS_RCV_DENM_10_02_BO());
execute(TC_SEC_ITSS_RCV_DENM_11_01_BO());
execute(TC_SEC_ITSS_RCV_DENM_11_02_BO());
execute(TC_SEC_ITSS_RCV_DENM_12_01_BO());
execute(TC_SEC_ITSS_RCV_DENM_12_02_BO());
execute(TC_SEC_ITSS_RCV_DENM_12_03_BO());
......@@ -304,7 +310,10 @@ module ItsSecurity_TestControl {
execute(TC_SEC_ITSS_RCV_GENMSG_04_06_BO());
execute(TC_SEC_ITSS_RCV_GENMSG_04_07_BO());
execute(TC_SEC_ITSS_RCV_GENMSG_04_08_BO());
execute(TC_SEC_ITSS_RCV_GENMSG_05_01_BO());
execute(TC_SEC_ITSS_RCV_GENMSG_05_02_BO());
execute(TC_SEC_ITSS_RCV_GENMSG_05_03_BO());
execute(TC_SEC_ITSS_RCV_GENMSG_05_04_BO());
execute(TC_SEC_ITSS_RCV_GENMSG_06_01_BO());
execute(TC_SEC_ITSS_RCV_GENMSG_06_02_BO());
if (PICS_ITS_C2C_MODE) {
......@@ -324,6 +333,7 @@ module ItsSecurity_TestControl {
execute(TC_SEC_ITSS_RCV_GENMSG_10_01_BO());
execute(TC_SEC_ITSS_RCV_GENMSG_10_02_BO());
execute(TC_SEC_ITSS_RCV_GENMSG_11_01_BO());
execute(TC_SEC_ITSS_RCV_GENMSG_11_02_BO());
execute(TC_SEC_ITSS_RCV_GENMSG_12_01_BO());
execute(TC_SEC_ITSS_RCV_GENMSG_12_02_BO());
execute(TC_SEC_ITSS_RCV_GENMSG_12_03_BO());
......@@ -392,6 +402,9 @@ module ItsSecurity_TestControl {
execute(TC_SEC_ITSS_RCV_CERT_10_01_BO());
execute(TC_SEC_ITSS_RCV_CERT_10_02_BO());
execute(TC_SEC_ITSS_RCV_CERT_10_03_BO());
execute(TC_SEC_ITSS_RCV_CERT_10_04_BO());
execute(TC_SEC_ITSS_RCV_CERT_10_05_BO());
execute(TC_SEC_ITSS_RCV_CERT_10_06_BO());
execute(TC_SEC_ITSS_RCV_CERT_11_01_BO());
execute(TC_SEC_ITSS_RCV_CERT_11_02_BO());
execute(TC_SEC_ITSS_RCV_CERT_11_03_BO());
......@@ -402,6 +415,21 @@ module ItsSecurity_TestControl {
execute(TC_SEC_ITSS_RCV_CERT_12_04_BO());
execute(TC_SEC_ITSS_RCV_CERT_13_01_BO());
execute(TC_SEC_ITSS_RCV_CERT_13_02_BO());
execute(TC_SEC_ITSS_RCV_CERT_13_03_BO());
execute(TC_SEC_ITSS_RCV_CERT_14_01_BO());
execute(TC_SEC_ITSS_RCV_CERT_14_02_BO());
execute(TC_SEC_ITSS_RCV_CERT_14_03_BO());
execute(TC_SEC_ITSS_RCV_CERT_15_01_BO());
execute(TC_SEC_ITSS_RCV_CERT_15_02_BO());
execute(TC_SEC_ITSS_RCV_CERT_15_03_BO());
execute(TC_SEC_ITSS_RCV_CERT_16_01_BO());
execute(TC_SEC_ITSS_RCV_CERT_17_01_BO());
execute(TC_SEC_ITSS_RCV_CERT_17_02_BO());
execute(TC_SEC_ITSS_RCV_CERT_17_03_BO());
execute(TC_SEC_ITSS_RCV_CERT_17_04_BO());
execute(TC_SEC_ITSS_RCV_CERT_18_01_BO());
execute(TC_SEC_ITSS_RCV_CERT_18_02_BO());
execute(TC_SEC_ITSS_RCV_CERT_19_01_BO());
}
} // End of 'control' statement
......
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