Commit 27e117b7 authored by garciay's avatar garciay
Browse files

Add new templates for security headers 

TTCN-3 typing review
parent 385f19be

ttcn/Security/LibItsSecurity_Templates.ttcn3

+406 −53

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/Security/LibItsSecurity_TypesAndValues.ttcn3

+8 −7
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ module LibItsSecurity_TypesAndValues { 
    import from LibCommon_DataStrings {

        type 

            Bit2, Bit3, 

            Oct2, Oct3, Oct8, Oct12, Oct20, Oct0to31, Oct0to255 

            Oct2, Oct3, Oct8, Oct12, Oct20, Oct0to31 

    }

    

//    // LibIts
@@ -425,7 +425,7 @@ module LibItsSecurity_TypesAndValues { 
            UInt8           protocol_version,

            UInt8           security_profile,

            HeaderFields    header_fields,

            Payloads        payload_fields,

            Payloads        payload_fields optional, // Used by the codec to fill it with the plain text packet in case of 'omit' value

            TrailerFields   trailer_fields

        } // End of type SecuredMessage
@@ -600,7 +600,7 @@ module LibItsSecurity_TypesAndValues { 
         */

        type record Certificate {

            UInt8                   version,

            SignerInfos             signer_info,

            SignerInfos             signer_infos,

            SubjectInfo             subject_info,

            SubjectAttributes       subject_attributes,

            ValidityRestrictions    validity_restrictions,
@@ -616,10 +616,11 @@ module LibItsSecurity_TypesAndValues { 
         * @member subject_type The type subjet

         * @member subject_name The subject itself

         * @see Draft ETSI TS 103 097 V1.1.6 Clause 6.2 SubjectInfo

         * @remark The subject_name variable-length vector shall have a maximum length of 32 bytes

         */

        type record SubjectInfo {

            SubjectType subject_type,

            Oct0to255   subject_name

            Oct0to31    subject_name // The subject_name variable-length vector shall have a maximum length of 32 bytes 

        } // End of type SubjectInfo

        

        /**
@@ -713,12 +714,14 @@ module LibItsSecurity_TypesAndValues { 
         * @member end_validity             Validity restriction till the end date

         * @member time_start_and_end       Validity restriction between into a range

         * @member time_start_and_duration  Validity restriction between into a range from a start date and inside a geographical aera 

         * @member region                   Validity restriction into a geographical area

         * @member data                     TODO

         */

        type union ValidityRestrictionContainer {

            Time32          end_validity,

            TimeStartEnd    time_start_and_end,

            TimeDuration    time_start_and_duration,

            GeographicRegion    region,

            octetstring     data

        } // End of type ValidityRestrictionContainer
@@ -736,12 +739,10 @@ module LibItsSecurity_TypesAndValues { 
         * @desc Defines the validity restriction between into a range from a start date and inside a geographical aera

         * @member start_validity   Start date

         * @member duration         Duration of the validity restriction from the start date

         * @member GeographicRegion The geographical aera

         */

        type record TimeDuration {

            Time32              start_validity,

            Duration            duration,

            GeographicRegion    region

            Duration            duration

        } // End of type TimeDuration

        

        /**