Commit 18236d1a authored by berge's avatar berge
Browse files

Added TC_ITS_S_CAM_02

Updated TC_ITS_S_CAM_01
parent 763fafbd
Loading
Loading
Loading
Loading
+31 −0
Original line number Diff line number Diff line
@@ -615,6 +615,37 @@ module LibItsGeoNetworking_Templates {
            }
        }
        
        group geoNwPacketTemplates {
            
            /**
             * @desc    Receive template for any GeoNetworking Packet
             */
            template (present) GnNonSecuredPacket mw_geoNwAnyPacket := {
                commonHeader := mw_commonHeader(
                    ?,
                    ?
                ),
                extendedHeader := *,
                payload := *
            }
            
            /**
             * @desc    Receive template for any GeoNetworking Packet with Payload
             * @param   payload  Expected GN payload 
             */
            template (present) GnNonSecuredPacket mw_geoNwAnyPacket_withPayload(
                template (present) Payload p_payload
            ) := {
                commonHeader := mw_commonHeader(
                    ?,
                    ?
                ),
                extendedHeader := *,
                payload := p_payload
            }
                        
        } // end group geoNwPacketTemplates
        
        group geoNwPacketUnicastTemplates {
            
            /**
+7 −7
Original line number Diff line number Diff line
@@ -15,18 +15,18 @@ module LibItsSecurity_GNTemplates {
    }

    /**
     * @desc    Receive template for GeoNetworking PDU with
     * @param   p_packet    GnNonSecuredPacket of GeoNetworking message
     * @param   p_lifeTime  Lifetime of GeoNetworking message (Default: ?)
     * @param   p_hopLimit  Router Hop limit of GeoNetworking message (Default: ?)
     * @desc    Receive template for secured GeoNetworking PDU
     * @param 	p_secMsg	Secured message
     * @param   p_packet    Clear-text version of the packet
     */
    template (present) GeoNetworkingPdu mw_geoNwSecPdu(
        in template (present) SecuredMessage p_msg
        in template (present) SecuredMessage p_secMsg,
        in template (present) GnNonSecuredPacket p_packet := ?
    ) := {
        basicHeader := mw_basicHeader(),
        gnPacket := {
            packet := ?,
            securedMsg := p_msg
            packet := p_packet,
            securedMsg := p_secMsg
        }
    }
}
 No newline at end of file
+38 −2
Original line number Diff line number Diff line
@@ -744,6 +744,21 @@ module LibItsSecurity_Templates {
         */
        group messagesRecv {

            /**
             * @desc Generic received template for SecuredMessage
             */
            template (present) SecuredMessage mw_securedMessage(
                template (present) HeaderFields    p_header := ?,
                template           Payloads        p_payloads := *, 
                template (present) TrailerFields   p_trailer := ? 
            ) := {
                protocol_version    := c_protocol_version, 
                security_profile    := ?,
                header_fields       := p_header,
                payload_fields      := p_payloads,
                trailer_fields      := p_trailer
            } // End of template mw_securedMessage

        } // End of group messagesRecv 
        
        /**
@@ -950,6 +965,15 @@ module LibItsSecurity_Templates {
             */
            group headerFieldsRecv {
                
                /**
                 * @desc Receive template for HeaderField with generation time information
                 * @param p_headerType  Type id of the Header field
                 */
                template (present) HeaderField mw_header_field_any(HeaderFieldType p_headerType) := {
                    type_       := p_headerType,
                    headerField := ?
                } // End of template mw_header_field_generation_time
                
                /**
                 * @desc Receive template for HeaderField with generation time information
                 * @see Draft ETSI TS 103 097 V1.1.6 Clause 5.4    HeaderField
@@ -1593,7 +1617,7 @@ module LibItsSecurity_Templates {
        
        /**
         */
        group securityProfilesCAMs {
        group camSecurityProfiles {
            
            /**
             */
@@ -1625,6 +1649,18 @@ module LibItsSecurity_Templates {
                    security_profile    := c_security_profileCAMs
                } // End of template mdw_secureMessageCAMs_dummy

                /**
                 * @desc Generic received template for SecuredMessage
                 */
                template (present) SecuredMessage mdw_securedMessageCAM(
                    template (present) HeaderFields    p_header := ?,
                    template (present) Payloads        p_payloads := ?, 
                    template (present) TrailerFields   p_trailer := ? 
                )
                modifies mw_securedMessage := {
                    security_profile    := c_security_profileCAMs
                } // End of template mdw_securedMessageCAMs
                
                /**
                 * @desc Generic received template for Security profile for CAMs
                 */
+1 −1
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ module LibItsSecurity_TypesAndValues {
            UInt8           protocol_version,
            UInt8           security_profile,
            HeaderFields    header_fields,
            Payloads        payload_fields optional, // Used by the codec to fill it with the plain text packet in case of 'omit' value
            Payloads        payload_fields optional, // Used by the codec to fill it with the secured packet in case of 'omit' value
            TrailerFields   trailer_fields
        } // End of type SecuredMessage