Commit 6d7aceb9 authored by Denis Filatov's avatar Denis Filatov
Browse files

update Ext module, allow only ETSI algs

parent 3a21f36c

EtsiTs103097ExtensionModule.asn

+6 −15
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

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-4 (4)}

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)



EtsiOriginatingHeaderInfoExtension ::= Extension{{EtsiTs103097HeaderInfoExtensions}}



EtsiTs103097HeaderInfoExtensionId ::= ExtId

EtsiTs103097Module.asn

+37 −24
Original line number Diff line number Diff line
@@ -13,35 +13,43 @@ 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{...,

  issuer (WITH COMPONENTS{ -- constraints on issuer 

    sha256AndDigest,

    self (sha256 | sha384),

    sm3AndDigest ABSENT

    sha384AndDigest

  }),

  toBeSigned (WITH COMPONENTS{...,

    id (WITH COMPONENTS{...,

    id (WITH COMPONENTS{..., -- constraints on id 

      linkageData ABSENT,

      binaryId ABSENT

    }),

    certRequestPermissions ABSENT,

    canRequestRollover ABSENT,

    encryptionKey (WITH COMPONENTS {

    encryptionKey (WITH COMPONENTS { -- constraints on encryptionKey 

      supportedSymmAlg (aes128Ccm),

      publicKey (WITH COMPONENTS {...,

        ecencSm2 ABSENT

      publicKey (WITH COMPONENTS {

        eciesNistP256,

        eciesBrainpoolP256r1

      })

    }),

    verifyKeyIndicator (WITH COMPONENTS {...,

      verificationKey (WITH COMPONENTS {...,

        ecsigSm2 ABSENT

    verifyKeyIndicator (WITH COMPONENTS {..., -- constraints on verifyKeyIndicator 

      verificationKey (WITH COMPONENTS {

        ecdsaNistP256,

        ecdsaBrainpoolP256r1,

        ecdsaBrainpoolP384r1,

        ecdsaNistP384 

      })

    })

  }),

  signature (WITH COMPONENTS {..., 

    sm2Signature ABSENT 

  signature (WITH COMPONENTS { -- constraints on signature 

    ecdsaNistP256Signature,

    ecdsaBrainpoolP256r1Signature,

    ecdsaBrainpoolP384r1Signature,

    ecdsaNistP384Signature 

  })

})
@@ -49,20 +57,21 @@ EtsiTs103097Data::=Ieee1609Dot2Data (WITH COMPONENTS {..., 
  content (WITH COMPONENTS {...,

    signedData (WITH COMPONENTS {..., -- constraints on signed data headers

      hashId (sha256 | sha384),

      tbsData (WITH COMPONENTS {            

      tbsData (WITH COMPONENTS {      -- constraints on tbsData       

        headerInfo (WITH COMPONENTS {...,

          generationTime PRESENT,

          p2pcdLearningRequest ABSENT,

          missingCrlIdentifier ABSENT,

          encryptionKey (WITH COMPONENTS {

          encryptionKey (WITH COMPONENTS { -- constraints on encryptionKey   

            public (WITH COMPONENTS {

              supportedSymmAlg (aes128Ccm),

              publicKey (WITH COMPONENTS {...,

                ecencSm2 ABSENT

              publicKey (WITH COMPONENTS {

                eciesNistP256,

                eciesBrainpoolP256r1

              })

            }),

            symmetric (WITH COMPONENTS {...,

              sm4Ccm ABSENT 

            symmetric (WITH COMPONENTS {

              aes128Ccm  

            })

          })

        })
@@ -78,13 +87,15 @@ EtsiTs103097Data::=Ieee1609Dot2Data (WITH COMPONENTS {..., 
      recipients  (WITH COMPONENT (

        (WITH COMPONENTS {...,

          certRecipInfo (WITH COMPONENTS{

            encKey (WITH COMPONENTS{...,

              ecencSm2256 ABSENT

            encKey (WITH COMPONENTS{

              eciesNistP256,

              eciesBrainpoolP256r1

            })

          }),

          signedDataRecipInfo(WITH COMPONENTS{

            encKey (WITH COMPONENTS{...,

              ecencSm2256 ABSENT

            encKey (WITH COMPONENTS{

              eciesNistP256,

              eciesBrainpoolP256r1

            })

          }),

          pskRecipInfo ABSENT,
@@ -92,8 +103,8 @@ EtsiTs103097Data::=Ieee1609Dot2Data (WITH COMPONENTS {..., 
          rekRecipInfo ABSENT

        })

      )),

      ciphertext (WITH COMPONENTS {..., 

        sm4Ccm ABSENT

      ciphertext (WITH COMPONENTS {

        aes128ccm

      })

    }),

    signedCertificateRequest ABSENT
@@ -166,4 +177,6 @@ EtsiTs103097Data-SignedAndEncrypted-Unicast {ToBesignedAndEncryptedDataContent} 
  })

}) 



-- TestPdu1 ::= EtsiTs103097Data-Signed {OCTET STRING}

-- TestPdu2 ::= EtsiTs103097Data-Encrypted {OCTET STRING}

END

ieee1609dot2 @ 880216d3

Compare ddf554e5 to 880216d3
Original line number Diff line number Diff line 
Subproject commit ddf554e5e23398d578b9519f0e19682e3f058cfe
 
Subproject commit 880216d33d08b424764a319ae1d8ee825a793a47