Commit bfc6af23 authored by Denis Filatov's avatar Denis Filatov
Browse files

Merge branch 'WI-005122' into release2

parents 554a167a e4c70e73
Loading
Loading
Loading
Loading
Loading
+0 −6
Original line number Original line Diff line number Diff line
@@ -7,13 +7,7 @@ variables:
  
  
validate:
validate:
  extends: .validate
  extends: .validate
  only:
    changes:
      - '*.asn'




documentation:
documentation:
  extends: .documentation
  extends: .documentation
  only:
    changes:
      - '*.asn'
+52 −52
Original line number Original line Diff line number Diff line
EtsiTs103097ExtensionModule
EtsiTs103097ExtensionModule
{itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) extension(2) major-version-1(1) minor-version-1(1)} 
{itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) extension(2) major-version-1(1) minor-version-2(2)} 
DEFINITIONS AUTOMATIC TAGS ::= BEGIN
DEFINITIONS AUTOMATIC TAGS ::= BEGIN


IMPORTS
IMPORTS
  EXT-TYPE,
  Extension,
  ExtId, 
  HashedId8,
  HashedId8,
  Time32
  Time32,
  Uint8 
FROM Ieee1609Dot2BaseTypes {iso(1) identified-organization(3) ieee(111) 
FROM Ieee1609Dot2BaseTypes {iso(1) identified-organization(3) ieee(111) 
    standards-association-numbered-series-standards(2) wave-stds(1609)  
    standards-association-numbered-series-standards(2) wave-stds(1609)  
    dot2(2) base(1) base-types(2) major-version-2 (2) minor-version-3 (3)}
    dot2(2) base(1) base-types(2) major-version-2 (2) minor-version-5 (5)}
WITH SUCCESSORS    
WITH SUCCESSORS    
;
;


ExtensionModuleVersion::= INTEGER(1)
ExtensionModuleVersion::= INTEGER(2)

Extension {EXT-TYPE : ExtensionTypes} ::= SEQUENCE {
    id      EXT-TYPE.&extId({ExtensionTypes}),
    content EXT-TYPE.&ExtContent({ExtensionTypes}{@.id})
}

EXT-TYPE ::= CLASS {
    &extId        ExtId,
    &ExtContent
} WITH SYNTAX {&ExtContent IDENTIFIED BY &extId} 

ExtId ::= INTEGER(0..255)


EtsiOriginatingHeaderInfoExtension ::= Extension{{EtsiTs103097HeaderInfoExtensions}}
EtsiOriginatingHeaderInfoExtension ::= Extension{{EtsiTs103097HeaderInfoExtensions}}


EtsiTs103097HeaderInfoExtensionId ::= ExtId
EtsiTs103097HeaderInfoExtensionId ::= ExtId
   etsiTs102941CrlRequestId      EtsiTs103097HeaderInfoExtensionId ::= 1 --'01'H
   etsiTs102941CrlRequestId      EtsiTs103097HeaderInfoExtensionId ::= 1 --'01'H
   etsiTs102941DeltaCtlRequestId EtsiTs103097HeaderInfoExtensionId ::= 2 --'02'H
   etsiTs102941DeltaCtlRequestId EtsiTs103097HeaderInfoExtensionId ::= 2 --'02'H
   etsiTs102941FullCtlRequestId  EtsiTs103097HeaderInfoExtensionId ::= 3 --'03'H


EtsiTs103097HeaderInfoExtensions EXT-TYPE ::= {
EtsiTs103097HeaderInfoExtensions EXT-TYPE ::= {
   { EtsiTs102941CrlRequest       IDENTIFIED BY etsiTs102941CrlRequestId } |
   { EtsiTs102941CrlRequest       IDENTIFIED BY etsiTs102941CrlRequestId } |
   { EtsiTs102941DeltaCtlRequest  IDENTIFIED BY etsiTs102941DeltaCtlRequestId },
   { EtsiTs102941DeltaCtlRequest  IDENTIFIED BY etsiTs102941DeltaCtlRequestId },
   ...
   ...,
   { EtsiTs102941FullCtlRequest   IDENTIFIED BY etsiTs102941FullCtlRequestId }
}
}


EtsiTs102941CrlRequest::= SEQUENCE {
EtsiTs102941CrlRequest::= SEQUENCE {
@@ -44,7 +38,13 @@ EtsiTs102941CrlRequest::= SEQUENCE {


EtsiTs102941CtlRequest::= SEQUENCE {
EtsiTs102941CtlRequest::= SEQUENCE {
    issuerId             HashedId8,
    issuerId             HashedId8,
    lastKnownCtlSequence INTEGER (0..255) OPTIONAL
    lastKnownCtlSequence Uint8 OPTIONAL
}

EtsiTs102941FullCtlRequest::= SEQUENCE { 
	issuerId             HashedId8,
	lastKnownCtlSequence Uint8 OPTIONAL,
	segmentNumber        Uint8 OPTIONAL
}
}


EtsiTs102941DeltaCtlRequest::= EtsiTs102941CtlRequest
EtsiTs102941DeltaCtlRequest::= EtsiTs102941CtlRequest
+181 −123
Original line number Original line Diff line number Diff line
EtsiTs103097Module
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)} 
{itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) core(1) major-version-3(3) minor-version-2(2)} 


DEFINITIONS AUTOMATIC TAGS ::= BEGIN
DEFINITIONS AUTOMATIC TAGS ::= BEGIN


@@ -8,47 +8,105 @@ IMPORTS
Ieee1609Dot2Data, Certificate
Ieee1609Dot2Data, Certificate
FROM Ieee1609Dot2 {iso(1) identified-organization(3) ieee(111) 
FROM Ieee1609Dot2 {iso(1) identified-organization(3) ieee(111) 
  standards-association-numbered-series-standards(2) wave-stds(1609)  
  standards-association-numbered-series-standards(2) wave-stds(1609)  
  dot2(2) base(1) schema(1) major-version-2(2) minor-version-4(4)}
  dot2(2) base(1) schema(1) major-version-2(2) minor-version-7(7)}
WITH SUCCESSORS
WITH SUCCESSORS


ExtensionModuleVersion
ExtensionModuleVersion
FROM EtsiTs103097ExtensionModule {itu-t(0) identified-organization(4)
FROM EtsiTs103097ExtensionModule {itu-t(0) identified-organization(4)
  etsi(0) itsDomain(5) wg5(5) secHeaders(103097) extension(2) major-version-1(1) minor-version-1(1)}
  etsi(0) itsDomain(5) wg5(5) secHeaders(103097) extension(2) major-version-1(1) minor-version-2(2)}
;
;


EtsiTs103097Certificate::= Certificate (WITH COMPONENTS{...,
EtsiTs103097Certificate::= Certificate (WITH COMPONENTS{...,
  issuer (WITH COMPONENTS{ -- constraints on issuer 
    sha256AndDigest,
    self (sha256 | sha384),
    sha384AndDigest
  }),
  toBeSigned (WITH COMPONENTS{...,
  toBeSigned (WITH COMPONENTS{...,
    id (WITH COMPONENTS{...,
    id (WITH COMPONENTS{..., -- constraints on id 
      linkageData ABSENT,
      linkageData ABSENT,
      binaryId ABSENT
      binaryId ABSENT
    }),
    }),
    certRequestPermissions ABSENT,
    certRequestPermissions ABSENT,
    canRequestRollover ABSENT
    canRequestRollover ABSENT,
    encryptionKey (WITH COMPONENTS { -- constraints on encryptionKey 
      supportedSymmAlg (aes128Ccm),
      publicKey (WITH COMPONENTS {
        eciesNistP256,
        eciesBrainpoolP256r1
      })
    }),
    verifyKeyIndicator (WITH COMPONENTS {..., -- constraints on verifyKeyIndicator 
      verificationKey (WITH COMPONENTS {
        ecdsaNistP256,
        ecdsaBrainpoolP256r1,
        ecdsaBrainpoolP384r1,
        ecdsaNistP384 
      })
    }) --,
   -- certRequestExtension ABSENT
  }),
  signature (WITH COMPONENTS { -- constraints on signature 
    ecdsaNistP256Signature,
    ecdsaBrainpoolP256r1Signature,
    ecdsaBrainpoolP384r1Signature,
    ecdsaNistP384Signature 
  })
  })
}) 
}) 


EtsiTs103097Data::=Ieee1609Dot2Data (WITH COMPONENTS {..., 
EtsiTs103097Data::=Ieee1609Dot2Data (WITH COMPONENTS {..., 
  content (WITH COMPONENTS {...,
  content (WITH COMPONENTS {...,
    signedData (WITH COMPONENTS {..., -- constraints on signed data headers
    signedData (WITH COMPONENTS {..., -- constraints on signed data headers
      tbsData (WITH COMPONENTS {              
      hashId (sha256 | sha384),
      tbsData (WITH COMPONENTS {      -- constraints on tbsData       
        headerInfo (WITH COMPONENTS {...,
        headerInfo (WITH COMPONENTS {...,
          generationTime PRESENT,
          generationTime PRESENT,
          p2pcdLearningRequest ABSENT,
          p2pcdLearningRequest ABSENT,
          missingCrlIdentifier ABSENT
          missingCrlIdentifier ABSENT,
          encryptionKey (WITH COMPONENTS { -- constraints on encryptionKey   
            public (WITH COMPONENTS {
              supportedSymmAlg (aes128Ccm),
              publicKey (WITH COMPONENTS {
                eciesNistP256,
                eciesBrainpoolP256r1
              })
            }),
            symmetric (WITH COMPONENTS {
              aes128Ccm  
            })
          })
        })
        })
      }),
      }),
      signer (WITH COMPONENTS {...,  -- constraints on the certificate
      signer (WITH COMPONENTS {...,  -- constraints on the certificate
        certificate ((WITH COMPONENT (EtsiTs103097Certificate))^(SIZE(1)))
        certificate ((WITH COMPONENT (EtsiTs103097Certificate))^(SIZE(1)))
      }),
      signature (WITH COMPONENTS {..., -- constraints on the signature
        sm2Signature ABSENT 
      })
      })
    }),
    }),
    encryptedData (WITH COMPONENTS {..., -- constraints on encrypted data headers
    encryptedData (WITH COMPONENTS {..., -- constraints on encrypted data headers
      recipients  (WITH COMPONENT (
      recipients  (WITH COMPONENT (
        (WITH COMPONENTS {...,
        (WITH COMPONENTS {...,
          certRecipInfo (WITH COMPONENTS{
            encKey (WITH COMPONENTS{
              eciesNistP256,
              eciesBrainpoolP256r1
            })
          }),
          signedDataRecipInfo(WITH COMPONENTS{
            encKey (WITH COMPONENTS{
              eciesNistP256,
              eciesBrainpoolP256r1
            })
          }),
          pskRecipInfo ABSENT,
          pskRecipInfo ABSENT,
          symmRecipInfo ABSENT,
          symmRecipInfo ABSENT,
          rekRecipInfo ABSENT
          rekRecipInfo ABSENT
        })
        })
      ))
      )),
      ciphertext (WITH COMPONENTS {
        aes128ccm
      })
    }),
    }),
    signedCertificateRequest ABSENT
    signedCertificateRequest ABSENT
  })
  })
+22 −34
Original line number Original line Diff line number Diff line
# <a name="EtsiTs103097ExtensionModule"></a>ASN.1 module EtsiTs103097ExtensionModule
# <a name="EtsiTs103097ExtensionModule"></a>ASN.1 module EtsiTs103097ExtensionModule
OID: _{itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) extension(2) major-version-1(1) minor-version-1(1)}_
OID: _{itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) extension(2) major-version-1(1) minor-version-2(2)}_


## Imports:
## Imports:
* **[Ieee1609Dot2BaseTypes](Ieee1609Dot2BaseTypes.md)** *{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-3 (3)} WITH SUCCESSORS*<br/>
* **[Ieee1609Dot2BaseTypes](Ieee1609Dot2BaseTypes.md)** *{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*<br/>
## Data Elements:
## Data Elements:
### <a name="ExtensionModuleVersion"></a>ExtensionModuleVersion
### <a name="ExtensionModuleVersion"></a>ExtensionModuleVersion
```asn1
```asn1
ExtensionModuleVersion::= INTEGER(1)
ExtensionModuleVersion::= INTEGER(2)
```

### <a name="Extension"></a>Extension

Fields:
* _id_ of type [**EXT-TYPE**](#EXT-TYPE) .&extId({ExtensionTypes})<br>
* _content_ of type [**EXT-TYPE**](#EXT-TYPE) .&ExtContent({ExtensionTypes}{@.id})<br>
```asn1
Extension {EXT-TYPE : ExtensionTypes} ::= SEQUENCE {
    id      EXT-TYPE.&extId({ExtensionTypes}),
    content EXT-TYPE.&ExtContent({ExtensionTypes}{@.id})
}
```

### <a name="EXT-TYPE"></a>EXT-TYPE

Fields:
* _extId_ of type [**ExtId**](#ExtId) <br>
```asn1
EXT-TYPE ::= CLASS {
    &extId        ExtId,
    &ExtContent
} WITH SYNTAX {&ExtContent IDENTIFIED BY &extId}
```

### <a name="ExtId"></a>ExtId
```asn1
ExtId ::= INTEGER(0..255)
```
```


### <a name="EtsiOriginatingHeaderInfoExtension"></a>EtsiOriginatingHeaderInfoExtension
### <a name="EtsiOriginatingHeaderInfoExtension"></a>EtsiOriginatingHeaderInfoExtension
@@ -47,6 +19,7 @@ EtsiOriginatingHeaderInfoExtension ::= Extension{{EtsiTs103097HeaderInfoExtensio
EtsiTs103097HeaderInfoExtensionId ::= ExtId
EtsiTs103097HeaderInfoExtensionId ::= ExtId
   etsiTs102941CrlRequestId      EtsiTs103097HeaderInfoExtensionId ::= 1 
   etsiTs102941CrlRequestId      EtsiTs103097HeaderInfoExtensionId ::= 1 
   etsiTs102941DeltaCtlRequestId EtsiTs103097HeaderInfoExtensionId ::= 2 
   etsiTs102941DeltaCtlRequestId EtsiTs103097HeaderInfoExtensionId ::= 2 
   etsiTs102941FullCtlRequestId  EtsiTs103097HeaderInfoExtensionId ::= 3 
```
```


### <a name="EtsiTs103097HeaderInfoExtensions"></a>EtsiTs103097HeaderInfoExtensions
### <a name="EtsiTs103097HeaderInfoExtensions"></a>EtsiTs103097HeaderInfoExtensions
@@ -54,7 +27,8 @@ EtsiTs103097HeaderInfoExtensionId ::= ExtId
EtsiTs103097HeaderInfoExtensions EXT-TYPE ::= {
EtsiTs103097HeaderInfoExtensions EXT-TYPE ::= {
   { EtsiTs102941CrlRequest       IDENTIFIED BY etsiTs102941CrlRequestId } |
   { EtsiTs102941CrlRequest       IDENTIFIED BY etsiTs102941CrlRequestId } |
   { EtsiTs102941DeltaCtlRequest  IDENTIFIED BY etsiTs102941DeltaCtlRequestId },
   { EtsiTs102941DeltaCtlRequest  IDENTIFIED BY etsiTs102941DeltaCtlRequestId },
   ...
   ...,
   { EtsiTs102941FullCtlRequest   IDENTIFIED BY etsiTs102941FullCtlRequestId }
}
}
```
```


@@ -74,11 +48,25 @@ EtsiTs102941CrlRequest::= SEQUENCE {


Fields:
Fields:
* _issuerId_ of type [**HashedId8**](Ieee1609Dot2BaseTypes.md#HashedId8) <br>
* _issuerId_ of type [**HashedId8**](Ieee1609Dot2BaseTypes.md#HashedId8) <br>
* _lastKnownCtlSequence_ of type **INTEGER**  (0..255) OPTIONAL<br>
* _lastKnownCtlSequence_ of type [**Uint8**](Ieee1609Dot2BaseTypes.md#Uint8)  OPTIONAL<br>
```asn1
```asn1
EtsiTs102941CtlRequest::= SEQUENCE {
EtsiTs102941CtlRequest::= SEQUENCE {
    issuerId             HashedId8,
    issuerId             HashedId8,
    lastKnownCtlSequence INTEGER (0..255) OPTIONAL
    lastKnownCtlSequence Uint8 OPTIONAL
}
```

### <a name="EtsiTs102941FullCtlRequest"></a>EtsiTs102941FullCtlRequest

Fields:
* _issuerId_ of type [**HashedId8**](Ieee1609Dot2BaseTypes.md#HashedId8) <br>
* _lastKnownCtlSequence_ of type [**Uint8**](Ieee1609Dot2BaseTypes.md#Uint8)  OPTIONAL<br>
* _segmentNumber_ of type [**Uint8**](Ieee1609Dot2BaseTypes.md#Uint8)  OPTIONAL<br>
```asn1
EtsiTs102941FullCtlRequest::= SEQUENCE { 
	issuerId             HashedId8,
	lastKnownCtlSequence Uint8 OPTIONAL,
	segmentNumber        Uint8 OPTIONAL
}
}
```
```


+71 −10
Original line number Original line Diff line number Diff line
# <a name="EtsiTs103097Module"></a>ASN.1 module EtsiTs103097Module
# <a name="EtsiTs103097Module"></a>ASN.1 module EtsiTs103097Module
OID: _{itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) core(1) major-version-3(3) minor-version-1(1)}_
OID: _{itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) core(1) major-version-3(3) minor-version-2(2)}_


## Imports:
## Imports:
* **[Ieee1609Dot2](Ieee1609Dot2.md)** *{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-4(4)} WITH SUCCESSORS*<br/>
* **[Ieee1609Dot2](Ieee1609Dot2.md)** *{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*<br/>
* **[EtsiTs103097ExtensionModule](EtsiTs103097ExtensionModule.md)** *{itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) extension(2) major-version-1(1) minor-version-1(1)}*<br/>
* **[EtsiTs103097ExtensionModule](EtsiTs103097ExtensionModule.md)** *{itu-t(0) identified-organization(4) etsi(0) itsDomain(5) wg5(5) secHeaders(103097) extension(2) major-version-1(1) minor-version-2(2)}*<br/>
## Data Elements:
## Data Elements:
### <a name="EtsiTs103097Certificate"></a>EtsiTs103097Certificate
### <a name="EtsiTs103097Certificate"></a>EtsiTs103097Certificate
```asn1
```asn1
EtsiTs103097Certificate::= Certificate (WITH COMPONENTS{...,
EtsiTs103097Certificate::= Certificate (WITH COMPONENTS{...,
  issuer (WITH COMPONENTS{ 
    sha256AndDigest,
    self (sha256 | sha384),
    sha384AndDigest
  }),
  toBeSigned (WITH COMPONENTS{...,
  toBeSigned (WITH COMPONENTS{...,
    id (WITH COMPONENTS{..., 
    id (WITH COMPONENTS{..., 
      linkageData ABSENT,
      linkageData ABSENT,
      binaryId ABSENT
      binaryId ABSENT
    }),
    }),
    certRequestPermissions ABSENT,
    certRequestPermissions ABSENT,
    canRequestRollover ABSENT
    canRequestRollover ABSENT,
    encryptionKey (WITH COMPONENTS { 
      supportedSymmAlg (aes128Ccm),
      publicKey (WITH COMPONENTS {
        eciesNistP256,
        eciesBrainpoolP256r1
      })
    }),
    verifyKeyIndicator (WITH COMPONENTS {..., 
      verificationKey (WITH COMPONENTS {
        ecdsaNistP256,
        ecdsaBrainpoolP256r1,
        ecdsaBrainpoolP384r1,
        ecdsaNistP384 
      })
    })
  }),
  signature (WITH COMPONENTS { 
    ecdsaNistP256Signature,
    ecdsaBrainpoolP256r1Signature,
    ecdsaBrainpoolP384r1Signature,
    ecdsaNistP384Signature 
  })
  })
})
})
```
```
@@ -24,25 +50,56 @@ EtsiTs103097Certificate::= Certificate (WITH COMPONENTS{...,
EtsiTs103097Data::=Ieee1609Dot2Data (WITH COMPONENTS {..., 
EtsiTs103097Data::=Ieee1609Dot2Data (WITH COMPONENTS {..., 
  content (WITH COMPONENTS {...,
  content (WITH COMPONENTS {...,
    signedData (WITH COMPONENTS {..., 
    signedData (WITH COMPONENTS {..., 
      hashId (sha256 | sha384),
      tbsData (WITH COMPONENTS {      
      tbsData (WITH COMPONENTS {      
        headerInfo (WITH COMPONENTS {...,
        headerInfo (WITH COMPONENTS {...,
          generationTime PRESENT,
          generationTime PRESENT,
          p2pcdLearningRequest ABSENT,
          p2pcdLearningRequest ABSENT,
          missingCrlIdentifier ABSENT
          missingCrlIdentifier ABSENT,
          encryptionKey (WITH COMPONENTS { 
            public (WITH COMPONENTS {
              supportedSymmAlg (aes128Ccm),
              publicKey (WITH COMPONENTS {
                eciesNistP256,
                eciesBrainpoolP256r1
              })
            }),
            symmetric (WITH COMPONENTS {
              aes128Ccm  
            })
          })
        })
        })
      }),
      }),
      signer (WITH COMPONENTS {...,  
      signer (WITH COMPONENTS {...,  
        certificate ((WITH COMPONENT (EtsiTs103097Certificate))^(SIZE(1)))
        certificate ((WITH COMPONENT (EtsiTs103097Certificate))^(SIZE(1)))
      }),
      signature (WITH COMPONENTS {..., 
        sm2Signature ABSENT 
      })
      })
    }),
    }),
    encryptedData (WITH COMPONENTS {..., 
    encryptedData (WITH COMPONENTS {..., 
      recipients  (WITH COMPONENT (
      recipients  (WITH COMPONENT (
        (WITH COMPONENTS {...,
        (WITH COMPONENTS {...,
          certRecipInfo (WITH COMPONENTS{
            encKey (WITH COMPONENTS{
              eciesNistP256,
              eciesBrainpoolP256r1
            })
          }),
          signedDataRecipInfo(WITH COMPONENTS{
            encKey (WITH COMPONENTS{
              eciesNistP256,
              eciesBrainpoolP256r1
            })
          }),
          pskRecipInfo ABSENT,
          pskRecipInfo ABSENT,
          symmRecipInfo ABSENT,
          symmRecipInfo ABSENT,
          rekRecipInfo ABSENT
          rekRecipInfo ABSENT
        })
        })
      ))
      )),
      ciphertext (WITH COMPONENTS {
        aes128ccm
      })
    }),
    }),
    signedCertificateRequest ABSENT
    signedCertificateRequest ABSENT
  })
  })
@@ -142,5 +199,9 @@ EtsiTs103097Data-SignedAndEncrypted-Unicast {ToBesignedAndEncryptedDataContent}
})
})
```
```


```asn1

```



Loading