Commit b5c96590 authored by garciay's avatar garciay
Browse files

Align typing to ETSI TS 103 097 V 1.1.14 (2014-10)

parent abceb32e
Loading
Loading
Loading
Loading
+10 −11
Changes for ttcn/Security/LibItsSecurity_Functions.ttcn3: 10 added lines, 11 removed lines.
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ module LibItsSecurity_Functions {
        * @desc    Calculate digest over the certificate
        * @param   p_cert The certificate
        * @return  the HashedId8 value
        * @see Draft ETSI TS 103 097 V1.1.13 Clause 4.2.13   HashedId8
        * @see Draft ETSI TS 103 097 V1.1.14 Clause 4.2.13   HashedId8
        */
        function f_calculateDigestFromCertificate(
                                                  in Certificate p_cert
@@ -118,7 +118,7 @@ module LibItsSecurity_Functions {
            * @param   p_aaCertificate The AA certificate [out]
            * @param   p_atCertificate The AT certificate [out]
            * @return  true on succes, false otherwise
            * @see Draft ETSI TS 103 097 V1.1.13 Clause 4.2.13   HashedId8
            * @see Draft ETSI TS 103 097 V1.1.14 Clause 4.2.13   HashedId8
            */
            function f_prepareCertificates(
                                           in template (omit) charstring p_certificateName,
@@ -178,7 +178,7 @@ module LibItsSecurity_Functions {
                        { // Field HeaderFields
                            m_header_field_signer_info(
                                m_signerInfo_digest(
                                    vc_atCertificate.signer_infos[0].signerInfo.digest
                                    vc_atCertificate.signer_info.signerInfo.digest
                                ) // End of template m_signerInfo_certificate
                            ), // End of template m_header_field_signer_info
                            m_header_field_generation_time(oct2int('BBBBBBBB'O)),   // To be replaced by TA with generation time
@@ -323,7 +323,7 @@ module LibItsSecurity_Functions {
            * @param p_addMissingHeaders    Whether to add mandatory headers not present in p_headerFields
            * @return true on success, false otherwise
            * 
            * @see Draft ETSI TS 103 097 V1.1.13 Clause 7.1  Security profile for CAMs
            * @see Draft ETSI TS 103 097 V1.1.14 Clause 7.1  Security profile for CAMs
            */
            function f_buildGnSecuredCam(
                                         out template (value) SecuredMessage p_securedMessage,
@@ -368,7 +368,7 @@ module LibItsSecurity_Functions {
                        v_signerInfo := valueof(
                            m_header_field_signer_info(
                                m_signerInfo_digest(
                                    v_atCertificate.signer_infos[0].signerInfo.digest
                                    v_atCertificate.signer_info.signerInfo.digest
                        )));
                    }
                    v_mandatoryHeaders := {
@@ -438,7 +438,7 @@ module LibItsSecurity_Functions {
                        v_signerInfo := valueof(
                            m_header_field_signer_info(
                                m_signerInfo_digest(
                                    v_atCertificate.signer_infos[0].signerInfo.digest
                                    v_atCertificate.signer_info.signerInfo.digest
                        )));
                    }
                    v_mandatoryHeaders := {
@@ -510,7 +510,7 @@ module LibItsSecurity_Functions {
                        v_signerInfo := valueof(
                            m_header_field_signer_info(
                                m_signerInfo_digest(
                                    v_atCertificate.signer_infos[0].signerInfo.digest
                                    v_atCertificate.signer_info.signerInfo.digest
                        )));
                    }
                    v_mandatoryHeaders := {
@@ -731,7 +731,7 @@ module LibItsSecurity_Functions {
        group certificateGetters {
            
            /**
            * @desc Set the generation location as defined in Draft ETSI TS 103 097 V1.1.13 Clause 7.2 Security profile for DENMs
            * @desc Set the generation location as defined in Draft ETSI TS 103 097 V1.1.14 Clause 7.2 Security profile for DENMs
            * @param p_latitude    The latitude value of the ITS-S position
            * @param p_longitude   The longitude value of the ITS-S position
            * @param p_elevation   The elevation value of the ITS-S position
@@ -849,9 +849,8 @@ module LibItsSecurity_Functions {
                                                in template (value) Certificate p_cert,
                                                out SignerInfo p_si
            ) return boolean {
                if (isbound(valueof(p_cert).signer_infos)
                    and lengthof(p_cert.signer_infos) > 0) {
                    p_si := valueof(p_cert).signer_infos[0];
                if (isbound(valueof(p_cert).signer_info)) {
                    p_si := valueof(p_cert).signer_info;
                    return true;
                }
                return false;
+120 −120

File changed.

Preview size limit exceeded, changes collapsed.

+1 −1
Changes for ttcn/Security/LibItsSecurity_TestSystem.ttcn3: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ module LibItsSecurity_TestSystem {
            var Oct32 vc_signingPrivateKey; 
            var Oct32 vc_encryptPrivateKey; 
            
            // Generation position. See Draft ETSI TS 103 097 V1.1.13 Clause 7.2    Security profiles for DENMs
            // Generation position. See Draft ETSI TS 103 097 V1.1.14 Clause 7.2    Security profiles for DENMs
            var ThreeDLocation vc_location; 
            
            // Test Adapter certificates & private keys
+60 −66

File changed.

Preview size limit exceeded, changes collapsed.