......@@ -29,8 +29,7 @@ InnerEcRequestSignedForPop, InnerEcResponse
FROM EtsiTs102941TypesEnrolment
{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) enrolment(4) version1(1) }
InnerAtRequest,
InnerAtResponse
InnerAtRequest, InnerAtResponse
FROM EtsiTs102941TypesAuthorization
{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) authorization(5) version1(1) }
......
......@@ -68,7 +68,7 @@ SharedAtRequest ::= SEQUENCE {
eaId HashedId8,
keyTag OCTET STRING (SIZE(16)),
certificateFormat CertificateFormat,
requestedSubjectAttributes CertificateSubjectAttributes (WITH COMPONENTS{certIssuePermissions ABSENT}),
requestedSubjectAttributes CertificateSubjectAttributes (WITH COMPONENTS{...,certIssuePermissions ABSENT}),
...
}
......
......@@ -54,6 +54,9 @@ AuthorizationValidationResponse ::= SEQUENCE {
confirmedSubjectAttributes CertificateSubjectAttributes (WITH COMPONENTS{certIssuePermissions ABSENT}) OPTIONAL,
...
}
(WITH COMPONENTS { responseCode (ok), confirmedSubjectAttributes PRESENT }
| WITH COMPONENTS { responseCode (ALL EXCEPT ok), confirmedSubjectAttributes ABSENT }
)
END
......
......@@ -41,7 +41,7 @@ EnrolmentResponseCode ::= ENUMERATED {
InnerEcRequestSignedForPop::= EtsiTs103097Data-Signed{InnerEcRequest}
InnerEcRequest ::= SEQUENCE {
itsId IA5String,
itsId OCTET STRING,
certificateFormat CertificateFormat,
publicKeys PublicKeys,
requestedSubjectAttributes CertificateSubjectAttributes (WITH COMPONENTS{certIssuePermissions ABSENT}),
......
......@@ -27,9 +27,9 @@ module LibItsCommon_ASN1_NamedNumbers {
const AltitudeValue AltitudeValue_unavailable_ := 800001;
const CurvatureValue CurvatureValue_straight_ := 0;
const CurvatureValue CurvatureValue_reciprocalOf1MeterRadiusToRight_ := -30000;
const CurvatureValue CurvatureValue_reciprocalOf1MeterRadiusToLeft_ := 30000;
const CurvatureValue CurvatureValue_unavailable_ := 30001;
const CurvatureValue CurvatureValue_reciprocalOf1MeterRadiusToRight_ := -1023;
const CurvatureValue CurvatureValue_reciprocalOf1MeterRadiusToLeft_ := 1023;
const CurvatureValue CurvatureValue_unavailable_ := 1023;
const ExteriorLights ExteriorLights_lowBeamHeadlightsOn_ := '10000000'B;
const ExteriorLights ExteriorLights_highBeamHeadlightsOn_ := '01000000'B;
......
......@@ -192,7 +192,7 @@ module LibItsPki_Functions {
} // End of function f_utInitializeIut
function f_sendUtTriggerPrimitive(
in charstring p_canonical_id,
in octetstring p_canonical_id,
in Oct1 p_enc_algorithm,
in octetstring p_private_key,
in octetstring p_public_key_compressed,
......
......@@ -123,6 +123,6 @@ module LibItsPki_Pics {
/**
* @desc Canonical ITSS-S identifier
*/
modulepar charstring PICS_ITS_S_CANONICAL_ID := "1B4CA1210123AE900BBE6C3EBAE7E87DA20DBDAB1E7B2EC0691C51C1021900AA";
modulepar octetstring PICS_ITS_S_CANONICAL_ID := '1B4CA1210123AE900BBE6C3EBAE7E87DA20DBDAB1E7B2EC0691C51C1021900AA'O;
} // End of module LibItsPki_Pics
......@@ -173,7 +173,7 @@ module LibItsPki_Templates {
} // End of template mw_authorizationValidationResponse
template (value) InnerEcRequest m_innerEcRequest(
in template (value) charstring p_itsId,
in template (value) octetstring p_itsId,
in template (value) PublicKeys p_publicKeys,
in template (value) CertificateSubjectAttributes p_requestedSubjectAttributes
) := {
......@@ -184,7 +184,7 @@ module LibItsPki_Templates {
} // End of template m_innerEcRequest
template (present) InnerEcRequest mw_innerEcRequest(
template (present) charstring p_itsId := ?,
template (present) octetstring p_itsId := ?,
template (present) PublicKeys p_publicKeys := ?,
template (present) CertificateSubjectAttributes p_requestedSubjectAttributes := ?
) := {
......
......@@ -63,7 +63,7 @@ module LibItsPki_TypesAndValues {
* @member compressedPublickey The compressed public key to be used for signature of the requested EA certificate (format: [02|03]<compressed public key>
*/
type record TriggerEnrolmentRequest {
charstring cannonicalId,
octetstring cannonicalId,
Oct1 encAlgorithm,
octetstring privateKey,
octetstring compressedPublickey
......