Commit ddaab7bb authored by YannGarcia's avatar YannGarcia
Browse files

Replace command line argument -c into -n to generate index.lst

parent bd0920b7

ccsrc/Protocols/Security/certificates_loader.cc

+13 −1
Original line number Diff line number Diff line
@@ -62,6 +62,18 @@ int certificates_loader::load_certificates(std::map<std::string, std::unique_ptr 
    return 0;

  }



  // TODO Build the maps of couple {HasehedId8, Certificate}

  /*if (build_certificates_index() == -1) {

    loggers::get_instance().warning("certificates_loader::build_certificates_index: Failed to build the list of certificate files");

    return -1;

  }*/

  // TODO Initialize the cache mechanism

  /*if (initialize_certificates_cache(files, p_certificates, p_hashed_id8s) == -1) {

    loggers::get_instance().warning("certificates_loader::initialize_certificates_cache: Failed to build the certificate cache");

    return -1;

  }*/

  // No certificate will be loded here



  // Retrieve the list of the files in the path

  std::set<std::experimental::filesystem::path> files;

  if (retrieve_certificates_list(files) == -1) {
@@ -70,7 +82,7 @@ int certificates_loader::load_certificates(std::map<std::string, std::unique_ptr 
  }

  // Build the certificates cache

  if (build_certificates_cache(files, p_certificates, p_hashed_id8s) == -1) {

    loggers::get_instance().warning("certificates_loader::load_certificates: Failed to build the certificate cache");

    loggers::get_instance().warning("certificates_loader::build_certificates_cache: Failed to build the certificate cache");

    return -1;

  }

ccsrc/Protocols/Security/security_cache.cc

+40 −0
Original line number Diff line number Diff line
@@ -64,10 +64,21 @@ int security_cache::get_certificate_id(const OCTETSTRING &p_hashed_id8, std::str 
  // std::vector<unsigned char> v(static_cast<const unsigned char*>(p_hashed_id8), p_hashed_id8.lengthof() + static_cast<const unsigned char*>(p_hashed_id8));

  // std::map<std::vector<unsigned char>, std::string>::const_iterator it = _hashed_id8s.find(v);

  if (it == _hashed_id8s.cend()) {

    // TODO try to load the certificate from the disk

    /*if (certificates_loader::get_instance().load_certificate(p_hashed_id8, _certificates, _hashed_id8s) == -1) {

      loggers::get_instance().warning("security_cache::get_certificate: record not found");

      dump();

      p_certificate_id = "";

      return -1;

    } else {

      it = _hashed_id8s.find(p_hashed_id8);

    }*/

    loggers::get_instance().warning("security_cache::get_certificate: record not found");

    dump();

    p_certificate_id = "";

    return -1;

  }



  p_certificate_id = it->second;



  return 0;
@@ -78,6 +89,15 @@ int security_cache::get_certificate(const std::string &p_certificate_id, OCTETST 


  std::map<std::string, std::unique_ptr<security_db_record>>::const_iterator it = _certificates.find(p_certificate_id);

  if (it == _certificates.cend()) {

    // TODO try to load the certificate from the disk

    /*if (certificates_loader::get_instance().load_certificate(it->second(), _certificates, _hashed_id8s) == -1) {

      loggers::get_instance().warning("security_cache::get_certificate: record not found");

      dump();

      p_certificate_id = "";

      return -1;

    } else {

      it = _hashed_id8s.find(it->second());

    }*/

    loggers::get_instance().warning("security_cache::get_certificate: record not found");

    dump();

    return -1;
@@ -92,7 +112,17 @@ int security_cache::get_certificate(const std::string &p_certificate_id, Ieee160 


  std::map<std::string, std::unique_ptr<security_db_record>>::const_iterator it = _certificates.find(p_certificate_id);

  if (it == _certificates.cend()) {

    // TODO try to load the certificate from the disk

    /*if (certificates_loader::get_instance().load_certificate(it->second(), _certificates, _hashed_id8s) == -1) {

      loggers::get_instance().warning("security_cache::get_certificate: record not found");

      dump();

      p_certificate_id = "";

      return -1;

    } else {

      it = _hashed_id8s.find(it->second());

    }*/

    loggers::get_instance().warning("security_cache::get_certificate: record not found");

    dump();

    return -1;

  }

  p_certificate = it->second.get()->decoded_certificate();
@@ -121,7 +151,17 @@ int security_cache::get_certificate(const OCTETSTRING &p_hashed_id3, Ieee1609Dot 
                                                                                           );*/

  std::map<std::string, std::unique_ptr<security_db_record>>::const_iterator it = _certificates.find(s->second);

  if (it == _certificates.cend()) {

    // TODO try to load the certificate from the disk

    /*if (certificates_loader::get_instance().load_certificate(p_hashed_id8, _certificates, _hashed_id8s) == -1) {

      loggers::get_instance().warning("security_cache::get_certificate: record not found");

      dump();

      p_certificate_id = "";

      return -1;

    } else {

      it = _certificates.find(s->first);

    }*/

    loggers::get_instance().warning("security_cache::get_certificate: record not found");

    dump();

    return -1;

  }

  p_certificate = it->second.get()->decoded_certificate();

ccsrc/Protocols/Security/security_db.cc

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ int security_db::load_from_files(const std::string &p_db_path) { 
    return -1;

  }



  // TODO Build the maps of couple {HasehedId8, Certificate}

  if (certificates_loader::get_instance().load_certificates(_certificates, _hashed_id8s) == -1) {

    loggers::get_instance().log(">>> security_db::load_from_files: certificates_loader::load_certificates method failed");

    return -1;

config.mk

+4 −4
Original line number Diff line number Diff line 
TTCN3_DIR      := /cygdrive/c/Tools/Titan

ASN1C_PATH     := ../../../../../asn1c-fillabs

WPCAP_DLL_PATH := /cygdrive/c/windows/system32/npcap/wpcap.dll

NPCAP_INCLUDE  := /cygdrive/c/PROGRA~1/Npcap/sdk/include

TTCN3_DIR      := $(HOME)/frameworks/titan/titan.core/Install

ASN1C_PATH     := $(HOME)/frameworks/asn1c.denis

#WPCAP_DLL_PATH := /cygdrive/c/windows/system32/npcap/wpcap.dll

#NPCAP_INCLUDE  := /cygdrive/c/PROGRA~1/Npcap/sdk/include

#T3Q_PATH=./tools/t3q-v2.0.0b30

#T3Q_CONFIG=t3q.cfg

#T3D_PATH=./tools/t3d-v2.0.0b30

data/certificates/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ keydir=certificates 
iutdir=iut



asn1certgen=$(CERTGEN)/build/$(ARCH)/certgen

asn1certidx=$(CERTGEN)/build/$(ARCH)/certidx -c

asn1certidx=$(CERTGEN)/build/$(ARCH)/certidx -n



xsl_cvt=$(CERTGEN)/certgen/asn1certgen.xslt

xsl_dep=$(CERTGEN)/certgen/prof2dep.xsl