Commit 9356d08c authored by Denis Filatov's avatar Denis Filatov
Browse files

v2025

parent 5bb49cd9
Loading
Loading
Loading
Loading
+52 −52
Original line number Diff line number Diff line
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

IMPORTS
  EXT-TYPE,
  Extension,
  ExtId, 
  HashedId8,
  Time32
  Time32,
  Uint8 
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-3 (3)}
    dot2(2) base(1) base-types(2) major-version-2 (2) minor-version-5 (5)}
WITH SUCCESSORS    
;

ExtensionModuleVersion::= INTEGER(1)

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)
ExtensionModuleVersion::= INTEGER(2)

EtsiOriginatingHeaderInfoExtension ::= Extension{{EtsiTs103097HeaderInfoExtensions}}

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

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

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

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

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

EtsiTs102941DeltaCtlRequest::= EtsiTs102941CtlRequest
+183 −123
Original line number Diff line number Diff line
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

@@ -8,47 +8,105 @@ IMPORTS
Ieee1609Dot2Data, Certificate
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-4(4)}
  dot2(2) base(1) schema(1) major-version-2(2) minor-version-7(7)}
WITH SUCCESSORS

ExtensionModuleVersion
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{...,
  issuer (WITH COMPONENTS{ -- constraints on issuer 
    sha256AndDigest,
    self (sha256 | sha384),
    sha384AndDigest
  }),
  toBeSigned (WITH COMPONENTS{...,
    id (WITH COMPONENTS{...,
    id (WITH COMPONENTS{..., -- constraints on id 
      linkageData ABSENT,
      binaryId 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 {..., 
  content (WITH COMPONENTS {...,
    signedData (WITH COMPONENTS {..., -- constraints on signed data headers
      tbsData (WITH COMPONENTS {              
      hashId (sha256 | sha384),
      tbsData (WITH COMPONENTS {      -- constraints on tbsData       
        headerInfo (WITH COMPONENTS {...,
          generationTime PRESENT,
          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
        certificate ((WITH COMPONENT (EtsiTs103097Certificate))^(SIZE(1)))
      }),
      signature (WITH COMPONENTS {..., -- constraints on the signature
        sm2Signature ABSENT 
      })
    }),
    encryptedData (WITH COMPONENTS {..., -- constraints on encrypted data headers
      recipients  (WITH COMPONENT (
        (WITH COMPONENTS {...,
          certRecipInfo (WITH COMPONENTS{
            encKey (WITH COMPONENTS{
              eciesNistP256,
              eciesBrainpoolP256r1
            })
          }),
          signedDataRecipInfo(WITH COMPONENTS{
            encKey (WITH COMPONENTS{
              eciesNistP256,
              eciesBrainpoolP256r1
            })
          }),
          pskRecipInfo ABSENT,
          symmRecipInfo ABSENT,
          rekRecipInfo ABSENT
        })
      ))
      )),
      ciphertext (WITH COMPONENTS {
        aes128ccm
      })
    }),
    signedCertificateRequest ABSENT
  })
@@ -120,4 +178,6 @@ EtsiTs103097Data-SignedAndEncrypted-Unicast {ToBesignedAndEncryptedDataContent}
  })
}) 

TestPdu1 ::= EtsiTs103097Data-Signed {OCTET STRING}
-- TestPdu2 ::= EtsiTs103097Data-Encrypted {OCTET STRING}
END
Compare ddf554e5 to fa480376
Original line number Diff line number Diff line
Subproject commit ddf554e5e23398d578b9519f0e19682e3f058cfe
Subproject commit fa4803768b15a52b0121b970088eb3d455137d1a