Commit ac507135 authored by YannGarcia's avatar YannGarcia
Browse files

Remove titan.TestPorts.HTTPmsg; Split codoecs/layers in Protocols; Add support... 

Remove titan.TestPorts.HTTPmsg; Split codoecs/layers in Protocols; Add support of NistP384 signature
parent 935f56da

ItsSecurity_TestCases.ttcn

+30 −30
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ module ItsSecurity_TestCases { 
         * }

         * </pre>

         *

         * @see         ETSI TS 103 096-2 v1.5.1 TP_TC_SEC_ITSS_SND_MSG_01_BV

         * @see         ETSI TS 103 096-2 v1.5.1 TP_SEC_ITSS_SND_MSG_01_BV

         * @reference   ETSI TS 103 097 [1] Clause 5.1 

         * @reference   IEEE1609.2[2] Clause 6.3.2

         */
@@ -7052,7 +7052,7 @@ module ItsSecurity_TestCases { 
         * }

         * </pre>

         *

         * @see         ETSI TS 103 096-2 v1.5.1 TP_TC_SEC_ITSS_RCV_MSG_01_BV

         * @see         ETSI TS 103 096-2 v1.5.1 TP_SEC_ITSS_RCV_MSG_01_BV

         * @reference   ETSI TS 103 097 [1] Clause 5.1

         * @reference   IEEE1609.2[2] Clause 6.3.2

         */
@@ -7129,7 +7129,7 @@ module ItsSecurity_TestCases { 
         * }

         * </pre>

         *

         * @see         ETSI TS 103 096-2 v1.5.1 TP_TC_SEC_ITSS_RCV_MSG_01_BV

         * @see         ETSI TS 103 096-2 v1.5.1 TP_SEC_ITSS_RCV_MSG_01_BV

         * @reference   ETSI TS 103 097 [1] Clause 5.1 

         * @reference   IEEE1609.2[2] Clause 6.3.2

         */
@@ -7204,7 +7204,7 @@ module ItsSecurity_TestCases { 
         * }

         * </pre>

         *

         * @see         ETSI TS 103 096-2 v1.5.1 TP_TC_SEC_ITSS_RCV_MSG_02_BV

         * @see         ETSI TS 103 096-2 v1.5.1 TP_SEC_ITSS_RCV_MSG_02_BV

         * @reference   ETSI TS 103 097 [1] Clause 5.1

         * @reference   IEEE1609.2[2] Clause 6.3.2

         */
@@ -7309,7 +7309,7 @@ module ItsSecurity_TestCases { 
           * }

           * </pre>

           *

           * @see         ETSI TS 103 096-2 v1.5.1 TP_TC_SEC_ITSS_RCV_CAM_01_BV

           * @see         ETSI TS 103 096-2 v1.5.1 TP_SEC_ITSS_RCV_CAM_01_BV

           * @reference   ETSI TS 103 097 [1] Clause 7.1.1

           */

          testcase TC_SEC_ITSS_RCV_CAM_01_BV() runs on ItsGeoNetworking system ItsSecSystem {
@@ -7393,7 +7393,7 @@ module ItsSecurity_TestCases { 
           * }

           * </pre>

           *

           * @see         ETSI TS 103 096-2 v1.5.1 TP_TC_SEC_ITSS_RCV_CAM_02_BV

           * @see         ETSI TS 103 096-2 v1.5.1 TP_SEC_ITSS_RCV_CAM_02_BV

           * @reference   ETSI TS 103 097 [1] Clause 7.1.1

           */

          testcase TC_SEC_ITSS_RCV_CAM_02_BV() runs on ItsGeoNetworking system ItsSecSystem {
@@ -7480,7 +7480,7 @@ module ItsSecurity_TestCases { 
           * }

           * </pre>

           *

           * @see         ETSI TS 103 096-2 v1.5.1 TP_TC_SEC_ITSS_RCV_CAM_03_BV

           * @see         ETSI TS 103 096-2 v1.5.1 TP_SEC_ITSS_RCV_CAM_03_BV

           * @reference   ETSI TS 103 097 [1] Clause 7.1.1

           */

          testcase TC_SEC_ITSS_RCV_CAM_03_BV() runs on ItsGeoNetworking system ItsSecSystem {
@@ -7567,7 +7567,7 @@ module ItsSecurity_TestCases { 
           * }

           * </pre>

           *

           * @see         ETSI TS 103 096-2 v1.5.1 TP_TC_SEC_ITSS_RCV_CAM_04_BV_XX

           * @see         ETSI TS 103 096-2 v1.5.1 TP_SEC_ITSS_RCV_CAM_04_BV_XX

           * @reference   ETSI TS 103 097 [1] Clause 7.1.1

           */

          testcase TC_SEC_ITSS_RCV_CAM_04_BV_XX() runs on ItsGeoNetworking system ItsSecSystem {
@@ -7659,7 +7659,7 @@ module ItsSecurity_TestCases { 
           * }

           * </pre>

           *

           * @see         ETSI TS 103 096-2 v1.5.1 TP_TC_SEC_ITSS_RCV_CAM_05_BV

           * @see         ETSI TS 103 096-2 v1.5.1 TP_SEC_ITSS_RCV_CAM_05_BV

           * @reference   ETSI TS 103 097 [1] Clause 7.1.1

           */

          testcase TC_SEC_ITSS_RCV_CAM_05_BV() runs on ItsGeoNetworking system ItsSecSystem {
@@ -7751,7 +7751,7 @@ module ItsSecurity_TestCases { 
           * }

           * </pre>

           *

           * @see         ETSI TS 103 096-2 v1.5.1 TP_TC_SEC_ITSS_RCV_CAM_06_BV

           * @see         ETSI TS 103 096-2 v1.5.1 TP_SEC_ITSS_RCV_CAM_06_BV

           * @reference   ETSI TS 103 097 [1] Clause 7.1.1

           */

          testcase TC_SEC_ITSS_RCV_CAM_06_BV() runs on ItsGeoNetworking system ItsSecSystem {
@@ -7836,7 +7836,7 @@ module ItsSecurity_TestCases { 
           * }

           * </pre>

           *

           * @see         ETSI TS 103 096-2 v1.5.1 TP_TC_SEC_ITSS_RCV_CAM_01_BO

           * @see         ETSI TS 103 096-2 v1.5.1 TP_SEC_ITSS_RCV_CAM_01_BO

           * @reference   ETSI TS 103 097 [1] Clause 7.1.1

           */

          testcase TC_SEC_ITSS_RCV_CAM_01_BO() runs on ItsGeoNetworking system ItsSecSystem {
@@ -7915,7 +7915,7 @@ module ItsSecurity_TestCases { 
           * }

           * </pre>

           *

           * @see         ETSI TS 103 096-2 v1.5.1 TP_TC_SEC_ITSS_RCV_CAM_02_BO

           * @see         ETSI TS 103 096-2 v1.5.1 TP_SEC_ITSS_RCV_CAM_02_BO

           * @reference   ETSI TS 103 097 [1] Clause 7.1.1

           */

          testcase TC_SEC_ITSS_RCV_CAM_02_BO() runs on ItsGeoNetworking system ItsSecSystem {
@@ -7995,7 +7995,7 @@ module ItsSecurity_TestCases { 
           * }

           * </pre>

           *

           * @see         ETSI TS 103 096-2 v1.5.1 TP_TC_SEC_ITSS_RCV_CAM_03_BO

           * @see         ETSI TS 103 096-2 v1.5.1 TP_SEC_ITSS_RCV_CAM_03_BO

           * @reference   ETSI TS 103 097 [1] Clause 7.1.1

           */

          testcase TC_SEC_ITSS_RCV_CAM_03_BO() runs on ItsGeoNetworking system ItsSecSystem {
@@ -8076,7 +8076,7 @@ module ItsSecurity_TestCases { 
           * }

           * </pre>

           *

           * @see         ETSI TS 103 096-2 v1.5.1 TP_TC_SEC_ITSS_RCV_CAM_04_BO

           * @see         ETSI TS 103 096-2 v1.5.1 TP_SEC_ITSS_RCV_CAM_04_BO

           * @reference   ETSI TS 103 097 [1] Clause 7.1.1

           */

          testcase TC_SEC_ITSS_RCV_CAM_04_BO() runs on ItsGeoNetworking system ItsSecSystem {
@@ -8158,7 +8158,7 @@ module ItsSecurity_TestCases { 
           * }

           * </pre>

           *

           * @see         ETSI TS 103 096-2 v1.5.1 TP_TC_SEC_ITSS_RCV_CAM_05_BO

           * @see         ETSI TS 103 096-2 v1.5.1 TP_SEC_ITSS_RCV_CAM_05_BO

           * @reference   ETSI TS 103 097 [1] Clause 7.1.1

           */

          testcase TC_SEC_ITSS_RCV_CAM_05_BO() runs on ItsGeoNetworking system ItsSecSystem {
@@ -8241,7 +8241,7 @@ module ItsSecurity_TestCases { 
           * }

           * </pre>

           *

           * @see         ETSI TS 103 096-2 v1.5.1 TP_TC_SEC_ITSS_RCV_CAM_06_BO

           * @see         ETSI TS 103 096-2 v1.5.1 TP_SEC_ITSS_RCV_CAM_06_BO

           * @reference   ETSI TS 103 097 [1] Clause 7.1.1

           */

          testcase TC_SEC_ITSS_RCV_CAM_06_BO() runs on ItsGeoNetworking system ItsSecSystem {
@@ -8322,7 +8322,7 @@ module ItsSecurity_TestCases { 
           * }

           * </pre>

           *

           * @see         ETSI TS 103 096-2 v1.5.1 TP_TC_SEC_ITSS_RCV_CAM_07_BO

           * @see         ETSI TS 103 096-2 v1.5.1 TP_SEC_ITSS_RCV_CAM_07_BO

           * @reference   ETSI TS 103 097 [1] Clause 7.1.1

           */

          testcase TC_SEC_ITSS_RCV_CAM_07_BO() runs on ItsGeoNetworking system ItsSecSystem {
@@ -8404,7 +8404,7 @@ module ItsSecurity_TestCases { 
           * }

           * </pre>

           *

           * @see         ETSI TS 103 096-2 v1.5.1 TP_TC_SEC_ITSS_RCV_CAM_08_BO

           * @see         ETSI TS 103 096-2 v1.5.1 TP_SEC_ITSS_RCV_CAM_08_BO

           * @reference   ETSI TS 103 097 [1] Clause 7.1.1

           */

          testcase TC_SEC_ITSS_RCV_CAM_08_BO() runs on ItsGeoNetworking system ItsSecSystem {
@@ -8486,7 +8486,7 @@ module ItsSecurity_TestCases { 
           * }

           * </pre>

           *

           * @see         ETSI TS 103 096-2 v1.5.1 TP_TC_SEC_ITSS_RCV_CAM_09_BO

           * @see         ETSI TS 103 096-2 v1.5.1 TP_SEC_ITSS_RCV_CAM_09_BO

           * @reference   ETSI TS 103 097 [1] Clause 7.1.1

           */

          testcase TC_SEC_ITSS_RCV_CAM_09_BO() runs on ItsGeoNetworking system ItsSecSystem {
@@ -8602,7 +8602,7 @@ module ItsSecurity_TestCases { 
           * }

           * </pre>

           *

           * @see         ETSI TS 103 096-2 v1.5.1 TP_TC_SEC_ITSS_RCV_DENM_01_BV

           * @see         ETSI TS 103 096-2 v1.5.1 TP_SEC_ITSS_RCV_DENM_01_BV

           * @reference   ETSI TS 103 097 [1] Clause 7.1.1

           */

          testcase TC_SEC_ITSS_RCV_DENM_01_BV() runs on ItsGeoNetworking system ItsSecSystem {
@@ -8710,7 +8710,7 @@ module ItsSecurity_TestCases { 
           * }

           * </pre>

           *

           * @see         ETSI TS 103 096-2 v1.5.1 TP_TC_SEC_ITSS_RCV_DENM_02_BV_XX

           * @see         ETSI TS 103 096-2 v1.5.1 TP_SEC_ITSS_RCV_DENM_02_BV_XX

           * @reference   ETSI TS 103 097 [1] Clause 7.1.1

           */

          testcase TC_SEC_ITSS_RCV_DENM_02_BV_XX() runs on ItsGeoNetworking system ItsSecSystem {
@@ -8811,7 +8811,7 @@ module ItsSecurity_TestCases { 
           * }

           * </pre>

           *

           * @see         ETSI TS 103 096-2 v1.5.1 TP_TC_SEC_ITSS_RCV_DENM_03_BV

           * @see         ETSI TS 103 096-2 v1.5.1 TP_SEC_ITSS_RCV_DENM_03_BV

           * @reference   ETSI TS 103 097 [1] Clause 7.1.1

           */

          testcase TC_SEC_ITSS_RCV_DENM_03_BV() runs on ItsGeoNetworking system ItsSecSystem {
@@ -9006,7 +9006,7 @@ module ItsSecurity_TestCases { 
           * }

           * </pre>

           *

           * @see         ETSI TS 103 096-2 v1.5.1 TP_TC_SEC_ITSS_RCV_DENM_01_BO

           * @see         ETSI TS 103 096-2 v1.5.1 TP_SEC_ITSS_RCV_DENM_01_BO

           * @reference   ETSI TS 103 097 [1] Clause 7.1.1

           */

          testcase TC_SEC_ITSS_RCV_DENM_01_BO() runs on ItsGeoNetworking system ItsSecSystem {
@@ -9085,7 +9085,7 @@ module ItsSecurity_TestCases { 
           * }

           * </pre>

           *

           * @see         ETSI TS 103 096-2 v1.5.1 TP_TC_SEC_ITSS_RCV_DENM_02_BO

           * @see         ETSI TS 103 096-2 v1.5.1 TP_SEC_ITSS_RCV_DENM_02_BO

           * @reference   ETSI TS 103 097 [1] Clause 7.1.1

           */

          testcase TC_SEC_ITSS_RCV_DENM_02_BO() runs on ItsGeoNetworking system ItsSecSystem {
@@ -9165,7 +9165,7 @@ module ItsSecurity_TestCases { 
           * }

           * </pre>

           *

           * @see         ETSI TS 103 096-2 v1.5.1 TP_TC_SEC_ITSS_RCV_DENM_03_BO

           * @see         ETSI TS 103 096-2 v1.5.1 TP_SEC_ITSS_RCV_DENM_03_BO

           * @reference   ETSI TS 103 097 [1] Clause 7.1.1

           */

          testcase TC_SEC_ITSS_RCV_DENM_03_BO() runs on ItsGeoNetworking system ItsSecSystem {
@@ -9246,7 +9246,7 @@ module ItsSecurity_TestCases { 
           * }

           * </pre>

           *

           * @see         ETSI TS 103 096-2 v1.5.1 TP_TC_SEC_ITSS_RCV_DENM_04_BO

           * @see         ETSI TS 103 096-2 v1.5.1 TP_SEC_ITSS_RCV_DENM_04_BO

           * @reference   ETSI TS 103 097 [1] Clause 7.1.1

           */

          testcase TC_SEC_ITSS_RCV_DENM_04_BO() runs on ItsGeoNetworking system ItsSecSystem {
@@ -9328,7 +9328,7 @@ module ItsSecurity_TestCases { 
           * }

           * </pre>

           *

           * @see         ETSI TS 103 096-2 v1.5.1 TP_TC_SEC_ITSS_RCV_DENM_05_BO

           * @see         ETSI TS 103 096-2 v1.5.1 TP_SEC_ITSS_RCV_DENM_05_BO

           * @reference   ETSI TS 103 097 [1] Clause 7.1.1

           */

          testcase TC_SEC_ITSS_RCV_DENM_05_BO() runs on ItsGeoNetworking system ItsSecSystem {
@@ -9411,7 +9411,7 @@ module ItsSecurity_TestCases { 
           * }

           * </pre>

           *

           * @see         ETSI TS 103 096-2 v1.5.1 TP_TC_SEC_ITSS_RCV_DENM_06_BO

           * @see         ETSI TS 103 096-2 v1.5.1 TP_SEC_ITSS_RCV_DENM_06_BO

           * @reference   ETSI TS 103 097 [1] Clause 7.1.1

           */

          testcase TC_SEC_ITSS_RCV_DENM_06_BO() runs on ItsGeoNetworking system ItsSecSystem {
@@ -9492,7 +9492,7 @@ module ItsSecurity_TestCases { 
           * }

           * </pre>

           *

           * @see         ETSI TS 103 096-2 v1.5.1 TP_TC_SEC_ITSS_RCV_DENM_07_BO

           * @see         ETSI TS 103 096-2 v1.5.1 TP_SEC_ITSS_RCV_DENM_07_BO

           * @reference   ETSI TS 103 097 [1] Clause 7.1.1

           */

          testcase TC_SEC_ITSS_RCV_DENM_07_BO() runs on ItsGeoNetworking system ItsSecSystem {
@@ -9573,7 +9573,7 @@ module ItsSecurity_TestCases { 
           * }

           * </pre>

           *

           * @see         ETSI TS 103 096-2 v1.5.1 TP_TC_SEC_ITSS_RCV_DENM_09_BO

           * @see         ETSI TS 103 096-2 v1.5.1 TP_SEC_ITSS_RCV_DENM_09_BO

           * @reference   ETSI TS 103 097 [1] Clause 7.1.1

           */

          testcase TC_SEC_ITSS_RCV_DENM_09_BO() runs on ItsGeoNetworking system ItsSecSystem {

lib/LibItsSecurity_Pixits.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ module LibItsSecurity_Pixits { 
    modulepar charstring PX_IUT_DEFAULT_CERTIFICATE := "CERT_IUT_A_AT";

    

    /**

     * @desc The certficate the IUT should use. Default: CERT_TS_B_AT

     * @desc The new certficate the TS should use. Default: CERT_TS_B_AT

     * @remark Possible values: CERT_TS_C_AT, CERT_TS_D_AT, or CERT_TS_E_AT

     */

    modulepar charstring PX_AT_CERTIFICATE := "CERT_TS_B_AT";

lib/LibItsSecurity_Templates.ttcn

+34 −27
Original line number Diff line number Diff line
@@ -879,7 +879,9 @@ module LibItsSecurity_Templates { 
            missingCrlIdentifier  := omit,

            encryptionKey         := omit,

            inlineP2pcdRequest    := omit,

            requestedCertificate := omit

            requestedCertificate  := omit,

            pduFunctionalType     := omit,

            contributedExtensions := omit

        } // End of template m_ieee1609Dot2_headerInfo

        

        /**
@@ -896,7 +898,9 @@ module LibItsSecurity_Templates { 
            missingCrlIdentifier := omit,

            encryptionKey        := omit,

            inlineP2pcdRequest   := omit,

            requestedCertificate := omit

            requestedCertificate := omit,

            pduFunctionalType     := omit,

            contributedExtensions := omit

        } // End of template mw_ieee1609Dot2_headerInfo

        

        /**
@@ -907,13 +911,6 @@ module LibItsSecurity_Templates { 
                                                                                     template (present) Certificate p_requestedCertificate := ?

        ) modifies mw_ieee1609Dot2_headerInfo := { 

            psid                 := p_psid,

            generationTime       := *,

            expiryTime           := *,

            generationLocation   := *,

            p2pcdLearningRequest := omit,

            missingCrlIdentifier := omit,

            encryptionKey        := omit,

            inlineP2pcdRequest   := omit,

            requestedCertificate := p_requestedCertificate

        } // End of template mw_ieee1609Dot2_headerInfo
@@ -1343,7 +1340,8 @@ module LibItsSecurity_Templates { 
            certRequestPermissions := omit, 

            canRequestRollover     := omit,

            encryptionKey          := p_encryptionKey,

            verifyKeyIndicator     := p_verifyKeyIndicator

            verifyKeyIndicator     := p_verifyKeyIndicator,

            flags                  := omit

        } // End of template m_toBeSignedCertificate_ca

        

        /**
@@ -1372,7 +1370,8 @@ module LibItsSecurity_Templates { 
            certRequestPermissions := p_certRequestPermissions, 

            canRequestRollover     := omit,

            encryptionKey          := p_encryptionKey,

            verifyKeyIndicator     := p_verifyKeyIndicator

            verifyKeyIndicator     := p_verifyKeyIndicator,

            flags                  := omit

        } // End of template mw_toBeSignedCertificate_ca

        

        /**
@@ -1399,7 +1398,8 @@ module LibItsSecurity_Templates { 
            certRequestPermissions := omit, 

            canRequestRollover     := omit,

            encryptionKey          := p_encryptionKey,

            verifyKeyIndicator     := p_verifyKeyIndicator

            verifyKeyIndicator     := p_verifyKeyIndicator,

            flags                  := omit

        } // End of template m_toBeSignedCertificate_ea

        

        /**
@@ -1426,7 +1426,8 @@ module LibItsSecurity_Templates { 
            certRequestPermissions := omit, 

            canRequestRollover     := omit,

            encryptionKey          := p_encryptionKey,

            verifyKeyIndicator     := p_verifyKeyIndicator

            verifyKeyIndicator     := p_verifyKeyIndicator,

            flags                  := omit

        } // End of template mw_toBeSignedCertificate_ea

        

        template (omit) ToBeSignedCertificate m_toBeSignedCertificate_ec(
@@ -1449,7 +1450,8 @@ module LibItsSecurity_Templates { 
            certRequestPermissions := omit, 

            canRequestRollover     := omit,

            encryptionKey          := p_encryptionKey,

            verifyKeyIndicator     := p_verifyKeyIndicator

            verifyKeyIndicator     := p_verifyKeyIndicator,

            flags                  := omit

        } // End of template m_toBeSignedCertificate_ec

        

        /**
@@ -1476,7 +1478,8 @@ module LibItsSecurity_Templates { 
            certRequestPermissions := omit, 

            canRequestRollover     := omit,

            encryptionKey          := p_encryptionKey,

            verifyKeyIndicator     := p_verifyKeyIndicator

            verifyKeyIndicator     := p_verifyKeyIndicator,

            flags                  := omit

        } // End of template mw_toBeSignedCertificate_ec

        

        /**
@@ -1503,7 +1506,8 @@ module LibItsSecurity_Templates { 
            certRequestPermissions := omit, 

            canRequestRollover     := omit,

            encryptionKey          := p_encryptionKey,

            verifyKeyIndicator     := p_verifyKeyIndicator

            verifyKeyIndicator     := p_verifyKeyIndicator,

            flags                  := omit

        } // End of template m_toBeSignedCertificate_aa

        

        /**
@@ -1530,7 +1534,8 @@ module LibItsSecurity_Templates { 
            certRequestPermissions := omit, 

            canRequestRollover     := omit,

            encryptionKey          := p_encryptionKey,

            verifyKeyIndicator     := p_verifyKeyIndicator

            verifyKeyIndicator     := p_verifyKeyIndicator,

            flags                  := omit

        } // End of template mw_toBeSignedCertificate_aa

        

        template (present) CertificateId mw_certificateId_name(
@@ -1566,7 +1571,8 @@ module LibItsSecurity_Templates { 
            certRequestPermissions := omit, 

            canRequestRollover     := omit,

            encryptionKey          := p_encryptionKey,

            verifyKeyIndicator     := p_verifyKeyIndicator

            verifyKeyIndicator     := p_verifyKeyIndicator,

            flags                  := omit

        } // End of template m_toBeSignedCertificate_at

        

        /**
@@ -1592,7 +1598,8 @@ module LibItsSecurity_Templates { 
            certRequestPermissions := omit, 

            canRequestRollover     := omit,

            encryptionKey          := p_encryptionKey,

            verifyKeyIndicator     := p_verifyKeyIndicator

            verifyKeyIndicator     := p_verifyKeyIndicator,

            flags                  := omit

        } // End of template mw_toBeSignedCertificate_at

        

    } // End of group toBeSignedCertificate

module.mk

+2 −0
Original line number Diff line number Diff line
@@ -33,7 +33,9 @@ modules := lib \ 
            /ccsrc/loggers \

            /ccsrc/Asn1c \

            /ccsrc/Protocols/CAM \

            /ccsrc/Protocols/CAM_layers \

            /ccsrc/Protocols/DENM \

            /ccsrc/Protocols/DENM_layers \

            /ccsrc/Protocols/GeoNetworking \

            /ccsrc/Protocols/BTP \

            /ccsrc/Protocols/Pcap \