Resolve merge conflict (0a28ff34) · Commits · CTI Tools / Titan Test System Framework

ccsrc/security/src/securty_services.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ int security_services::initialize(const std::string& p_certs_db_path) {

		security_services::_certs_db = new certs_db(p_certs_db_path);
		if (security_services::_certs_db == nullptr) { // Memory allocation issue
		loggers::get_instance().warning("security_services::setup: _security_db pointer is NULL");
		loggers::get_instance().warning("security_services::initialize: _security_db pointer is NULL");
		return -1;
		}

+15 −5

Original line number	Diff line number	Diff line
		@@ -176,7 +176,9 @@ module LibHttp_Templates {
		statuscode := 200,
		statustext := "OK",
		header := p_header,
		body := omit
		body := omit,
		tls := omit,
		mutual_tls := omit
		} // End of template m_http_response_ok_no_body

		template (present) Response mw_http_response_ok_no_body(
		@@ -247,7 +249,9 @@ module LibHttp_Templates {
		statuscode := p_statuscode,
		statustext := p_statustext,
		header := p_header,
		body := p_body
		body := p_body,
		tls := omit,
		mutual_tls := omit
		} // End of template m_http_response_ko

		template (value) Response m_http_response_ko_no_body(
		@@ -260,7 +264,9 @@ module LibHttp_Templates {
		statuscode := p_statuscode,
		statustext := p_statustext,
		header := p_header,
		body := omit
		body := omit,
		tls := omit,
		mutual_tls := omit
		} // End of template m_http_response_ko_no_body

		template (value) Response m_http_response_500_internal_error(
		@@ -280,7 +286,9 @@ module LibHttp_Templates {
		statuscode := p_statuscode,
		statustext := p_statustext,
		header := p_header,
		body := omit
		body := omit,
		tls := omit,
		mutual_tls := omit
		} // End of template mw_http_response_ko_no_body

		template Response mw_http_response_ko(
		@@ -292,7 +300,9 @@ module LibHttp_Templates {
		statuscode := complement(200),
		statustext := ?,
		header := p_header,
		body := p_body
		body := p_body,
		tls := omit,
		mutual_tls := omit
		} // End of template mw_http_response_ko

		template (value) Response m_http_response_400_bad_request(

+2 −2

Original line number	Diff line number	Diff line
		@@ -19,6 +19,6 @@ module LibHttp_XmlMessageBodyTypes {
		}

		} with {
		encode "XML";
		variant ""
		variant "";
		encode "XML"
		} // End of LibHttp_XmlMessageBodyTypes

+2 −0

Original line number	Diff line number	Diff line
		@@ -21,12 +21,14 @@ module LibHttp_XmlTemplates {
		template (value) XmlBody m_xml_body_raw(
		in template (value) charstring p_raw
		) := {
		msg := { raw := p_raw },
		raw := p_raw
		} // End of template m_xml_body_raw

		template (present) XmlBody mw_xml_body_raw(
		template (present) charstring p_raw := ?
		) := {
		msg := { raw := p_raw },
		raw := p_raw
		} // End of template mw_xml_body_raw