Commit 4f10dcc8 authored by garciay's avatar garciay
Browse files

Update Payload template

Change 'set of' into 'record of'
parent a0e26b17
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
@@ -10,7 +10,7 @@ module LibItsSecurity_Pixits {
    // LibCommon
    // LibCommon
    import from LibCommon_DataStrings {
    import from LibCommon_DataStrings {
        type 
        type 
            Oct0to12        
            Oct12
    }
    }
    
    
    // LibItsSecurity
    // LibItsSecurity
@@ -51,6 +51,6 @@ module LibItsSecurity_Pixits {
    /**
    /**
     * @desc 
     * @desc 
     */
     */
    modulepar Oct0to12 PX_AESCCM_NONCE  := '010203040506070808080808'O;
    modulepar Oct12 PX_AESCCM_NONCE  := '010203040506070808080808'O;
    
    
} // End of module LibItsSecurity_Pixits
} // End of module LibItsSecurity_Pixits
 No newline at end of file
+9 −5
Original line number Original line Diff line number Diff line
@@ -642,18 +642,22 @@ module LibItsSecurity_Templates {
        
        
        group payloads {
        group payloads {
                
                
            /**
             * @desc Send template for 'signed_external' Payload 
             * @see Draft ETSI TS 103 097 V1.1.6 Clause 5.2 Payload
             */
            template (value) Payload m_payload_signed_external := {
            template (value) Payload m_payload_signed_external := {
                type_   := e_signed_external,
                type_   := e_signed_external,
                data    := omit
                data    := omit
            } // End of template m_payload_signed_external
            } // End of template m_payload_signed_external
            
            
            template (value) Payload m_data_payload_rawPayload(
            template (value) Payload m_data_payload(
                                                    in template (value) PayloadType p_type,
                                                    in template (value) PayloadType p_type,
                                                               in template (value) octetstring p_rawPayload
                                                    in template (value) octetstring p_data
            ) := {
            ) := {
                type_   := p_type,
                type_   := p_type,
                data    := p_rawPayload
                data    := p_data
            } // End of template m_data_payload_rawPayload
            } // End of template m_data_payload
            
            
//            group camPayloads {
//            group camPayloads {
//                
//                
+10 −10
Original line number Original line Diff line number Diff line
@@ -429,7 +429,7 @@ module LibItsSecurity_TypesAndValues {
            TrailerFields   trailer_fields
            TrailerFields   trailer_fields
        } // End of type SecuredMessage
        } // End of type SecuredMessage
        
        
        type set of HeaderField HeaderFields;
        type record of HeaderField HeaderFields;
        
        
        /**
        /**
         * @desc Information of interest to the security layer
         * @desc Information of interest to the security layer
@@ -469,7 +469,7 @@ module LibItsSecurity_TypesAndValues {
            octetstring                     other_header
            octetstring                     other_header
        } // End of type HeaderFieldContainer
        } // End of type HeaderFieldContainer
        
        
        type set of Payload Payloads;
        type record of Payload Payloads;
        
        
        /**
        /**
         * @desc Payload structure
         * @desc Payload structure
@@ -501,7 +501,7 @@ module LibItsSecurity_TypesAndValues {
        /**
        /**
         * @desc Supported types of payloads
         * @desc Supported types of payloads
         * 
         * 
         * @see Draft ETSI TS 103 097 V1.1.6 Clause 5.3 Payload
         * @see Draft ETSI TS 103 097 V1.1.6 Clause 5.3 PayloadType
         */
         */
        type enumerated PayloadType {
        type enumerated PayloadType {
            e_unsecured             (0),
            e_unsecured             (0),
@@ -511,7 +511,7 @@ module LibItsSecurity_TypesAndValues {
            e_signed_and_encrypted  (4)
            e_signed_and_encrypted  (4)
        } with { variant "8 bit" }
        } with { variant "8 bit" }
        
        
        type set of TrailerField TrailerFields;
        type record of TrailerField TrailerFields;
        
        
        /**
        /**
         * @desc Information used by the security layer after processing the payload
         * @desc Information used by the security layer after processing the payload
@@ -602,9 +602,9 @@ module LibItsSecurity_TypesAndValues {
            Signature               signature_
            Signature               signature_
        } // End of type Certificate
        } // End of type Certificate
        
        
        type set of Certificate CertificateChain;
        type record of Certificate CertificateChain;
        
        
        type set of SignerInfo SignerInfos;
        type record of SignerInfo SignerInfos;
        
        
        /**
        /**
         * @desc Certificate description
         * @desc Certificate description
@@ -659,11 +659,11 @@ module LibItsSecurity_TypesAndValues {
            octetstring         other_attribute
            octetstring         other_attribute
        } // End of type SubjectAttributeContainer
        } // End of type SubjectAttributeContainer
        
        
        type set of SubjectAttribute SubjectAttributes;
        type record of SubjectAttribute SubjectAttributes;
        
        
        type set of IntX IntXs;
        type record of IntX IntXs;
        
        
        type set of ItsAidSsp ItsAidSsps;
        type record of ItsAidSsp ItsAidSsps;
        
        
        /**
        /**
         * @desc The list of the possible types of attributes
         * @desc The list of the possible types of attributes
@@ -750,7 +750,7 @@ module LibItsSecurity_TypesAndValues {
            e_region                    (3)
            e_region                    (3)
        } with { variant "8 bit" }
        } with { variant "8 bit" }
        
        
        type set of ValidityRestriction ValidityRestrictions;
        type record of ValidityRestriction ValidityRestrictions;
        
        
        /**
        /**
         * @desc ITS-AID  description
         * @desc ITS-AID  description