Skip to content
GitLab
Commit 192caced authored by filatov's avatar filatov
Browse files

TITANIZATION: common changes: valueof, dot notations, etc.

parent 6dbc85d1
Expand all Hide whitespace changes
Inline Side-by-side
ttcn/DENM/LibItsDenm_Functions.ttcn
View file @ 192caced
......@@ -550,7 +550,9 @@ module LibItsDenm_Functions {
)
);
return valueof(p_denm.management).actionID;
//FIXME RGY Titan doesn't support dot notation after valueof at the moment
// return valueof(p_denm.management).actionID;
return valueof(p_denm.management.actionID);
}
} // end sendFunctions
......
ttcn/DENM/LibItsDenm_Templates.ttcn
View file @ 192caced
......@@ -23,6 +23,7 @@ module LibItsDenm_Templates {
import from LibItsCommon_TypesAndValues all;
import from LibItsCommon_Functions all;
import from LibItsCommon_Pixits all;
import from LibItsCommon_ASN1_NamedNumbers all;
// LibItsDenm
import from LibItsDenm_TestSystem all;
......@@ -83,7 +84,9 @@ module LibItsDenm_Templates {
* @param p_gnLifetime GN packet lifetime value (ms)
* @param p_gnTrafficClass GN traffic class value
*/
template DenmInd mw_denmIndWithGnParameters (
//FIXME RGY template restriction can be the same as its base template: used in receiving operations only, where single "omit" is not allowed
// template DenmInd mw_denmIndWithGnParameters (
template(present) DenmInd mw_denmIndWithGnParameters (
template (present) DENM p_denMsg,
in template UInt8 p_gnNextHeader := *,
in template UInt8 p_gnHeaderType := *,
......@@ -104,7 +107,8 @@ module LibItsDenm_Templates {
* @param p_ssp SSP security parameter
* @param p_its_aid ITS-AID value
*/
template DenmInd mw_denmIndWithSecurityParameters(
//FIXME RGY Titan currently requires the modifyied template to have the same restriction as the base template
template (present) DenmInd mw_denmIndWithSecurityParameters(
template (present) DENM p_denMsg,
template Bit256 p_ssp := *,
template UInt32 p_its_aid := c_its_aid_DENM
......@@ -119,7 +123,9 @@ module LibItsDenm_Templates {
* @param p_btpDestinationPort BTP destination port value
* @param p_btpInfo BTP destination port info value (if BTP-B) or BTP source port value (if BTP-A)
*/
template DenmInd mw_denmIndWithBtpParameters (
//FIXME RGY template restriction can be the same as its base template: template is not used currently
// template DenmInd mw_denmIndWithBtpParameters (
template(present) DenmInd mw_denmIndWithBtpParameters (
template (present) DENM p_denMsg,
in template UInt16 p_btpDestinationPort := *,
in template UInt16 p_btpInfo := *
......@@ -350,8 +356,8 @@ module LibItsDenm_Templates {
template (value) Longitude p_longitude := f_getTsLongitude(),
template (value) Latitude p_latitude := f_getTsLatitude()
) := {
longitude := p_longitude,
latitude := p_latitude,
longitude := p_longitude,
positionConfidenceEllipse := m_posConfidenceEllipse,
altitude := m_altitude
}
......
ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn
View file @ 192caced
......@@ -911,8 +911,9 @@ module LibItsGeoNetworking_Functions {
position := p_positionValue
};
}
function @deterministic f_fillTimestamp(inout LongPosVector v_vector)
//FIXME RGY Titan doesn't support @deterministic yet
// function @deterministic f_fillTimestamp(inout LongPosVector v_vector)
function f_fillTimestamp(inout LongPosVector v_vector)
return LongPosVector {
if (v_vector.timestamp_ == 0) {
v_vector.timestamp_ := f_computeGnTimestamp();
......@@ -1588,12 +1589,12 @@ module LibItsGeoNetworking_Functions {
var LongPosVector v_repDstPosVector;
[vc_gnDefaultActive] a_receiveLsRequest(p_reqSeqNumber, p_mid, v_repDstPosVector) {
f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(
f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(
m_geoNwLsReplyPacket(
p_repSrcPosVector,
f_longPosVector2ShortPosVector(v_repDstPosVector),
vc_localSeqNumber
))));
)))));
}
}
......@@ -1690,6 +1691,7 @@ module LibItsGeoNetworking_Functions {
var GeoNetworkingInd v_msg;
f_sendGeoNetMessage(
valueof(
m_geoNwReq_linkLayerBroadcast(
m_geoNwPdu(
m_geoNwLsRequestPacket(
......@@ -1699,6 +1701,7 @@ module LibItsGeoNetworking_Functions {
)
)
)
)
);
tc_ac.start;
......@@ -2521,7 +2524,9 @@ module LibItsGeoNetworking_Functions {
mw_geoNwSecPdu(
p_InSecMsg,
mw_geoNwAnyPacket_withPayload(?)
))) -> value (v_geoNw) {
//FIXME RGY Titan doesn't support storing list at the moment
// ))) -> value (v_geoNw) {
))) -> value v_geoNw {
p_received := f_getSecuredMessage(v_geoNw.msgIn);
}
}
......@@ -2779,7 +2784,7 @@ module LibItsGeoNetworking_Functions {
f_HashedId3FromHashedId8(
valueof(p_digest)
))
},
}
""
);
......
ttcn/GeoNetworking/LibItsGeoNetworking_Templates.ttcn
View file @ 192caced
......@@ -109,7 +109,7 @@ module LibItsGeoNetworking_Templates {
geoUnicast := {
gnAddress := p_destinationGnAddr,
lifetime := c_lifetime,
trafficClass := m_trafficClass,
trafficClass := valueof(m_trafficClass),
payload := { decodedPayload := omit, rawPayload := ''O} // do not use f_adaptPayload_m here
}
}
......@@ -186,7 +186,7 @@ module LibItsGeoNetworking_Templates {
geoBroadcast := {
shape := p_geoArea.shape,
lifetime := c_lifetime,
trafficClass := m_trafficClass,
trafficClass := valueof(m_trafficClass),
reserved := c_uInt24Zero,
area := p_geoArea.area,
payload := { decodedPayload := omit, rawPayload := ''O} // do not use f_adaptPayload_m here
......@@ -246,7 +246,7 @@ module LibItsGeoNetworking_Templates {
geoAnycast := {
shape := p_geoArea.shape,
lifetime := c_lifetime,
trafficClass := m_trafficClass,
trafficClass := valueof(m_trafficClass),
reserved := c_uInt24Zero,
area := p_geoArea.area,
payload := { decodedPayload := omit, rawPayload := ''O} // do not use f_adaptPayload_m here
......@@ -288,7 +288,7 @@ module LibItsGeoNetworking_Templates {
*/
template (value) UtGnTrigger m_generateShbMessage := {
shb := {
trafficClass := m_trafficClass,
trafficClass := valueof(m_trafficClass),
payload := { decodedPayload := omit, rawPayload := ''O} // do not use f_adaptPayload_m here
}
}
......@@ -326,7 +326,7 @@ module LibItsGeoNetworking_Templates {
tsb := {
nbHops := 10,
lifetime := c_lifetime,
trafficClass := m_trafficClass,
trafficClass := valueof(m_trafficClass),
payload := { decodedPayload := omit, rawPayload := ''O} // do not use f_adaptPayload_m here
}
}
......@@ -376,7 +376,7 @@ module LibItsGeoNetworking_Templates {
template (value) BeaconHeader p_beaconHeader
) := {
startBeaconing := {
beaconPacket := m_geoNwPdu(m_geoNwBeaconPacket(p_beaconHeader.srcPosVector), -, c_hopLimit1)
beaconPacket := m_geoNwPdu(valueof(m_geoNwBeaconPacket(valueof(p_beaconHeader.srcPosVector))), -, c_hopLimit1)
}
}
......@@ -419,7 +419,7 @@ module LibItsGeoNetworking_Templates {
integer p_numberOfNeighbour
) := {
startBeaconingMultipleNeighbour := {
beaconPacket := m_geoNwPdu(m_geoNwBeaconPacket(p_beaconHeader.srcPosVector), -, c_hopLimit1),
beaconPacket := m_geoNwPdu(valueof(m_geoNwBeaconPacket(valueof(p_beaconHeader.srcPosVector))), -, c_hopLimit1),
numberOfNeighbour := p_numberOfNeighbour
}
}
......@@ -539,11 +539,11 @@ module LibItsGeoNetworking_Templates {
in template (value) CommonHeader p_commonHeader,
in template (value) ExtendedHeader p_extHeader
) := {
packet := {
packet := valueof({
commonHeader := p_commonHeader,
extendedHeader := p_extHeader,
payload := f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD"))
},
}),
securedMsg := omit
}
......@@ -577,7 +577,7 @@ module LibItsGeoNetworking_Templates {
in template (value) octetstring p_payload
) modifies m_geoNwPacket := {
packet := {
payload := f_adaptPayload_m(p_payload)
payload := valueof(f_adaptPayload_m(p_payload))
}
}
......@@ -623,7 +623,9 @@ module LibItsGeoNetworking_Templates {
*
* @see mw_geoNwPacket
*/
template GeoNetworkingPacket mw_geoNwPduAnyPayload(
//FIXME RGY template restriction can be the same as its base template: template is not used currently
// template GeoNetworkingPacket mw_geoNwPduAnyPayload(
template(present) GeoNetworkingPacket mw_geoNwPduAnyPayload(
in template (present) CommonHeader p_commonHeader,
in template (present) ExtendedHeader p_extHeader
) modifies mw_geoNwPacket := {
......@@ -640,7 +642,9 @@ module LibItsGeoNetworking_Templates {
*
* @see mw_geoNwPacket
*/
template GeoNetworkingPacket mw_geoNwPduWithOctetstringPayload(
//FIXME RGY template restriction can be the same as its base template: template is not used currently
// template GeoNetworkingPacket mw_geoNwPduWithOctetstringPayload(
template(present) GeoNetworkingPacket mw_geoNwPduWithOctetstringPayload(
in template (present) CommonHeader p_commonHeader,
in template (present) ExtendedHeader p_extHeader,
in template (present) octetstring p_payload
......@@ -658,7 +662,9 @@ module LibItsGeoNetworking_Templates {
*
* @see mw_geoNwPacket
*/
template GeoNetworkingPacket mw_geoNwPduWithPayload(
//FIXME RGY template restriction can be the same as its base template: used in TC_SEC_ITSS_SND_CAM_02_01_BV only, where is called with parameters
// template GeoNetworkingPacket mw_geoNwPduWithPayload(
template(present) GeoNetworkingPacket mw_geoNwPduWithPayload(
in template (present) CommonHeader p_commonHeader,
in template (present) ExtendedHeader p_extHeader,
in template (present) Payload p_payload
......@@ -716,18 +722,18 @@ module LibItsGeoNetworking_Templates {
in template (value) UInt8 p_hopLimit := c_defaultHopLimit,
in template (value) TrafficClass p_trafficClass := m_trafficClass
) := {
commonHeader := m_commonHeader(
commonHeader := valueof(m_commonHeader(
PX_GN_UPPER_LAYER,
m_geoUnicastHeaderType,
p_trafficClass,
p_hopLimit
),
extendedHeader := m_geoUnicastHeader(
)),
extendedHeader := valueof(m_geoUnicastHeader(
p_sourceLongPosVec,
p_destinationShortPosVec,
p_seqNumber
),
payload := f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD"))
)),
payload := valueof(f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD")))
}
/**
......@@ -827,18 +833,18 @@ module LibItsGeoNetworking_Templates {
in template (value) UInt8 p_hopLimit := c_defaultHopLimit,
in template (value) TrafficClass p_trafficClass := m_trafficClass
) := {
commonHeader := m_commonHeader(
commonHeader := valueof(m_commonHeader(
PX_GN_UPPER_LAYER,
m_geoAnycastHeaderType(p_anycastArea.geoAnycastSubType),
m_geoAnycastHeaderType(valueof(p_anycastArea.geoAnycastSubType)),
p_trafficClass,
p_hopLimit
),
extendedHeader := m_geoAnycastHeader(
)),
extendedHeader := valueof(m_geoAnycastHeader(
p_sourceLongPosVec,
p_seqNumber,
p_anycastArea
),
payload := f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD"))
)),
payload := valueof(f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD")))
}
/**
......@@ -941,18 +947,18 @@ module LibItsGeoNetworking_Templates {
in template (value) UInt8 p_hopLimit := c_defaultHopLimit,
in template (value) TrafficClass p_trafficClass := m_trafficClass
) := {
commonHeader := m_commonHeader(
commonHeader := valueof(m_commonHeader(
PX_GN_UPPER_LAYER,
m_geoBroadcastHeaderType(p_broadcastArea.geoBroadcastSubType),
m_geoBroadcastHeaderType(valueof(p_broadcastArea.geoBroadcastSubType)),
p_trafficClass,
p_hopLimit
),
extendedHeader := m_geoBroadcastHeader(
)),
extendedHeader := valueof(m_geoBroadcastHeader(
p_sourceLongPosVec,
p_seqNumber,
p_broadcastArea
),
payload := f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD"))
)),
payload := valueof(f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD")))
}
/**
......@@ -1244,16 +1250,16 @@ module LibItsGeoNetworking_Templates {
template (value) GnNonSecuredPacket m_geoNwShbPacket(
in template (value) LongPosVector p_sourceLongPosVec
) := {
commonHeader := m_commonHeader(
commonHeader := valueof(m_commonHeader(
PX_GN_UPPER_LAYER,
m_shbHeaderType,
m_trafficClass,
c_defaultHopLimit
),
extendedHeader := m_shbHeader(
)),
extendedHeader := valueof(m_shbHeader(
p_sourceLongPosVec
),
payload := f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD"))
)),
payload := valueof(f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD")))
}
/**
......@@ -1290,17 +1296,17 @@ module LibItsGeoNetworking_Templates {
in template (value) UInt8 p_hopLimit := c_defaultHopLimit,
in template (value) TrafficClass p_trafficClass := m_trafficClass
) := {
commonHeader := m_commonHeader(
commonHeader := valueof(m_commonHeader(
PX_GN_UPPER_LAYER,
m_tsbHeaderType,
p_trafficClass,
p_hopLimit
),
extendedHeader := m_tsbHeader(
)),
extendedHeader := valueof(m_tsbHeader(
p_seqNumber,
p_sourceLongPosVec
),
payload := f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD"))
)),
payload := valueof(f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD")))
}
/**
......@@ -1776,7 +1782,7 @@ module LibItsGeoNetworking_Templates {
in template (value) UInt16 p_seqNumber,
in template (value) GeoBroadcastArea p_broadcastArea
) := {
geoBroadcastHeader := {
geoBroadcastHeader := valueof({
seqNumber := p_seqNumber,
reserved := c_uInt8Zero,
srcPosVector := p_sourceLongPosVec,
......@@ -1786,7 +1792,7 @@ module LibItsGeoNetworking_Templates {
distanceB := p_broadcastArea.geoBroadcastArea.distanceB,
angle := p_broadcastArea.geoBroadcastArea.angle,
reserved2 := c_uInt24Zero
}
})
}
/**
......@@ -1885,7 +1891,7 @@ module LibItsGeoNetworking_Templates {
in template (value) UInt16 p_seqNumber,
in template (value) GeoAnycastArea p_anycastArea
) := {
geoAnycastHeader := {
geoAnycastHeader := valueof({
seqNumber := p_seqNumber,
reserved := c_uInt8Zero,
srcPosVector := p_sourceLongPosVec,
......@@ -1895,7 +1901,7 @@ module LibItsGeoNetworking_Templates {
distanceB := p_anycastArea.geoAnycastArea.distanceB,
angle := p_anycastArea.geoAnycastArea.angle,
reserved2 := c_uInt24Zero
}
})
}
/**
......
ttcn/IVIM/LibItsIvim_Functions.ttcn
View file @ 192caced
......@@ -373,7 +373,7 @@ module LibItsIvim_Functions {
var FncRetCode v_ret := e_success;
if (valueof(p_trigger) == e_ets) {
f_sendIviMessage(m_ivimStructureCancellation(p_iviIdentificationNumber));
f_sendIviMessage(valueof(m_ivimStructureCancellation(p_iviIdentificationNumber)));
f_sleep(PX_TNOAC);
}
else {
......
ttcn/IVIM/LibItsIvim_Templates.ttcn
View file @ 192caced
......@@ -77,7 +77,9 @@ module LibItsIvim_Templates {
* @param p_gnLifetime GN packet lifetime value (ms)
* @param p_gnTrafficClass GN traffic class value
*/
template IvimInd mw_ivimIndWithGnParameters (
//FIXME RGY template should be (present), no omit is assigned to it as a whole; Titan currently requires that the modified templte has at least the same restirction as the base
// template IvimInd mw_ivimIndWithGnParameters (
template(present) IvimInd mw_ivimIndWithGnParameters (
template (present) IVIM p_iviMsg,
in template UInt8 p_gnNextHeader := *,
in template UInt8 p_gnHeaderType := *,
......@@ -98,7 +100,9 @@ module LibItsIvim_Templates {
* @param p_btpDestinationPort BTP destination port value
* @param p_btpInfo BTP destination port info value (if BTP-B) or BTP source port value (if BTP-A)
*/
template IvimInd mw_ivimIndWithBtpParameters (
//FIXME RGY template should be (present), no omit is assigned to it as a whole; Titan currently requires that the modified templte has at least the same restirction as the base
// template IvimInd mw_ivimIndWithBtpParameters (
template(present) IvimInd mw_ivimIndWithBtpParameters (
template (present) IVIM p_iviMsg,
template UInt16 p_btpDestinationPort := *,
template UInt16 p_btpInfo := *
......@@ -113,7 +117,8 @@ module LibItsIvim_Templates {
* @param p_ssp SSP security parameter
* @param p_its_aid ITS-AID value
*/
template IvimInd mw_ivimIndWithSecurityParameters (
//FIXME RGY template should be (present), no omit is assigned to it as a whole; Titan currently requires that the modified templte has at least the same restirction as the base
template(present) IvimInd mw_ivimIndWithSecurityParameters (
template (present) IVIM p_iviMsg,
template Bit256 p_ssp := *,
template UInt32 p_its_aid := *
......@@ -310,7 +315,7 @@ module LibItsIvim_Templates {
template (value) IviStructure m_ivimStructureCancellation(
in template (value) IviIdentificationNumber p_iviIdentificationNumber
) := {
mandatory := m_iviManagementContainer(f_getProvider(), p_iviIdentificationNumber, IviStatus_cancellation_),
mandatory := valueof(m_iviManagementContainer(f_getProvider(), valueof(p_iviIdentificationNumber), IviStatus_cancellation_)),
optional_ := omit
} // End of template m_ivimStructureCancellation
......
ttcn/Ipv6OverGeoNetworking/LibItsIpv6OverGeoNetworking_Functions.ttcn
View file @ 192caced
......@@ -296,12 +296,14 @@ module LibItsIpv6OverGeoNetworking_Functions {
var LongPosVector v_nodeLongPosVector := f_getPosition(p_compName);
f_sendGeoNetMessageWithPayload(
m_geoNwReq_linkLayerBroadcast(
m_geoNwPdu(
m_geoNwBroadcastPacket(
v_nodeLongPosVector,
vc_localSeqNumber,
f_getGeoBroadcastArea(valueof(p_gvl.area))
valueof(
m_geoNwReq_linkLayerBroadcast(
m_geoNwPdu(
m_geoNwBroadcastPacket(
v_nodeLongPosVector,
vc_localSeqNumber,
f_getGeoBroadcastArea(valueof(p_gvl.area))
)
)
)
),
......@@ -312,12 +314,12 @@ module LibItsIpv6OverGeoNetworking_Functions {
c_icmpHdr,
m_rtAdvWithOptions(
m_rtAdvOpt_prefixOpt(
p_gvl.prefixLength,
valueof(p_gvl.prefixLength),
c_lFlag1,
c_aFlag1,
p_validLifetime,
c_preferredLifetime30s,
p_gvl.prefix
valueof(p_gvl.prefix)
)
)
)
......
ttcn/Ipv6OverGeoNetworking/LibItsIpv6OverGeoNetworking_TypesAndValues.ttcn
View file @ 192caced
......@@ -189,7 +189,7 @@ module LibItsIpv6OverGeoNetworking_TypesAndValues {
UInt32 reachableTime,
UInt32 retransTimer,
RtAdvOptions rtAdvOptions optional
} with { variant (checksum) "MarkForIPv6ChecksumCalculation" }
} // FIXME CHECK while TITAN refuse it: with { variant (checksum) "MarkForIPv6ChecksumCalculation" }
/**
* @desc RouterAdvertisement option list
......
ttcn/MapemSpatem/LibItsMapemSpatem_Functions.ttcn
View file @ 192caced
......@@ -332,6 +332,6 @@ module LibItsMapemSpatem_Functions {
}
}
} // End of receiveFunctions
} // End of group receiveFunctions
} // End of module LibItsMapemSpatem_Functions
\ No newline at end of file
ttcn/MapemSpatem/LibItsMapemSpatem_Templates.ttcn
View file @ 192caced
......@@ -93,7 +93,9 @@ module LibItsMapemSpatem_Templates {
* @param p_btpDestinationPort BTP destination port value
* @param p_btpInfo BTP destination port info value (if BTP-B) or BTP source port value (if BTP-A)
*/
template MapemInd mw_mapemIndWithBtpParameters(
//FIXME RGY template should be (present), no omit is assigned to it as a whole; Titan currently requires that the modified templte has at least the same restirction as the base
// template MapemInd mw_mapemIndWithBtpParameters(
template(present) MapemInd mw_mapemIndWithBtpParameters(
template (present) MAPEM p_mapemMsg,
in template UInt16 p_btpDestinationPort := *,
in template UInt16 p_btpInfo := *
......@@ -176,7 +178,9 @@ module LibItsMapemSpatem_Templates {
* @param p_btpDestinationPort BTP destination port value
* @param p_btpInfo BTP destination port info value (if BTP-B) or BTP source port value (if BTP-A)
*/
template SpatemInd mw_spatemIndWithBtpParameters(
//FIXME RGY template should be (present), no omit is assigned to it as a whole; Titan currently requires that the modified templte has at least the same restirction as the base
// template SpatemInd mw_spatemIndWithBtpParameters(
template(present) SpatemInd mw_spatemIndWithBtpParameters(
template (present) SPATEM p_spatemMsg,
template UInt16 p_btpDestinationPort := *,
template UInt16 p_btpInfo := *
......@@ -387,7 +391,9 @@ module LibItsMapemSpatem_Templates {
/**
* @desc Receive template for MAPEM Message
*/
template (omit) MapData m_mapem(
//FIXME RGY template should be (present), no omit is assigned to it as a whole; Titan currently requires that the modified templte has at least the same restirction as the base
// template (omit) MapData m_mapem(
template (value) MapData m_mapem(
in template (value) MsgCount p_msgIssueRevision,
in template (omit) IntersectionGeometryList p_intersectionGeometryList := omit,
in template (omit) RoadSegmentList p_roadSegments := omit
......@@ -563,7 +569,9 @@ module LibItsMapemSpatem_Templates {
/**
* @desc Send template for SPAT Message
*/
template (omit) SPAT m_spatem(
//FIXME RGY template should be (present), no omit is assigned to it as a whole; Titan currently requires that the modified templte has at least the same restirction as the base
// template (omit) SPAT m_spatem(
template (value) SPAT m_spatem(
in template (value) IntersectionStateList p_intersections,
in template (omit) DescriptiveName p_name := omit
) modifies m_defaultSpatem:= {
......
ttcn/Security/LibItsSecurity_Functions.ttcn3
View file @ 192caced
......@@ -273,7 +273,7 @@ module LibItsSecurity_Functions {
);
p_securedMessage := m_securedMessage(
v_toBeSignedSecuredMessage.header_fields,
valueof(v_toBeSignedSecuredMessage.header_fields),
p_payloadField,
{
m_trailer_field_signature(
......@@ -418,14 +418,14 @@ module LibItsSecurity_Functions {
// log("p_trailerStatus=", p_trailerStatus);
if (p_trailerStatus == 0) { // No signature
p_securedMessage := m_securedMessage(
v_toBeSignedSecuredMessage.header_fields,
valueof(v_toBeSignedSecuredMessage.header_fields),
p_payloadField,
{ }
);
v_trailerSize := 0;
} else if (p_trailerStatus == 2) { // Duplicate signature
p_securedMessage := m_securedMessage(
v_toBeSignedSecuredMessage.header_fields,
valueof(v_toBeSignedSecuredMessage.header_fields),
p_payloadField,
{
m_trailer_field_signature(
......@@ -453,7 +453,7 @@ module LibItsSecurity_Functions {
} else if (p_trailerStatus == 3) { // Signature with reserved algorthm
p_securedMessage := m_securedMessage_wrong_protocol(
p_protocolVersion,
v_toBeSignedSecuredMessage.header_fields,
valueof(v_toBeSignedSecuredMessage.header_fields),
p_payloadField,
{
m_trailer_field_signature(
......@@ -465,7 +465,7 @@ module LibItsSecurity_Functions {
);
} else { // Invalid signature
p_securedMessage := m_securedMessage(
v_toBeSignedSecuredMessage.header_fields,
valueof(v_toBeSignedSecuredMessage.header_fields),
p_payloadField,
{
m_trailer_field_signature(
......@@ -1021,7 +1021,7 @@ module LibItsSecurity_Functions {
if (valueof(p_issuingCertificate.subject_attributes[v_counter].type_) == e_verification_key) {
return f_verifyCertificateSignatureWithPublicKey(
p_certificateToBeVerified,
p_issuingCertificate.subject_attributes[v_counter].attribute.key);
valueof(p_issuingCertificate.subject_attributes[v_counter].attribute.key));
}
} // End of 'for' statement
......@@ -1054,8 +1054,8 @@ module LibItsSecurity_Functions {
// Create SecuredMessage payload to be signed
v_toBeSignedSecuredMessage := m_toBeSignedSecuredMessage(
p_securedMessage.header_fields,
p_securedMessage.payload_field,
valueof(p_securedMessage.header_fields),
valueof(p_securedMessage.payload_field),
e_signature
);
log("f_verifyGnSecuredMessageSignatureWithPublicKey: v_toBeSignedSecuredMessage=", v_toBeSignedSecuredMessage);
......@@ -1108,7 +1108,7 @@ module LibItsSecurity_Functions {
if (v_subjectAttribute.type_ == e_verification_key) {
return f_verifyGnSecuredMessageSignatureWithPublicKey(
p_securedMessage,