Commit aef8993b authored by Yann Garcia's avatar Yann Garcia
Browse files

Remove codec for RaEeCertInfo

parent 05c07ab5

ccsrc/EncDec/LibItsPki_Encdec.cc

+22 −22
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include "etsi_ts102941_types_enrolment_inner_response.hh"

#include "ieee_1609dot2_base_types_public_encryption_key.hh"

#include "ieee_1609dot2_base_types_public_verification_key.hh"

#include "etsi_ts102941_types_ra_ee_cert_info.hh"

//#include "etsi_ts102941_types_ra_ee_cert_info.hh"



#include "etsi_ts102941_trust_lists_ctl_format.hh"
@@ -261,32 +261,32 @@ namespace LibItsPki__EncdecDeclarations { 
    return 0;

  }



  BITSTRING fx__enc__RaEeCertInfo(Ieee1609Dot2Dot1EeRaInterface::RaEeCertInfo const &p_ra_ee_cert_info) {

    loggers::get_instance().log_msg(">>> fx__enc__RaEeCertInfo: ", p_ra_ee_cert_info);

  // BITSTRING fx__enc__RaEeCertInfo(Ieee1609Dot2Dot1EeRaInterface::RaEeCertInfo const &p_ra_ee_cert_info) {

  //   loggers::get_instance().log_msg(">>> fx__enc__RaEeCertInfo: ", p_ra_ee_cert_info);



    etsi_ts102941_types_ra_ee_cert_info codec;

    OCTETSTRING                                           os;

    if (codec.encode(p_ra_ee_cert_info, os) == -1) {

      loggers::get_instance().warning("fx__enc__RaEeCertInfo: -1 result code was returned");

      return int2bit(0, 1);

    }

  //   etsi_ts102941_types_ra_ee_cert_info codec;

  //   OCTETSTRING                                           os;

  //   if (codec.encode(p_ra_ee_cert_info, os) == -1) {

  //     loggers::get_instance().warning("fx__enc__RaEeCertInfo: -1 result code was returned");

  //     return int2bit(0, 1);

  //   }



    return oct2bit(os);

  }

  //   return oct2bit(os);

  // }



  INTEGER fx__dec__RaEeCertInfo(BITSTRING &b, Ieee1609Dot2Dot1EeRaInterface::RaEeCertInfo &p_ra_ee_cert_info) {

    loggers::get_instance().log_msg(">>> fx__dec__RaEeCertInfo: ", b);

  // INTEGER fx__dec__RaEeCertInfo(BITSTRING &b, Ieee1609Dot2Dot1EeRaInterface::RaEeCertInfo &p_ra_ee_cert_info) {

  //   loggers::get_instance().log_msg(">>> fx__dec__RaEeCertInfo: ", b);



    etsi_ts102941_types_ra_ee_cert_info codec;

    OCTETSTRING                                           is = bit2oct(b);

    if (codec.decode(is, p_ra_ee_cert_info) == -1) {

      loggers::get_instance().warning("fx__dec__RaEeCertInfo: -1 result code was returned");

      return -1;

    }

  //   etsi_ts102941_types_ra_ee_cert_info codec;

  //   OCTETSTRING                                           is = bit2oct(b);

  //   if (codec.decode(is, p_ra_ee_cert_info) == -1) {

  //     loggers::get_instance().warning("fx__dec__RaEeCertInfo: -1 result code was returned");

  //     return -1;

  //   }



    loggers::get_instance().log_msg("<<< fx__dec__RaEeCertInfo: ", p_ra_ee_cert_info);

    return 0;

  }

  //   loggers::get_instance().log_msg("<<< fx__dec__RaEeCertInfo: ", p_ra_ee_cert_info);

  //   return 0;

  // }



  BITSTRING fx__enc__PublicKeys(EtsiTs102941BaseTypes::PublicKeys const &p_public_keys) {

    loggers::get_instance().log_msg(">>> fx__enc__PublicKeys: ", p_public_keys);

ccsrc/Protocols/Security/module.mk

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ sources += http_etsi_ieee1609dot2_codec.cc \ 
           etsi_ts102941_types_authorization_shared_at_request.cc \

           etsi_ts102941_types_authorization_validation_request.cc \

           etsi_ts102941_types_authorization_validation_response.cc \

           etsi_ts102941_types_ra_ee_cert_info.cc \

           etsi_ts102941_types_enrolment_inner_request.cc \

           etsi_ts102941_types_enrolment_inner_response.cc \

etc/AtsPki/AtsPki.cfg

+2 −2
Original line number Diff line number Diff line
@@ -170,9 +170,9 @@ system.httpCaPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/ 
# LibItsSecurity_Pics.PICS_SECPKI_ORIGINAL_BFK_KEY        := true

# Check that the EA sends the butterfly authorization respond message after receiving of the butterfly authorization request

# Check that this message is signed with EA certificate

ItsPki_TestCases.TC_SECPKI_EA_BFK_AUTH_01_BV

#ItsPki_TestCases.TC_SECPKI_EA_BFK_AUTH_01_BV

# Check that the butterfly authorization respond message, sent by EA, contains all necessary fields

#ItsPki_TestCases.TC_SECPKI_EA_BFK_AUTH_02_BV

ItsPki_TestCases.TC_SECPKI_EA_BFK_AUTH_02_BV

# 

#ItsPki_TestCases.TC_SECPKI_EA_BFK_AUTH_03_BV

#

etc/AtsPki/AtsPki_Microsec.cfg_

+2 −2
Original line number Diff line number Diff line
@@ -170,9 +170,9 @@ system.httpCaPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/ 
# LibItsSecurity_Pics.PICS_SECPKI_ORIGINAL_BFK_KEY        := true

# Check that the EA sends the butterfly authorization respond message after receiving of the butterfly authorization request

# Check that this message is signed with EA certificate

ItsPki_TestCases.TC_SECPKI_EA_BFK_AUTH_01_BV

#ItsPki_TestCases.TC_SECPKI_EA_BFK_AUTH_01_BV

# Check that the butterfly authorization respond message, sent by EA, contains all necessary fields

#ItsPki_TestCases.TC_SECPKI_EA_BFK_AUTH_02_BV

ItsPki_TestCases.TC_SECPKI_EA_BFK_AUTH_02_BV

# 

#ItsPki_TestCases.TC_SECPKI_EA_BFK_AUTH_03_BV

#

AtsPki @ 4250b3b4

Compare 86f32f09 to 4250b3b4
Original line number Diff line number Diff line 
Subproject commit 86f32f09ff0cb336c96e2dd4a43b310d7dfdba39
 
Subproject commit 4250b3b4a85ff424bf55c998d330aa1df2ff7b28