Merge branch 'STF525' of https://forge.etsi.org/gitlab/LIBS/LibIts into STF525 (79d224fe) · Commits · TTCN-3 Libraries / LibIts

ttcn/Http/LibItsHttp_Templates.ttcn

+16 −0

Original line number	Original line	Diff line number	Diff line
	@@ -102,6 +102,22 @@ module LibItsHttp_Templates {
	method := "POST"		method := "POST"
	} // End of template mw_http_request_post		} // End of template mw_http_request_post

			template (omit) Request m_http_request_patch(
			in charstring p_uri,
			in template (value) HeaderLines p_headers,
			in template (omit) HttpMessageBody p_body := omit
			) modifies m_http_request_get := {
			method := "PATCH"
			} // End of template m_http_request_patch

			template Request mw_http_request_patch(
			template (present) charstring p_uri := ?,
			template (present) HeaderLines p_headers := ?,
			template HttpMessageBody p_body := *
			) modifies mw_http_request_get := {
			method := "PATCH"
			} // End of template mw_http_request_patch

	template (omit) Request m_http_request_put(		template (omit) Request m_http_request_put(
	in charstring p_uri,		in charstring p_uri,
	in template (value) HeaderLines p_headers,		in template (value) HeaderLines p_headers,

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -527,7 +527,8 @@ module LibItsMapemSpatem_Templates {
	id := p_id, // A globally unique value set, consisting of a regionID and intersection ID assignment		id := p_id, // A globally unique value set, consisting of a regionID and intersection ID assignment
	revision := p_revision, // Required default values about lane descriptions follow		revision := p_revision, // Required default values about lane descriptions follow
	refPoint := p_position3D, // The reference from which subsequent data points are offset until a new point is used.		refPoint := p_position3D, // The reference from which subsequent data points are offset until a new point is used.
	laneWidth := *, // Reference width used by all subsequent lanes unless a new width is given speedLimits SpeedLimitList OPTIONAL,		laneWidth := *, // Reference width used by all subsequent lanes unless a new width is given
			speedLimits := *,
	laneSet := p_laneList, // Data about one or more lanes (all lane data is found here)		laneSet := p_laneList, // Data about one or more lanes (all lane data is found here)
	preemptPriorityData := *, // data about one or more regional preempt or priority zones		preemptPriorityData := *, // data about one or more regional preempt or priority zones
	regional := *		regional := *

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1444,7 +1444,7 @@ module LibItsPki_Functions {
	// Secure the response		// Secure the response
	log("f_http_build_authorization_validation_response: p_authorization_validation_response= ", p_authorization_validation_response);		log("f_http_build_authorization_validation_response: p_authorization_validation_response= ", p_authorization_validation_response);
	v_msg := bit2oct(encvalue(p_authorization_validation_response));		v_msg := bit2oct(encvalue(p_authorization_validation_response));
	v_nonce := substr(f_hashWithSha256(int2oct((f_getCurrentTimeUtc() * 1000), 16)), 0, 16); // Random value		v_nonce := substr(f_hashWithSha256(int2oct((f_getCurrentTimeUtc() * 1000), 16)), 0, 12); // Random value
	// TODO Consider Sha384: m_signerIdentifier_digest(f_HashedId8FromSha384(p_digest))		// TODO Consider Sha384: m_signerIdentifier_digest(f_HashedId8FromSha384(p_digest))
	if (f_build_pki_secured_response_message(p_private_key,		if (f_build_pki_secured_response_message(p_private_key,
	valueof(m_signerIdentifier_digest(f_HashedId8FromSha256(p_digest))),// in SignerIdentifier p_signer_identifier,		valueof(m_signerIdentifier_digest(f_HashedId8FromSha256(p_digest))),// in SignerIdentifier p_signer_identifier,

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2113,7 +2113,7 @@ module LibItsSecurity_Functions {
	testcase.stop(__SCOPE__ & " can not handle omitted secured message values");		testcase.stop(__SCOPE__ & " can not handle omitted secured message values");
	}		}
	v_securedMessage := valueof(p_securedMessage);		v_securedMessage := valueof(p_securedMessage);
	if (ispresent(v_securedMessage.content.signedData)) {		if (ischosen(v_securedMessage.content.signedData)) {
	p_return := v_securedMessage.content.signedData.tbsData.headerInfo;		p_return := v_securedMessage.content.signedData.tbsData.headerInfo;
	return true;		return true;
	}		}

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -144,6 +144,7 @@ module LibItsSremSsem_Templates {
	gnTrafficClass := *,		gnTrafficClass := *,
	btpDestinationPort := *,		btpDestinationPort := *,
	btpInfo := *,		btpInfo := *,
			ssp := *,
	its_aid := *		its_aid := *
	};		};