Commit c2317190 authored by garciay's avatar garciay
Browse files

Reverse merged revision(s) 3272-3271 from... 

Reverse merged revision(s) 3272-3271 from branches/STF525/ccsrc/Protocols/Security/certificates_loader.cc:
parent 99795cd8

ccsrc/Protocols/Security/certificates_loader.cc

+21 −21
Original line number Diff line number Diff line
@@ -186,27 +186,6 @@ int certificates_loader::build_certificates_cache(std::set<std::experimental::fi 
    it = p_files.find(p.replace_extension(_publicKeysExt));

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

      loggers::get_instance().warning("certificates_loader::build_certificates_cache: Public keys file not found for '%s'", key.c_str());

      return -1;

    }

    loggers::get_instance().log("certificates_loader::build_certificates_cache: Caching public keys '%s'", it->string().c_str());

    is.open(it->string(), ios::in | ios::binary);

    size = std::experimental::filesystem::file_size(*it);

    if ((size != 64) && (size != 96)) {

      loggers::get_instance().warning("certificates_loader::build_certificates_cache: Public keys size is incorrect for '%s'", key.c_str());

      return -1;

    }

    std::vector<unsigned char> public_key_x(size / 2, 0x00);

    is.read(reinterpret_cast<char *>(public_key_x.data()), public_key_x.size());

    std::vector<unsigned char> public_key_y(size / 2, 0x00);

    is.read(reinterpret_cast<char *>(public_key_y.data()), public_key_y.size());

    is.close();

    // Remove items from the list

    p_files.erase(it);



    // Load public compressed key file

    it = p_files.find(p.replace_extension(_publicCompKeysExt));

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

      loggers::get_instance().warning("certificates_loader::build_certificates_cache: Public compress key file not found for '%s'", key.c_str());

      // Try with only binary format of the certificate and the private key

      etsi_ts103097_certificate_codec codec;

      IEEE1609dot2::CertificateBase decoded_certificate;
@@ -313,6 +292,27 @@ int certificates_loader::build_certificates_cache(std::set<std::experimental::fi 
        continue;

      }

    } // else, continue with detailed files

    loggers::get_instance().log("certificates_loader::build_certificates_cache: Caching public keys '%s'", it->string().c_str());

    is.open(it->string(), ios::in | ios::binary);

    size = std::experimental::filesystem::file_size(*it);

    if ((size != 64) && (size != 96)) {

      loggers::get_instance().warning("certificates_loader::build_certificates_cache: Public keys size is incorrect for '%s'", key.c_str());

      return -1;

    }

    std::vector<unsigned char> public_key_x(size / 2, 0x00);

    is.read(reinterpret_cast<char *>(public_key_x.data()), public_key_x.size());

    std::vector<unsigned char> public_key_y(size / 2, 0x00);

    is.read(reinterpret_cast<char *>(public_key_y.data()), public_key_y.size());

    is.close();

    // Remove items from the list

    p_files.erase(it);



    // Load public compressed key file

    it = p_files.find(p.replace_extension(_publicCompKeysExt));

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

      loggers::get_instance().warning("certificates_loader::build_certificates_cache: Public compress key file not found for '%s'", key.c_str());

      return -1;

    }

    loggers::get_instance().log("certificates_loader::build_certificates_cache: Caching public compressed ke '%s'", it->string().c_str());

    is.open(it->string(), ios::in | ios::binary);

    size = std::experimental::filesystem::file_size(*it);