Commit 79d224fe authored by YannGarcia's avatar YannGarcia Committed by Yann Garcia
Browse files

Merge branch 'STF525' of https://forge.etsi.org/gitlab/LIBS/LibIts into STF525

parents c591ac73 b45c6e85
......@@ -102,6 +102,22 @@ module LibItsHttp_Templates {
method := "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(
in charstring p_uri,
in template (value) HeaderLines p_headers,
......
......@@ -527,7 +527,8 @@ module LibItsMapemSpatem_Templates {
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
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)
preemptPriorityData := *, // data about one or more regional preempt or priority zones
regional := *
......
......@@ -1162,9 +1162,9 @@ module LibItsPki_Functions {
v_ea_hashed_id8[0] := 'bb'O;
v_ea_hashed_id8[1] := 'cc'O;
log("f_http_build_authorization_request_with_wrong_parameters: Altered eaId= ", v_ea_hashed_id8);
v_ret_code := f_generate_inner_at_request(vc_aaCertificate, -, vc_aaHashedId8, vc_eaCertificate, vc_eaWholeHash/*salt*/, v_ea_hashed_id8, p_ec_certificate, p_ec_private_key, p_private_key, p_public_key_compressed, p_compressed_key_mode, p_private_enc_key, p_public_compressed_enc_key, p_compressed_enc_key_mode, v_inner_at_request);
v_ret_code := f_generate_inner_at_request(vc_aaCertificate, -, vc_aaHashedId8, vc_eaCertificate, vc_eaWholeHash/*salt*/, v_ea_hashed_id8, p_ec_certificate, p_ec_private_key, p_private_key, p_public_key_compressed, p_compressed_key_mode, p_private_enc_key, p_public_compressed_enc_key, p_compressed_enc_key_mode, v_inner_at_request);
} else {
v_ret_code := f_generate_inner_at_request_with_wrong_parameters(vc_aaCertificate, -, vc_aaHashedId8, vc_eaCertificate, vc_eaWholeHash/*salt*/, vc_eaHashedId8, p_ec_certificate, p_ec_private_key, p_alter_hmac, p_alter_signer_digest, p_start, p_duration, p_generation_time, p_private_key, p_public_key_compressed, p_compressed_key_mode, p_private_enc_key, p_public_compressed_enc_key, p_compressed_enc_key_mode, v_inner_at_request);
v_ret_code := f_generate_inner_at_request_with_wrong_parameters(vc_aaCertificate, -, vc_aaHashedId8, vc_eaCertificate, vc_eaWholeHash/*salt*/, vc_eaHashedId8, p_ec_certificate, p_ec_private_key, p_alter_hmac, p_alter_signer_digest, p_start, p_duration, p_generation_time, p_private_key, p_public_key_compressed, p_compressed_key_mode, p_private_enc_key, p_public_compressed_enc_key, p_compressed_enc_key_mode, v_inner_at_request);
}
if (v_ret_code == false) {
log("*** f_http_build_authorization_request_with_wrong_parameters: ERROR: Failed to generate AuthorizationRequest ***");
......@@ -1444,7 +1444,7 @@ module LibItsPki_Functions {
// Secure the 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_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))
if (f_build_pki_secured_response_message(p_private_key,
valueof(m_signerIdentifier_digest(f_HashedId8FromSha256(p_digest))),// in SignerIdentifier p_signer_identifier,
......
......@@ -2113,7 +2113,7 @@ module LibItsSecurity_Functions {
testcase.stop(__SCOPE__ & " can not handle omitted secured message values");
}
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;
return true;
}
......
......@@ -144,6 +144,7 @@ module LibItsSremSsem_Templates {
gnTrafficClass := *,
btpDestinationPort := *,
btpInfo := *,
ssp := *,
its_aid := *
};
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment