diff options
3 files changed, 12 insertions, 14 deletions
diff --git a/src/components/policy/src/policy/src/sql_pt_queries.cc b/src/components/policy/src/policy/src/sql_pt_queries.cc index 3d74b73f7a..b7b82fe1da 100644 --- a/src/components/policy/src/policy/src/sql_pt_queries.cc +++ b/src/components/policy/src/policy/src/sql_pt_queries.cc @@ -72,6 +72,7 @@ const std::string kCreateSchema = " `exchange_after_x_kilometers` INTEGER NOT NULL, " " `exchange_after_x_days` INTEGER NOT NULL, " " `timeout_after_x_seconds` INTEGER NOT NULL, " + " `certificate` INTEGER NOT NULL, " " `vehicle_make` VARCHAR(45), " " `vehicle_model` VARCHAR(45), " " `vehicle_year` VARCHAR(4) " @@ -502,7 +503,7 @@ const std::string kUpdateModuleConfig = "UPDATE `module_config` SET `preloaded_pt` = ?, " " `exchange_after_x_ignition_cycles` = ?," " `exchange_after_x_kilometers` = ?, `exchange_after_x_days` = ?, " - " `timeout_after_x_seconds` = ?, `vehicle_make` = ?, " + " `timeout_after_x_seconds` = ?, `certificate` = ?, `vehicle_make` = ?, " " `vehicle_model` = ?, `vehicle_year` = ?"; const std::string kInsertEndpoint = @@ -548,7 +549,7 @@ const std::string kDeleteAppGroup = "DELETE FROM `app_group`"; const std::string kSelectModuleConfig = "SELECT `preloaded_pt`, `exchange_after_x_ignition_cycles`, " " `exchange_after_x_kilometers`, `exchange_after_x_days`, " - " `timeout_after_x_seconds`, `vehicle_make`," + " `timeout_after_x_seconds`, `certificate`, `vehicle_make`," " `vehicle_model`, `vehicle_year` " " FROM `module_config`"; diff --git a/src/components/policy/src/policy/src/sql_pt_representation.cc b/src/components/policy/src/policy/src/sql_pt_representation.cc index c53f80adf9..83b0793318 100644 --- a/src/components/policy/src/policy/src/sql_pt_representation.cc +++ b/src/components/policy/src/policy/src/sql_pt_representation.cc @@ -1,4 +1,4 @@ -/* +/* Copyright (c) 2013, Ford Motor Company All rights reserved. @@ -505,9 +505,10 @@ void SQLPTRepresentation::GatherModuleConfig( config->exchange_after_x_kilometers = query.GetInteger(2); config->exchange_after_x_days = query.GetInteger(3); config->timeout_after_x_seconds = query.GetInteger(4); - *config->vehicle_make = query.GetString(5); - *config->vehicle_model = query.GetString(6); - *config->vehicle_year = query.GetString(7); + *config->certificate = query.GetString(5); + *config->vehicle_make = query.GetString(6); + *config->vehicle_model = query.GetString(7); + *config->vehicle_year = query.GetString(8); } utils::dbms::SQLQuery endpoints(db()); @@ -1049,12 +1050,13 @@ bool SQLPTRepresentation::SaveModuleConfig( query.Bind(2, config.exchange_after_x_kilometers); query.Bind(3, config.exchange_after_x_days); query.Bind(4, config.timeout_after_x_seconds); + query.Bind(5, config.certificate); config.vehicle_make.is_initialized() ? - query.Bind(5, *(config.vehicle_make)) : query.Bind(5); + query.Bind(6, *(config.vehicle_make)) : query.Bind(5); config.vehicle_model.is_initialized() ? - query.Bind(6, *(config.vehicle_model)) : query.Bind(6); + query.Bind(7, *(config.vehicle_model)) : query.Bind(6); config.vehicle_year.is_initialized() ? - query.Bind(7, *(config.vehicle_year)) : query.Bind(7); + query.Bind(8, *(config.vehicle_year)) : query.Bind(7); if (!query.Exec()) { LOG4CXX_WARN(logger_, "Incorrect update module config"); diff --git a/src/components/security_manager/src/ssl_context_impl.cc b/src/components/security_manager/src/ssl_context_impl.cc index e49d631092..b1cbddd46c 100644 --- a/src/components/security_manager/src/ssl_context_impl.cc +++ b/src/components/security_manager/src/ssl_context_impl.cc @@ -151,11 +151,6 @@ void CryptoManagerImpl::SSLContextImpl::PrintCertData(X509* cert, OPENSSL_free(issuer); } - const std::string& cn = GetTextBy(subj_name, NID_commonName); - const std::string& sn = GetTextBy(subj_name, NID_serialNumber); - - LOG4CXX_DEBUG(logger_, "CN: " << cn << ". SERIALNUMBER: " << sn); - ASN1_TIME* notBefore = X509_get_notBefore(cert); ASN1_TIME* notAfter = X509_get_notAfter(cert); |