Commit afb30ae0 authored by YannGarcia's avatar YannGarcia
Browse files

Enhance AtsRSUsSimulator

parent 93706865
......@@ -84,18 +84,18 @@ module LibItsDenm_TypesAndValues {
*/
type union UtDenmResults {
boolean utDenmInitializeResult,
UtDenmTriggerResult utDenmTriggerResult,
UtDenmUpdateResult utDenmUpdateResult,
boolean utDenmTerminationResult,
boolean utDenmChangePositionResult,
boolean utDenmChangePseudonymResult
} with {
UtDenmTriggerResult utDenmTriggerResult,
UtDenmUpdateResult utDenmUpdateResult,
boolean utDenmTerminationResult,
boolean utDenmChangePositionResult,
boolean utDenmChangePseudonymResult
} with {
variant ""
} // End of type UtDenmResults
/**
* @desc Upper Tester message to request triggering of an event at IUT
*/
} // End of type UtDenmResults
/**
* @desc Upper Tester message to request triggering of an event at IUT
*/
type record UtDenmTrigger {
TimestampIts detectionTime,
ValidityDuration validityDuration optional,
......
......@@ -1655,7 +1655,7 @@ module LibItsGeoNetworking_Templates {
/**
* @desc Default send template for traffic class
*/
template (value) TrafficClass m_trafficClass ( in SCF p_scf := e_scfEnable, in ChannelOffload p_ChOff := e_choffDisabled ) := {
template (value) TrafficClass m_trafficClass ( in SCF p_scf := e_scfEnabled, in ChannelOffload p_ChOff := e_choffDisabled ) := {
scf := p_scf,
channelOffload := p_ChOff,
tcId := 0
......
......@@ -346,7 +346,7 @@ module LibItsGeoNetworking_TypesAndValues {
type enumerated SCF {
e_scfDisabled(0),
e_scfEnable (1)
e_scfEnabled (1)
} with {
variant "FIELDLENGTH(1)" //variant "1 bit"
}
......
......@@ -23,6 +23,7 @@ module LibItsSecurity_Functions {
// LibItsCommon
//import from LibItsCommon_Functions all;
//import from LibItsCommon_TypesAndValues all;
import from LibItsCommon_Pixits all;
// LibItsSecurity
import from LibItsSecurity_TypesAndValues all;
......@@ -2177,7 +2178,7 @@ module LibItsSecurity_Functions {
// Setup certificates memory cache
if (fx_loadCertificates(PX_CERTIFICATE_POOL_PATH, p_configId) == true) {
// Setup security component variables
if (f_readCertificate(cc_taCert_A, vc_atCertificate) == true) {
if (f_readCertificate(PX_CERT_FOR_TS, vc_atCertificate) == true) {
var HashedId8 v_issuer;
log("Issuer: ", vc_atCertificate.issuer);
if (ischosen(vc_atCertificate.issuer.sha256AndDigest)) {
......
......@@ -14,6 +14,9 @@ module LibItsSecurity_TypesAndValues {
// LibCommon
import from LibCommon_BasicTypesAndValues all;
import from LibCommon_DataStrings all;
// LibItsCommon
import from LibItsCommon_Pixits all;
// LibIts
import from IEEE1609dot2BaseTypes language "ASN.1:1997" all;
......@@ -21,7 +24,7 @@ module LibItsSecurity_TypesAndValues {
import from EtsiTs103097Module language "ASN.1:1997" all;
// Test Adapter certificates & private keys - Valid behavior
const charstring cc_taCert_A := "CERT_TS_A_AT"; /** Default certificate, without region validity restriction, to be used when secured messages are sent from TA to IUT */
const charstring cc_taCert_A := PX_CERT_FOR_TS; /** Default certificate, without region validity restriction, to be used when secured messages are sent from TA to IUT */
const charstring cc_taCert_A_AA := "CERT_TS_A_AA";
const charstring cc_taCert_A_EA := "CERT_TS_A_EA";
const charstring cc_taCert_A1 := "CERT_TS_A_A1_AT"; /** Default certificate, without region validity restriction, to be used when secured messages are sent from TA to IUT */
......
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