Commit 84dba0ac authored by Denis Filatov's avatar Denis Filatov
Browse files

(*) use titan internal OER encoder

(+) some mw_ templates
parent 977ff899
Loading
Loading
Loading
Loading
+26 −26
Original line number Diff line number Diff line
@@ -15,16 +15,16 @@ module LibItsPki_EncdecDeclarations {
  import from LibItsSecurity_TypesAndValues all;

  external function fx_enc_EtsiTs102941Data(in EtsiTs102941MessagesCa.EtsiTs102941Data p_etsi_ts_102941_data) return bitstring
  with {extension "prototype(convert) encode(PER)"}
  with {extension "prototype(convert) encode(OER)"}

  external function fx_dec_EtsiTs102941Data(inout bitstring b, out EtsiTs102941MessagesCa.EtsiTs102941Data p_etsi_ts_102941_data)return integer
  with {extension "prototype(sliding) decode(PER)"}
  with {extension "prototype(sliding) decode(OER)"}

  external function fx_enc_EtsiTs102941DataContent(in EtsiTs102941MessagesCa.EtsiTs102941DataContent p_etsi_ts_102941_data) return bitstring
  with {extension "prototype(convert) encode(PER)"}
  with {extension "prototype(convert) encode(OER)"}

  external function fx_dec_EtsiTs102941DataContent(inout bitstring b, out EtsiTs102941MessagesCa.EtsiTs102941DataContent p_etsi_ts_102941_data)return integer
  with {extension "prototype(sliding) decode(PER)"}
  with {extension "prototype(sliding) decode(OER)"}
  
  /**
   * @desc Encoding function for EtsiTs102941TypesEnrolment InnerEcRequest
@@ -32,10 +32,10 @@ module LibItsPki_EncdecDeclarations {
   * @return The encode message in OER format
   */
  external function fx_enc_InnerEcRequest(in EtsiTs102941TypesEnrolment.InnerEcRequest p) return bitstring
  with {extension "prototype(convert) encode(PER)"}
  with {extension "prototype(convert) encode(OER)"}
    
  external function fx_dec_InnerEcRequest(inout bitstring b, out EtsiTs102941TypesEnrolment.InnerEcRequest p) return integer
  with {extension "prototype(sliding) decode(PER)"}
  with {extension "prototype(sliding) decode(OER)"}
    
  /**
   * @desc Encoding function for EtsiTs102941TypesEnrolment InnerEcResponse
@@ -43,10 +43,10 @@ module LibItsPki_EncdecDeclarations {
   * @return The encode message in OER format
   */
  external function fx_enc_InnerEcResponse(in EtsiTs102941TypesEnrolment.InnerEcResponse p) return bitstring
  with {extension "prototype(convert) encode(PER)"}
  with {extension "prototype(convert) encode(OER)"}
    
  external function fx_dec_InnerEcResponse(inout bitstring b, out EtsiTs102941TypesEnrolment.InnerEcResponse p) return integer
  with {extension "prototype(sliding) decode(PER)"}
  with {extension "prototype(sliding) decode(OER)"}
    
  /**
   * @desc Encoding function for EtsiTs102941TypesAuthorization InnerAtRequest
@@ -54,10 +54,10 @@ module LibItsPki_EncdecDeclarations {
   * @return The encode message in OER format
   */
  external function fx_enc_InnerAtRequest(in EtsiTs102941TypesAuthorization.InnerAtRequest p) return bitstring
  with {extension "prototype(convert) encode(PER)"}
  with {extension "prototype(convert) encode(OER)"}
    
  external function fx_dec_InnerAtRequest(inout bitstring b, out EtsiTs102941TypesAuthorization.InnerAtRequest p) return integer
  with {extension "prototype(sliding) decode(PER)"}
  with {extension "prototype(sliding) decode(OER)"}
    
  /**
   * @desc Encoding function for EtsiTs102941TypesAuthorization InnerAtResponse
@@ -65,10 +65,10 @@ module LibItsPki_EncdecDeclarations {
   * @return The encode message in OER format
   */
  external function fx_enc_InnerAtResponse(in EtsiTs102941TypesAuthorization.InnerAtResponse p) return bitstring
  with {extension "prototype(convert) encode(PER)"}
  with {extension "prototype(convert) encode(OER)"}
    
  external function fx_dec_InnerAtResponse(inout bitstring b, out EtsiTs102941TypesAuthorization.InnerAtResponse p) return integer
  with {extension "prototype(sliding) decode(PER)"}
  with {extension "prototype(sliding) decode(OER)"}
    
  /**
   * @desc Encoding function for EtsiTs102941TypesAuthorization SharedAtRequest
@@ -76,10 +76,10 @@ module LibItsPki_EncdecDeclarations {
   * @return The encode message in OER format
   */
  external function fx_enc_SharedAtRequest(in EtsiTs102941TypesAuthorization.SharedAtRequest p) return bitstring
  with {extension "prototype(convert) encode(PER)"}
  with {extension "prototype(convert) encode(OER)"}
    
  external function fx_dec_SharedAtRequest(inout bitstring b, out EtsiTs102941TypesAuthorization.SharedAtRequest p) return integer
  with {extension "prototype(sliding) decode(PER)"}
  with {extension "prototype(sliding) decode(OER)"}
    
  /**
   * @desc Encoding function for EtsiTs102941TypesAuthorizationValidation AuthorizationValidationRequest
@@ -87,10 +87,10 @@ module LibItsPki_EncdecDeclarations {
   * @return The encode message in OER format
   */
  external function fx_enc_AuthorizationValidationRequest(in EtsiTs102941TypesAuthorizationValidation.AuthorizationValidationRequest p) return bitstring
  with {extension "prototype(convert) encode(PER)"}
  with {extension "prototype(convert) encode(OER)"}
    
  external function fx_dec_AuthorizationValidationRequest(inout bitstring b, out EtsiTs102941TypesAuthorizationValidation.AuthorizationValidationRequest p) return integer
  with {extension "prototype(sliding) decode(PER)"}
  with {extension "prototype(sliding) decode(OER)"}
    
  /**
   * @desc Encoding function for EtsiTs102941TypesAuthorizationValidation AuthorizationValidationResponse
@@ -98,10 +98,10 @@ module LibItsPki_EncdecDeclarations {
   * @return The encode message in OER format
   */
  external function fx_enc_AuthorizationValidationResponse(in EtsiTs102941TypesAuthorizationValidation.AuthorizationValidationResponse p) return bitstring
  with {extension "prototype(convert) encode(PER)"}
  with {extension "prototype(convert) encode(OER)"}

  external function fx_dec_AuthorizationValidationResponse(inout bitstring b, out EtsiTs102941TypesAuthorizationValidation.AuthorizationValidationResponse p) return integer
  with {extension "prototype(sliding) decode(PER)"}
  with {extension "prototype(sliding) decode(OER)"}

  // external function fx_enc_RaEeCertInfo(in Ieee1609Dot2Dot1EeRaInterface.RaEeCertInfo p) return bitstring
  // with {extension "prototype(convert) encode(PER)"}
@@ -115,10 +115,10 @@ module LibItsPki_EncdecDeclarations {
   * @return The encode message in OER format
   */
  external function fx_enc_PublicKeys(in EtsiTs102941BaseTypes.PublicKeys p) return bitstring
  with {extension "prototype(convert) encode(PER)"}
  with {extension "prototype(convert) encode(OER)"}
    
  external function fx_dec_PublicKeys(inout bitstring b, out EtsiTs102941BaseTypes.PublicKeys p) return integer
  with {extension "prototype(sliding) decode(PER)"}
  with {extension "prototype(sliding) decode(OER)"}
    
  /**
   * @desc Encoding function for Ieee1609Dot2BaseTypes PublicVerificationKey
@@ -126,10 +126,10 @@ module LibItsPki_EncdecDeclarations {
   * @return The encode message in OER format
   */
  external function fx_enc_PublicVerificationKey(in Ieee1609Dot2BaseTypes.PublicVerificationKey p) return bitstring
  with {extension "prototype(convert) encode(PER)"}
  with {extension "prototype(convert) encode(OER)"}
    
  external function fx_dec_PublicVerificationKey(inout bitstring b, out Ieee1609Dot2BaseTypes.PublicVerificationKey p) return integer
  with {extension "prototype(sliding) decode(PER)"}
  with {extension "prototype(sliding) decode(OER)"}
    
  /**
   * @desc Encoding function for Ieee1609Dot2BaseTypes PublicEncryptionKey
@@ -137,15 +137,15 @@ module LibItsPki_EncdecDeclarations {
   * @return The encode message in OER format
   */
  external function fx_enc_PublicEncryptionKey(in Ieee1609Dot2BaseTypes.PublicEncryptionKey p) return bitstring
  with {extension "prototype(convert) encode(PER)"}
  with {extension "prototype(convert) encode(OER)"}
    
  external function fx_dec_PublicEncryptionKey(inout bitstring b, out Ieee1609Dot2BaseTypes.PublicEncryptionKey p) return integer
  with {extension "prototype(sliding) decode(PER)"}
  with {extension "prototype(sliding) decode(OER)"}
  
  external function fx_enc_CtlFormat(in EtsiTs102941TrustLists.CtlFormat p) return bitstring
  with {extension "prototype(convert) encode(PER)"}
  with {extension "prototype(convert) encode(OER)"}
    
  external function fx_dec_CtlFormat(inout bitstring b, out EtsiTs102941TrustLists.CtlFormat p) return integer
  with {extension "prototype(sliding) decode(PER)"}
  with {extension "prototype(sliding) decode(OER)"}
  
} // End of module LibItsPki_EncdecDeclarations 
+9 −0
Original line number Diff line number Diff line
@@ -53,6 +53,15 @@ module LibItsPki_Templates {
    }
  } // End of template m_etsiTs102941Data_inner_ec_request_signed_for_pop

  template (present) EtsiTs102941Data mw_etsiTs102941Data_enrolment_request(
                                                                            in template (present) InnerEcRequestSignedForPop p_inner_ec_request_signed_for_pop := ?
                                                                           ) := {
    version := PkiProtocolVersion,
    content := {
      enrolmentRequest := p_inner_ec_request_signed_for_pop
    }
  } // End of template mw_etsiTs102941Data_enrolment_request

  template (value) EtsiTs102941Data m_etsiTs102941Data_inner_ec_response(
                                                                         in template (value) InnerEcResponse p_inner_ec_response
                                                                         ) := {