ASN.1 Documenter · ASN.1 Documenter · ASN.1 Documenter · ASN.1 Documenter · ASN.1 Documenter · ASN.1 Documenter
--- a/EtsiTs102941BaseTypes.asn
+++ b/EtsiTs102941BaseTypes.asn
 EtsiTs102941BaseTypes
-{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) baseTypes(3) version-3(3) minor-version-1(1)}
+{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) baseTypes(3) major-version-3(3) minor-version-1(1)}

 DEFINITIONS AUTOMATIC TAGS ::=
 BEGIN
@@ -10,7 +10,7 @@ FROM
  Ieee1609Dot2BaseTypes {iso(1) identified-organization(3) ieee(111) 
  standards-association-numbered-series-standards(2) wave-stds(1609)  
  dot2(2) base(1) base-types(2) major-version-2(2) minor-version-4(4)}
--  WITH SUCCESSORS
+  WITH SUCCESSORS

  CertificateId, SubjectAssurance, SequenceOfPsidSsp, SequenceOfPsidGroupPermissions,
  ValidityPeriod, GeographicRegion, HashedData
@@ -18,14 +18,14 @@ FROM
  Ieee1609Dot2 {iso(1) identified-organization(3) ieee(111)
  standards-association-numbered-series-standards(2) wave-stds(1609)
  dot2(2) base (1) schema (1) major-version-2(2) minor-version-6(6)}
--  WITH SUCCESSORS
+  WITH SUCCESSORS

  EtsiTs103097Data, EtsiTs103097Data-Encrypted, EtsiTs103097Data-Signed,
  EtsiTs103097Data-SignedExternalPayload,
  EtsiTs103097Data-Unsecured, EtsiTs103097Data-Encrypted-Unicast, EtsiTs103097Data-SignedAndEncrypted-Unicast
 FROM
-  EtsiTs103097Module {itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) core(1) version-3(3) minor-version-1(1)}
--  WITH SUCCESSORS
+  EtsiTs103097Module {itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) core(1) major-version-3(3) minor-version-1(1)}
+  WITH SUCCESSORS
 ;

 CertificateFormat::= INTEGER {

--- a/EtsiTs102941MessagesCa.asn
+++ b/EtsiTs102941MessagesCa.asn
@@ -3,7 +3,7 @@
   It should be used when all PKI messages needs to be implemented (for example, for CA development)
 **************************************************************************************/
 EtsiTs102941MessagesCa
-  { itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) messagesCa(0) version-4(4) minor-version-1(1) }
+  { itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) messagesCa(0) major-version-3(3) minor-version-3(3)}

 DEFINITIONS AUTOMATIC TAGS ::=
 BEGIN
@@ -16,49 +16,54 @@ EtsiTs103097Data-SignedExternalPayload,
 EtsiTs103097Data-Encrypted-Unicast,
 EtsiTs103097Data-SignedAndEncrypted-Unicast
 FROM EtsiTs103097Module
-{itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) core(1) version-3(3) minor-version-1(1)} 
--WITH SUCCESSORS
+{itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) core(1) major-version-3(3) minor-version-1(1)} 
+WITH SUCCESSORS

 Version
 FROM EtsiTs102941BaseTypes
-{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) baseTypes(3) version-3(3) minor-version-1(1) }
+{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) baseTypes(3) major-version-3(3) minor-version-1(1) }
+WITH SUCCESSORS

 InnerEcRequestSignedForPop, InnerEcResponse
 FROM EtsiTs102941TypesEnrolment
-{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) enrolment(4) version-3(3) minor-version-1(1) }
+{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) enrolment(4) major-version-3(3) minor-version-1(1) }
+WITH SUCCESSORS

+EtsiTs102941ButterflyAuthorizationRequest-X509Signed,
 InnerAtRequest, InnerAtResponse
 FROM EtsiTs102941TypesAuthorization
-{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) authorization(5) version-3(3) minor-version-1(1) }
+{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) authorization(5) major-version-3(3) minor-version-3(3) }
+WITH SUCCESSORS

 ToBeSignedCrl, ToBeSignedTlmCtl, ToBeSignedRcaCtl
 FROM EtsiTs102941TrustLists
-{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) trustLists(6) version-3(3) minor-version-1(1) }
+{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) trustLists(6) major-version-3(3) minor-version-1(1) }
+WITH SUCCESSORS

 AuthorizationValidationRequest, AuthorizationValidationResponse 
 FROM EtsiTs102941TypesAuthorizationValidation
-{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) authValidation(7) version-3(3) minor-version-1(1) }
+{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) authValidation(7) major-version-3(3) minor-version-1(1) }
+WITH SUCCESSORS

 CaCertificateRequest
 FROM EtsiTs102941TypesCaManagement
-{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) caManagement(8) version-3(3) minor-version-1(1) }
+{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) caManagement(8) major-version-3(3) minor-version-1(1) }
+WITH SUCCESSORS

 ToBeSignedLinkCertificate, ToBeSignedLinkCertificateTlm, ToBeSignedLinkCertificateRca
 FROM EtsiTs102941TypesLinkCertificate
-{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) linkCertificate(9) version-3(3) minor-version-1(1) }
+{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) linkCertificate(9) major-version-3(3) minor-version-1(1) }
+WITH SUCCESSORS

-EeRaInterfacePdu, EeRaCertRequest, RaEeCertInfo, EeRaDownloadRequest
+EeRaCertRequest, RaEeCertInfo, EeRaDownloadRequest
 FROM Ieee1609Dot2Dot1EeRaInterface
 {iso(1) identified-organization(3) ieee(111) standards-association-numbered-series-standards(2) wave-stds(1609) dot2(2) extension-standards(255) dot1(1) interfaces(1) ee-ra(11) major-version-2(2) minor-version-2(2)}
+WITH SUCCESSORS

 RaAcaCertRequest, AcaRaCertResponse 
 FROM Ieee1609Dot2Dot1AcaRaInterface
 {iso(1) identified-organization(3) ieee(111) standards-association-numbered-series-standards(2) wave-stds(1609) dot2(2) extension-standards(255) dot1(1) interfaces(1) aca-ra(4) major-version-2(2) minor-version-2(2)}
-
-Ieee1609Dot2Data-SignedX509AuthenticatedCertRequest, ScmsPdu-Scoped, SignerSingleX509Cert
-FROM Ieee1609Dot2Dot1Protocol
-{iso(1) identified-organization(3) ieee(111) standards-association-numbered-series-standards(2) wave-stds(1609) dot2(2) extension-standards(255) dot1(1) interfaces(1) protocol(17) major-version-2(2) minor-version-2(2)}
-
+WITH SUCCESSORS
 ;

 /************
@@ -80,7 +85,7 @@ TlmLinkCertificateMessage ::= EtsiTs103097Data-Signed {EtsiTs102941Data (WITH CO
 RcaSingleSignedLinkCertificateMessage ::= EtsiTs103097Data-Signed {EtsiTs102941Data (WITH COMPONENTS{..., content (WITH COMPONENTS{singleSignedLinkCertificateRca PRESENT})})}
 RcaDoubleSignedLinkCertificateMessage ::= EtsiTs103097Data-Signed {EtsiTs102941Data (WITH COMPONENTS{..., content (WITH COMPONENTS{doubleSignedlinkCertificateRca PRESENT})})}
 ButterflyAuthorizationRequestMessage ::= EtsiTs103097Data-SignedAndEncrypted-Unicast {EtsiTs102941Data (WITH COMPONENTS{..., content (WITH COMPONENTS{butterflyAuthorizationRequest PRESENT})})}
-X509SignedButterflyAuthorizationRequestMessage ::= EtsiTs103097Data-Encrypted-Unicast {EtsiTs102941ButterflyAuthorizationRequest-X509Signed} 
+X509SignedButterflyAuthorizationRequestMessage ::= EtsiTs103097Data-Encrypted-Unicast {EtsiTs102941Data (WITH COMPONENTS{..., content (WITH COMPONENTS{x509SignedbutterflyAuthorizationRequest PRESENT})})}
 ButterflyAuthorizationResponseMessage ::= EtsiTs103097Data-Signed {EtsiTs102941Data (WITH COMPONENTS{..., content (WITH COMPONENTS{butterflyAuthorizationResponse PRESENT})})}
 ButterflyAtDownloadRequestMessage ::= EtsiTs103097Data-SignedAndEncrypted-Unicast {EtsiTs102941Data (WITH COMPONENTS{..., content (WITH COMPONENTS{butterflyAtDownloadRequest PRESENT})})}
 ButterflyCertRequestMessage ::= EtsiTs103097Data-SignedAndEncrypted-Unicast {EtsiTs102941Data (WITH COMPONENTS{..., content (WITH COMPONENTS{butterflyCertificateRequest PRESENT})})}
@@ -112,29 +117,13 @@ EtsiTs102941DataContent ::= CHOICE {
  doubleSignedlinkCertificateRca          RcaSingleSignedLinkCertificateMessage,
  /* Extension for butterfly key provisioning */
  [[butterflyAuthorizationRequest         EeRaCertRequest,
+  x509SignedbutterflyAuthorizationRequest EtsiTs102941ButterflyAuthorizationRequest-X509Signed,
  butterflyAuthorizationResponse          RaEeCertInfo,
  butterflyCertificateRequest             RaAcaCertRequest,
  butterflyCertificateResponse            AcaRaCertResponse,
  butterflyAtDownloadRequest              EeRaDownloadRequest]]
  }

-/************
-- X509 structures
-************/

-/**
- * @class EtsiTs102941ButterflyAuthorizationRequest-X509Signed
- *
- * @brief This structure defines a butterfly authorization request,
- * signed with a X.509 certificate, by redefining structures from
- * IEEE 1609.2.1 to fit into the ETSI naming schema.
- */
-EtsiTs102941ButterflyAuthorizationRequest-X509Signed ::= Ieee1609Dot2Data-SignedX509AuthenticatedCertRequest {
-	ScmsPdu-Scoped {
-		EeRaInterfacePdu (WITH COMPONENTS {
-			eeRaCertRequest})
-		},
-	SignerSingleX509Cert
-}

 END
--- a/EtsiTs102941MessagesItss-OptionalPrivacy.asn
+++ b/EtsiTs102941MessagesItss-OptionalPrivacy.asn
@@ -6,48 +6,51 @@
   This module allows the usage of unencrypted EC signature for AA requests.
 **************************************************************************************/
 EtsiTs102941MessagesItss-OptionalPrivacy
-  { itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) messagesItssOp(2) version-4(4) minor-version-1(1)}
+  { itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) messagesItssOp(2) major-version-3(3) minor-version-3(3)}

 DEFINITIONS AUTOMATIC TAGS ::=
 BEGIN

 IMPORTS

+EtsiTs103097Data,
 EtsiTs103097Data-Signed,
 EtsiTs103097Data-Encrypted-Unicast,
 EtsiTs103097Data-SignedAndEncrypted-Unicast
 FROM EtsiTs103097Module
-{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) core(1) version-3(3) minor-version-1(1) } 
--WITH SUCCESSORS
+{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) core(1) major-version-3(3) minor-version-1(1) } 
+WITH SUCCESSORS

 Version
 FROM EtsiTs102941BaseTypes
-{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) baseTypes(3) version-3(3) minor-version-1(1) }
+{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) baseTypes(3) major-version-3(3) minor-version-1(1) }
+WITH SUCCESSORS

 InnerEcRequestSignedForPop, InnerEcResponse
 FROM EtsiTs102941TypesEnrolment
-{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) enrolment(4) version-3(3) minor-version-1(1) }
+{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) enrolment(4) major-version-3(3) minor-version-1(1) }
+WITH SUCCESSORS

+EtsiTs102941ButterflyAuthorizationRequest-X509Signed,
 InnerAtRequest, InnerAtResponse
 FROM EtsiTs102941TypesAuthorization
-{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) authorization(5) version-3(3) minor-version-1(1) }
+{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) authorization(5) major-version-3(3) minor-version-3(3) }
+WITH SUCCESSORS

 ToBeSignedCrl, ToBeSignedTlmCtl, ToBeSignedRcaCtl
 FROM EtsiTs102941TrustLists
-{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) trustLists(6) version-3(3) minor-version-1(1) }
+{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) trustLists(6) major-version-3(3) minor-version-1(1) }
+WITH SUCCESSORS

 ToBeSignedLinkCertificate, ToBeSignedLinkCertificateTlm
 FROM EtsiTs102941TypesLinkCertificate
-{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) linkCertificate(9) version-3(3) minor-version-1(1)}
+{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) linkCertificate(9) major-version-3(3) minor-version-1(1)}
+WITH SUCCESSORS

-EeRaInterfacePdu, EeRaCertRequest, RaEeCertInfo, EeRaDownloadRequest
+EeRaCertRequest, RaEeCertInfo, EeRaDownloadRequest
 FROM Ieee1609Dot2Dot1EeRaInterface
 { iso(1) identified-organization(3) ieee(111) standards-association-numbered-series-standards(2) wave-stds(1609) dot2(2) extension-standards(255) dot1(1) interfaces(1) ee-ra(11) major-version-3(3) minor-version-1(1)}
-
-Ieee1609Dot2Data-SignedX509AuthenticatedCertRequest, ScmsPdu-Scoped, SignerSingleX509Cert
-FROM Ieee1609Dot2Dot1Protocol
-{ iso(1) identified-organization(3) ieee(111) standards-association-numbered-series-standards(2) wave-stds(1609) dot2(2) extension-standards(255) dot1(1) interfaces(1) protocol(17) major-version-3(3) minor-version-1(1)}
-
+WITH SUCCESSORS

 ;

@@ -65,7 +68,7 @@ TlmCertificateTrustListMessage ::= EtsiTs103097Data-Signed{EtsiTs102941Data (WIT
 RcaCertificateTrustListMessage ::= EtsiTs103097Data-Signed{EtsiTs102941Data (WITH COMPONENTS{..., content (WITH COMPONENTS{certificateTrustListRca PRESENT})})}
 TlmLinkCertificateMessage ::= EtsiTs103097Data-Signed {EtsiTs102941Data (WITH COMPONENTS{..., content (WITH COMPONENTS{linkCertificateTlm PRESENT})})}
 ButterflyAuthorizationRequestMessage ::= EtsiTs103097Data-SignedAndEncrypted-Unicast {EtsiTs102941Data (WITH COMPONENTS{..., content (WITH COMPONENTS{butterflyAuthorizationRequest PRESENT})})}
-X509SignedButterflyAuthorizationRequestMessage ::= EtsiTs103097Data-Encrypted-Unicast {EtsiTs102941ButterflyAuthorizationRequest-X509Signed} 
+X509SignedButterflyAuthorizationRequestMessage ::= EtsiTs103097Data-Encrypted-Unicast {EtsiTs102941Data (WITH COMPONENTS{..., content (WITH COMPONENTS{x509SignedbutterflyAuthorizationRequest PRESENT})})} 
 ButterflyAuthorizationResponseMessage ::= EtsiTs103097Data-Signed {EtsiTs102941Data (WITH COMPONENTS{..., content (WITH COMPONENTS{butterflyAuthorizationResponse PRESENT})})}
 ButterflyAtDownloadRequestMessage ::= EtsiTs103097Data-SignedAndEncrypted-Unicast {EtsiTs102941Data (WITH COMPONENTS{..., content (WITH COMPONENTS{butterflyAtDownloadRequest PRESENT})})}

@@ -95,6 +98,7 @@ EtsiTs102941DataContent ::= CHOICE {
  doubleSignedlinkCertificateRca          NULL,
  /* Extension for butterfly key provisioning */
  [[butterflyAuthorizationRequest         EeRaCertRequest,
+  x509SignedbutterflyAuthorizationRequest EtsiTs102941ButterflyAuthorizationRequest-X509Signed,
  butterflyAuthorizationResponse          RaEeCertInfo,
  butterflyCertificateRequest             NULL,
  butterflyCertificateResponse            NULL,

--- a/EtsiTs102941MessagesItss.asn
+++ b/EtsiTs102941MessagesItss.asn
@@ -7,48 +7,51 @@
   This module blocks the usage of unencrypted EC signature for AA requests.
 **************************************************************************************/
 EtsiTs102941MessagesItss
-  { itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) messagesItss(1) version4(4)}
+  { itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) messagesItss(1) major-version-3(3) minor-version-3(3)}

 DEFINITIONS AUTOMATIC TAGS ::=
 BEGIN

 IMPORTS

+EtsiTs103097Data,
 EtsiTs103097Data-Signed,
 EtsiTs103097Data-Encrypted-Unicast,
 EtsiTs103097Data-SignedAndEncrypted-Unicast
 FROM EtsiTs103097Module
-{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) core(1) version-3(3) minor-version-1(1) } 
--WITH SUCCESSORS
+{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) core(1) major-version-3(3) minor-version-1(1) } 
+WITH SUCCESSORS

 Version
 FROM EtsiTs102941BaseTypes
-{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) baseTypes(3) version-3(3) minor-version-1(1) }
+{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) baseTypes(3) major-version-3(3) minor-version-1(1) }
+WITH SUCCESSORS

 InnerEcRequestSignedForPop, InnerEcResponse
 FROM EtsiTs102941TypesEnrolment
-{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) enrolment(4) version-3(3) minor-version-1(1) }
+{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) enrolment(4) major-version-3(3) minor-version-1(1) }
+WITH SUCCESSORS

+EtsiTs102941ButterflyAuthorizationRequest-X509Signed,
 InnerAtRequest, InnerAtResponse
 FROM EtsiTs102941TypesAuthorization
-{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) authorization(5) version-3(3) minor-version-1(1) }
+{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) authorization(5) major-version-3(3) minor-version-3(3) }
+WITH SUCCESSORS

 ToBeSignedCrl, ToBeSignedTlmCtl, ToBeSignedRcaCtl
 FROM EtsiTs102941TrustLists
-{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) trustLists(6) version-3(3) minor-version-1(1) }
+{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) trustLists(6) major-version-3(3) minor-version-1(1) }
+WITH SUCCESSORS

 ToBeSignedLinkCertificate, ToBeSignedLinkCertificateTlm
 FROM EtsiTs102941TypesLinkCertificate
-{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) linkCertificate(9) version-3(3) minor-version-1(1) }
+{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) linkCertificate(9) major-version-3(3) minor-version-1(1) }
+WITH SUCCESSORS

-EeRaInterfacePdu, EeRaCertRequest, RaEeCertInfo, EeRaDownloadRequest
+EeRaCertRequest, RaEeCertInfo, EeRaDownloadRequest
 FROM Ieee1609Dot2Dot1EeRaInterface
-{ iso(1) identified-organization(3) ieee(111) standards-association-numbered-series-standards(2) wave-stds(1609) dot2(2) extension-standards(255) dot1(1) interfaces(1) ee-ra(11) major-version-3(3) minor-version-1(1)}
-
-Ieee1609Dot2Data-SignedX509AuthenticatedCertRequest, ScmsPdu-Scoped, SignerSingleX509Cert
-FROM Ieee1609Dot2Dot1Protocol
-{ iso(1) identified-organization(3) ieee(111) standards-association-numbered-series-standards(2) wave-stds(1609) dot2(2) extension-standards(255) dot1(1) interfaces(1) protocol(17) major-version-3(3) minor-version-1(1)}
-
+{ iso(1) identified-organization(3) ieee(111) standards-association-numbered-series-standards(2) wave-stds(1609) dot2(2) extension-standards(255) dot1(1) interfaces(1) ee-ra(11) major-version-2(2) minor-version-2(2)}
+WITH SUCCESSORS
 ;

 /************
@@ -65,7 +68,7 @@ TlmCertificateTrustListMessage ::= EtsiTs103097Data-Signed{EtsiTs102941Data (WIT
 RcaCertificateTrustListMessage ::= EtsiTs103097Data-Signed{EtsiTs102941Data (WITH COMPONENTS{..., content (WITH COMPONENTS{certificateTrustListRca PRESENT})})}
 TlmLinkCertificateMessage ::= EtsiTs103097Data-Signed {EtsiTs102941Data (WITH COMPONENTS{..., content (WITH COMPONENTS{linkCertificateTlm PRESENT})})}
 ButterflyAuthorizationRequestMessage ::= EtsiTs103097Data-SignedAndEncrypted-Unicast {EtsiTs102941Data (WITH COMPONENTS{..., content (WITH COMPONENTS{butterflyAuthorizationRequest PRESENT})})}
-X509SignedButterflyAuthorizationRequestMessage ::= EtsiTs103097Data-Encrypted-Unicast {EtsiTs102941ButterflyAuthorizationRequest-X509Signed} 
+X509SignedButterflyAuthorizationRequestMessage ::= EtsiTs103097Data-Encrypted-Unicast {EtsiTs102941Data (WITH COMPONENTS{..., content (WITH COMPONENTS{x509SignedbutterflyAuthorizationRequest PRESENT})})}
 ButterflyAuthorizationResponseMessage ::= EtsiTs103097Data-Signed {EtsiTs102941Data (WITH COMPONENTS{..., content (WITH COMPONENTS{butterflyAuthorizationResponse PRESENT})})}
 ButterflyAtDownloadRequestMessage ::= EtsiTs103097Data-SignedAndEncrypted-Unicast {EtsiTs102941Data (WITH COMPONENTS{..., content (WITH COMPONENTS{butterflyAtDownloadRequest PRESENT})})}

@@ -95,6 +98,7 @@ EtsiTs102941DataContent ::= CHOICE {
  doubleSignedlinkCertificateRca          NULL,
  /* Extension for butterfly key provisioning */
  [[butterflyAuthorizationRequest         EeRaCertRequest,
+  x509SignedbutterflyAuthorizationRequest EtsiTs102941ButterflyAuthorizationRequest-X509Signed,
  butterflyAuthorizationResponse          RaEeCertInfo,
  butterflyCertificateRequest             NULL,
  butterflyCertificateResponse            NULL,

--- a/EtsiTs102941TrustLists.asn
+++ b/EtsiTs102941TrustLists.asn
 EtsiTs102941TrustLists
-  { itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) trustLists(6) version-3(3) minor-version-1(1)}
+  { itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) trustLists(6) major-version-3(3) minor-version-1(1)}

 DEFINITIONS AUTOMATIC TAGS ::=
 BEGIN
@@ -9,13 +9,13 @@ IMPORTS
 EtsiTs103097Certificate, EtsiTs103097Data-SignedAndEncrypted, EtsiTs103097Data-Signed 
 FROM	
 EtsiTs103097Module
-{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) core(1) version-3(3) minor-version-1(1) } 
--WITH SUCCESSORS
+{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) core(1) major-version-3(3) minor-version-1(1) } 
+WITH SUCCESSORS

 HashedId8, Time32, Version --, CertificateAuthorityConstraints
 FROM EtsiTs102941BaseTypes 
-{itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) baseTypes(3) version-3(3) minor-version-1(1) }
-
+{itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) baseTypes(3) major-version-3(3) minor-version-1(1) }
+WITH SUCCESSORS
 ;

 /************

--- a/EtsiTs102941TypesAuthorization.asn
+++ b/EtsiTs102941TypesAuthorization.asn
 EtsiTs102941TypesAuthorization
-  { itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) authorization(5) version-3(3) minor-version-1(1)}
+  { itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) authorization(5) major-version-3(3) minor-version-3(3)}

 DEFINITIONS AUTOMATIC TAGS ::=
 BEGIN
@@ -9,12 +9,23 @@ IMPORTS
 EtsiTs103097Certificate,
 EtsiTs103097Data-Signed
 FROM EtsiTs103097Module
-{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) core(1) version-3(3) minor-version-1(1) } 
--WITH SUCCESSORS
+{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) core(1) major-version-3(3) minor-version-1(1) } 
+WITH SUCCESSORS

 CertificateFormat, CertificateSubjectAttributes, EcSignature, HashedId8, PublicKeys, Version
 FROM EtsiTs102941BaseTypes
-{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) baseTypes(3) version-3(3) minor-version-1(1) }
+{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) baseTypes(3) major-version-3(3) minor-version-1(1) }
+WITH SUCCESSORS
+
+EeRaInterfacePdu
+FROM Ieee1609Dot2Dot1EeRaInterface
+{ iso(1) identified-organization(3) ieee(111) standards-association-numbered-series-standards(2) wave-stds(1609) dot2(2) extension-standards(255) dot1(1) interfaces(1) ee-ra(11) major-version-2(2) minor-version-2(2)}
+WITH SUCCESSORS
+
+Ieee1609Dot2Data-SignedX509AuthenticatedCertRequest, ScmsPdu-Scoped, SignerSingleX509Cert
+FROM Ieee1609Dot2Dot1Protocol
+{ iso(1) identified-organization(3) ieee(111) standards-association-numbered-series-standards(2) wave-stds(1609) dot2(2) extension-standards(255) dot1(1) interfaces(1) protocol(17) major-version-2(2) minor-version-2(2)}
+WITH SUCCESSORS

 ;

@@ -83,4 +94,12 @@ InnerAtResponse ::= SEQUENCE {
  | WITH COMPONENTS { responseCode (ALL EXCEPT ok), certificate ABSENT }
  )

+EtsiTs102941ButterflyAuthorizationRequest-X509Signed ::= Ieee1609Dot2Data-SignedX509AuthenticatedCertRequest {
+	ScmsPdu-Scoped {
+		EeRaInterfacePdu (WITH COMPONENTS {
+			eeRaCertRequest})
+		},
+	SignerSingleX509Cert
+}
+
 END
--- a/EtsiTs102941TypesAuthorizationValidation.asn
+++ b/EtsiTs102941TypesAuthorizationValidation.asn
 EtsiTs102941TypesAuthorizationValidation
-  { itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) authValidation(7) version-3(3) minor-version-1(1)}
+  { itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) authValidation(7) major-version-3(3) minor-version-1(1)}

 DEFINITIONS AUTOMATIC TAGS ::=
 BEGIN
@@ -8,17 +8,18 @@ IMPORTS

 EtsiTs103097Certificate
 FROM EtsiTs103097Module
-{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) core(1) version-3(3) minor-version-1(1) } 
--WITH SUCCESSORS
+{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) core(1) major-version-3(3) minor-version-1(1) } 
+WITH SUCCESSORS

 CertificateFormat, CertificateSubjectAttributes,EcSignature, HashedId8, PublicKeys, Version
 FROM EtsiTs102941BaseTypes
-{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) baseTypes(3) version-3(3) minor-version-1(1) }
+{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) baseTypes(3) major-version-3(3) minor-version-1(1) }
+WITH SUCCESSORS

 SharedAtRequest
 FROM EtsiTs102941TypesAuthorization
-{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) authorization(5) version-3(3) minor-version-1(1) }
-
+{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) authorization(5) major-version-3(3) minor-version-3(3) }
+WITH SUCCESSORS
 ;

 /************

--- a/EtsiTs102941TypesCaManagement.asn
+++ b/EtsiTs102941TypesCaManagement.asn
 EtsiTs102941TypesCaManagement
-  { itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) caManagement(8) version-3(3) minor-version-1(1)}
+  { itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) caManagement(8) major-version-3(3) minor-version-1(1)}

 DEFINITIONS AUTOMATIC TAGS ::=
 BEGIN
@@ -9,13 +9,13 @@ IMPORTS
 EtsiTs103097Certificate, EtsiTs103097Data-Signed 
 FROM	
 EtsiTs103097Module 
-{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) core(1) version-3(3) minor-version-1(1) } 
--WITH SUCCESSORS
+{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) core(1) major-version-3(3) minor-version-1(1) } 
+WITH SUCCESSORS

 PublicKeys, CertificateSubjectAttributes
 FROM EtsiTs102941BaseTypes
-{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) baseTypes(3) version-3(3) minor-version-1(1) }
-
+{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) baseTypes(3) major-version-3(3) minor-version-1(1) }
+WITH SUCCESSORS
 ;

 /************

--- a/EtsiTs102941TypesEnrolment.asn
+++ b/EtsiTs102941TypesEnrolment.asn
 EtsiTs102941TypesEnrolment
-  { itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) enrolment(4) version-3(3) minor-version-1(1) }
+  { itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) enrolment(4) major-version-3(3) minor-version-1(1) }

 DEFINITIONS AUTOMATIC TAGS ::=
 BEGIN
@@ -9,13 +9,13 @@ IMPORTS
 EtsiTs103097Certificate,
 EtsiTs103097Data-Signed
 FROM EtsiTs103097Module
-{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) core(1) version-3(3) minor-version-1(1) } 
--WITH SUCCESSORS
+{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) core(1) major-version-3(3) minor-version-1(1) } 
+WITH SUCCESSORS

 CertificateFormat, CertificateSubjectAttributes, EcSignature, HashedId8, PublicKeys, Version
 FROM EtsiTs102941BaseTypes
-{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) baseTypes(3) version-3(3) minor-version-1(1) }
-
+{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) baseTypes(3) major-version-3(3) minor-version-1(1) }
+WITH SUCCESSORS
 ;

 /************

--- a/EtsiTs102941TypesLinkCertificate.asn
+++ b/EtsiTs102941TypesLinkCertificate.asn
 EtsiTs102941TypesLinkCertificate
-  { itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) linkCertificate(9) version-3(3) minor-version-1(1) }
+{ itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) linkCertificate(9) major-version-3(3) minor-version-1(1) }

 DEFINITIONS AUTOMATIC TAGS ::=
 BEGIN
@@ -8,8 +8,8 @@ IMPORTS

 Time32, HashedData
 FROM EtsiTs102941BaseTypes 
-{itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) baseTypes(3) version-3(3) minor-version-1(1)}
--WITH SUCCESSORS
+{itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) ts(102941) baseTypes(3) major-version-3(3) minor-version-1(1)}
+WITH SUCCESSORS

 ;


--- a/ieee_1609.2.1 @ 79b58deb
+++ b/ieee_1609.2.1 @ 79b58deb
-Subproject commit cd51198b6757e8080b0c56b5b4621fb2a243fbe3
+Subproject commit 79b58debdf3f6467680f5a2de4d05ae7246f9b33
--- a/sec @ 330b1b2d
+++ b/sec @ 330b1b2d
-Subproject commit 4f4087b965700c5fc83845dd9088ab7d1435eee0
+Subproject commit 330b1b2dc31827d34d3d1f4bd03632ac91490c3c