Commit c5311f5d authored by garciay's avatar garciay
Browse files

STF525: Finalyse encryption support in Test System

        Bug fixed in certificates_loader
parent 0a0fd492
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -271,11 +271,11 @@ int certificates_loader::build_certificates_cache(std::set<std::experimental::fi
                                                                                                                                                             issuer, // Hashed ID fo the issuer
                                                                                                                                                             hashed_id, // Hashed ID
                                                                                                                                                             private_key, // Private key
                                                                                                                                                             public_key_x, // Public key X-coordonate
                                                                                                                                                             public_key_y, // Public key Y-coordonate
                                                                                                                                                             public_key_x, // Public key X-coordinate
                                                                                                                                                             public_key_y, // Public key Y-coordinate
                                                                                                                                                             private_enc_key, // Private enciption key
                                                                                                                                                             public_enc_key_x, // Public enciption key X-coordonate
                                                                                                                                                             public_enc_key_y // Public enciption key Y-coordonate
                                                                                                                                                             public_enc_key_x, // Public enciption key X-coordinate
                                                                                                                                                             public_enc_key_y // Public enciption key Y-coordinate
                                                                                                                                                             ))
                                                                                             ));
    std::map<std::string, std::unique_ptr<security_db_record> >::const_iterator i = p_certificates.find(key);
@@ -358,8 +358,8 @@ int certificates_loader::save_certificate(const security_db_record& p_certificat
    }
    loggers::get_instance().log("certificates_loader::save_certificate: Public encryption keys file: '%s'", p.string().c_str());
    os.open(p.string(), ios::out | ios::binary);
    os.write(reinterpret_cast<const char *>(p_certificate.public_key_x().data()), p_certificate.public_enc_key_x().size());
    os.write(reinterpret_cast<const char *>(p_certificate.public_key_y().data()), p_certificate.public_enc_key_y().size());
    os.write(reinterpret_cast<const char *>(p_certificate.public_enc_key_x().data()), p_certificate.public_enc_key_x().size());
    os.write(reinterpret_cast<const char *>(p_certificate.public_enc_key_y().data()), p_certificate.public_enc_key_y().size());
    os.close();
    std::experimental::filesystem::permissions(p, std::experimental::filesystem::perms::add_perms | std::experimental::filesystem::perms::owner_all | std::experimental::filesystem::perms::group_all | std::experimental::filesystem::perms::others_all);
  }
+1 −3
Original line number Diff line number Diff line
@@ -112,10 +112,8 @@ int security_services::process_ieee_1609_dot2_content(const IEEE1609dot2::Ieee16
    const IEEE1609dot2::EncryptedData& encrypted_data = p_ieee_1609_dot2_content.encryptedData();
    OCTETSTRING signed_payload;
    if (process_ieee_1609_dot2_encrypted_data(encrypted_data, p_verify, signed_payload, p_params) != 0) {
      if (p_verify) {
      return -1;
    }
    }
    loggers::get_instance().log_msg("security_services::process_ieee_1609_dot2_content: Decrypted payload: ", signed_payload);
    IEEE1609dot2::Ieee1609Dot2Data ieee_1609dot2_data; // TODO Check if it could be reused
    if (verify_and_extract_gn_payload(signed_payload, p_verify, ieee_1609dot2_data, p_unsecured_payload, p_params) != 0) {