Commit 56d65ed3 authored by Yann Garcia's avatar Yann Garcia
Browse files

Review Pki Test System

parent 58663d0c

ttcn/Http/LibItsHttp_BinaryMessageBodyTypes.ttcn

+1 −3
Original line number Diff line number Diff line
@@ -25,9 +25,7 @@ module LibItsHttp_BinaryMessageBodyTypes { 
  

  type union BinaryBody {

    // TODO Add here your custom variants

//    InnerEcRequest     innerEcRequest, Move to PkiPort

//    InnerEcResponse    innerEcResponse,

    Ieee1609Dot2Data   ieee1609dot2_data

    Ieee1609Dot2Data   ieee1609dot2_data,

    octetstring        raw

  } with {

    variant ""

ttcn/Http/LibItsHttp_Functions.ttcn

+73 −31
Original line number Diff line number Diff line 
module LibItsHttp_Functions {

    

    // LibCommon

    import from LibCommon_Time all;

    import from LibCommon_VerdictControl all;

    import from LibCommon_Sync all;

    

    // LibHttp

    import from LibItsHttp_TypesAndValues all;

    import from LibItsHttp_Pics all;

    import from LibItsHttp_TestSystem all;

    

    group http_preambles {

      

      /**

       * @desc    Setups default configuration   

       * @param   p_certificateId The certificate identifier the TA shall use in case of secured IUT

       */

      function f_cfUp(

                      in charstring p_certificateId

      ) runs on HttpComponent /* TITAN TODO: system HttpTestAdapter */ {

          

          map(self:httpPort, system:httpPort);

          f_connect4SelfOrClientSync();

          

      } // End of function f_cfUp

      

    } // End of group http_preambles 

    

    group http_postambles {

      

      /**

       * @desc    Deletes default configuration 

       */

      function f_cfDown() runs on HttpComponent /* TITAN TODO: system HttpTestAdapter */ {

          

          unmap(self:httpPort, system:httpPort);

          f_disconnect4SelfOrClientSync();

          

      } // End of function f_cfDown

      

    } // End of group http_postambles 

    

    group http_headers {

      

      function f_init_default_headers_list(

                                           out HeaderLines p_headers
@@ -37,4 +76,7 @@ module LibItsHttp_Functions { 
          

          } // End of 'for' statement

      } // End of function f_init_default_headers_list

      

    } // End of group http_headers

    

} // End of module LibItsHttp_Functions

ttcn/Pki/LibItsPki_Templates.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ module LibItsPki_Templates { 
    } // End of template m_enrolmentRequest

    

    template (present) EtsiTs102941DataContent mw_enrolmentResponse(

                                                                    template (present) InnerEcResponse p_enrolmentResponse

                                                                    template (present) InnerEcResponse p_enrolmentResponse := ?

    ) := {

        enrolmentResponse := p_enrolmentResponse

    } // End of template mw_enrolmentResponse

ttcn/Pki/LibItsPki_TestSystem.ttcn

+20 −7
Original line number Diff line number Diff line
@@ -28,31 +28,44 @@ module LibItsPki_TestSystem { 
  import from EtsiTs102941MessagesItss language "ASN.1:1997" all;

  import from EtsiTs103097Module language "ASN.1:1997" all;

  

  // LibItsHttp

  import from LibItsHttp_TestSystem all;

  

  // LibItsSecurity

  import from LibItsSecurity_TestSystem all;

  

  // LibItsGeoNetworking

  import from LibItsGeoNetworking_TestSystem all;

  

  // LibItsHttp

  import from LibItsHttp_TestSystem all;

  type port PkiPort message {

    inout InnerEcRequest, InnerEcResponse;

  }

  

  type component ItsPkiSystem {

    port HttpPort httpPort;

    port PkiPort pkiPort;

  } // End of component ItsPkiSystem

  

  type component ItsPkiSystemItss extends ItsPkiSystem {

  type component ItsPkiHttpSystem extends HttpTestAdapter{

  } // End of component ItsPkiHttpSystem

  

  type component ItsPkiItssSystem extends ItsPkiSystem {

    port LibItsGeoNetworking_TestSystem.AdapterControlPort acPort;

    port LibItsGeoNetworking_TestSystem.UpperTesterPort utPort;

    port GeoNetworkingPort geoNetworkingPort;

  } // End of component ItsPkiSystemItss

  } // End of component ItsPkiItssSystem

  

  type component ItsPki extends ItsSecurityBaseComponent, ItsBaseMtc {

    port HttpPort httpPort;

    port PkiPort pkiPort;

    

    var Certificate vc_eaCertificate;       /** Test Adapter EA certificate */

  } // End of component ItsPki

  

  type component ItsPkiHttp extends ItsSecurityBaseComponent, HttpComponent {

    var Certificate vc_eaCertificate;       /** Test Adapter EA certificate */

  } // End of component ItsPki

  

  type component ItsPkiItss extends ItsGeoNetworking {

    port HttpPort httpPort;

    port PkiPort pkiPort;

  } // End of component ItsPkiItss

  

} // End of module LibItsPki_TestSystem

ttcn/Security/LibItsSecurity_Functions.ttcn

+3 −0
Original line number Diff line number Diff line
@@ -2359,6 +2359,9 @@ module LibItsSecurity_Functions { 
             */

            external function fx_signWithEcdsaNistp256WithSha256(in octetstring p_toBeSignedSecuredMessage, in Oct32 p_certificateIssuer, in Oct32 p_privateKey) return octetstring;



            external function fx_signWithEcdsaNistp256WithSha256_1(in octetstring p_toBeSignedSecuredMessage, in EccP256CurvePoint p_curve_point, in Oct32 p_privateKey) return octetstring;

            external function fx_signWithEcdsaBrainpoolp256WithSha256_1(in octetstring p_toBeSignedSecuredMessage, in EccP256CurvePoint p_curve_point, in Oct32 p_privateKey) return octetstring;



            /**

             * @desc    Produces a Elliptic Curve Digital Signature Algorithm (ECDSA) signature

             * @param   p_toBeSignedSecuredMessage    The data to be signed