cddl 0.8.7 → 0.8.12

data/test-data/mdl-ble.cddl

@@ -0,0 +1,9 @@
+BLEIdentification = {
+    ? 0 : bool,
+    ? 1 : bool,
+    ? 10 : bstr,
+; Indicates support for Peripheral server mode
+; Indicates support for Central client mode
+; Optional UUID for peripheral server mode
+    ? 11 : bstr ; Optional MAC address for peripheral server mode 
+}

data/test-data/mdl-deve.cddl

@@ -0,0 +1,54 @@
+deviceEngagement = [
+    uint,
+    security,
+    transferMethods,
+    options,
+    ? proprietary
+]
+security = [
+    bstr,
+uint, uint
+]
+transferMethods = [
+    * transferMethod
+]
+options = {
+    ?"WebAPI" : WebAPI,
+    ?"OIDC" : OIDC,
+    ?"compact" : bool
+}
+proprietary = {
+    * tstr => any
+}
+transferMethod = [
+    uint,
+uint, * any
+]
+OIDC = [
+  uint,
+  tstr,
+  tstr
+]
+WebAPI = [
+  uint,
+  tstr, tstr
+]
+; Version of device engagement structure, currently 1
+; Security structure
+; Transfer methods
+; Optional elements
+; Proprietary elements
+; mDL public ephemeral key, mDL.EPub
+; curve identifier, see Table 23
+; cipher suite identifier, see Table 22
+; details for transfer methods
+; any number of elements
+; type
+; version
+; specific option(s) to the type
+; version
+; url
+; token
+; version
+; url
+; token

data/test-data/mdl-dp.cddl

@@ -0,0 +1,11 @@
+driving_privileges = [
+    * driving_privilege
+]
+driving_privilege  = {
+    vehicle_category_code: tstr
+    ?issue_date: #6.0(tstr)
+    ?expiry_date: #6.0(tstr)
+    ?code: tstr
+    ?sign: tstr
+    ?value: int
+}

data/test-data/mdl-mso.cddl

@@ -0,0 +1,20 @@
+MobileSecurityObject = {
+   "DigestAlgorithm" : tstr,
+   "ValueDigests" : ValueDigests,
+   "DeviceKey" : COSE_Key,
+   "DocType" : tstr
+}
+ValueDigests = {
+    "NameSpaces" : NameSpaces
+}
+NameSpaces = {
+    + NameSpace => DigestIDs
+}
+DigestIDs = {
+    + DigestID => Digest
+}
+NameSpace = tstr
+DigestID = uint
+Digest = bstr
+
+COSE_Key = "COSE_Key"

data/test-data/mdl-request.cddl

@@ -0,0 +1,26 @@
+Request = {
+    "Version" : tstr,
+    "DocRequests" : [+ DocRequest]
+}
+DocRequest = {
+    "ItemsRequest" : ItemsRequest,
+    ? "ReaderAuth" : COSE_Sign1
+}
+ItemsRequest = {
+    ? "DocType" : DocType,
+    "NameSpaces" : NameSpaces,
+    ? "RequestInfo" : {* tstr => any}
+}
+NameSpaces = {
+    + NameSpace => DataItemNames
+}
+DocType = tstr
+NameSpace = tstr
+DataItemNames = [ + tstr ]
+; Additional info the reader wants to provide
+; Requested data elements for each NameSpace
+; See 7.3.2
+; See 7.3.3
+; See Table 2
+
+COSE_Sign1 = "COSE_Sign1"

data/test-data/mdl-response.cddl

@@ -0,0 +1,66 @@
+Response = {
+    "Version" : tstr,
+    ? "Documents" : Documents,
+    ? "Error" : int
+}
+Documents = {
+    + DocType => ResponseData
+}
+; Version of the structure, currently 1.0
+; Returned documents, may be absent if Error is present
+; Error codes according to Table 8
+ResponseData = {
+    "IssuerSigned" : IssuerSigned,  ; Responded data elements signed by the issuer
+    "DeviceSigned" : DeviceSigned,  ; Responded data elements signed by the mDL
+    "Errors" : Errors
+}
+IssuerSigned = {
+    "NameSpaces" : IssuerNameSpaces,
+    "IssuerAuth" : COSE_Sign1       ; The payload is the MobileSecurityObject, see 9.2.1.4
+}
+IssuerNameSpaces = {
+    + NameSpace => [ + IssuerSignedItem ]
+}
+IssuerSignedItem = [
+    uint,
+    bstr,
+    tstr,
+    any
+]
+DeviceSigned = {
+    "NameSpaces" : DeviceNameSpaces,  ; Currently only online token and URL are defined as DeviceSignedItems
+    "DeviceAuth" : DeviceAuth
+}
+DeviceNameSpaces = {
+    * NameSpace => DeviceSignedItems
+}
+DeviceSignedItems = {
+    + DataItemName => DataItemValue
+}
+DeviceAuth = {
+    "Signature" : COSE_Sign1, //
+                                      ; Use a nil value for the payload, the detached content is the DeviceAuthentication structure, see 9.2.2.4
+    "MAC" : COSE_Mac0
+}
+Errors = {
+    * NameSpace => [ + ErrorItem ]
+}
+ErrorItem = {
+    DataItemName => ErrorCode
+}
+DocType = tstr
+NameSpace = tstr
+DataItemName = tstr
+DataItemValue = any
+ErrorCode = int
+; See table 9
+; See 7.3.2
+; See 7.3.3
+; See Table 2
+; See Table 2
+; Error codes according to Table 9
+; Structures used for DeviceAuth signature or MAC generation, see 9.2.2.4
+; Structures used for MobileSecurityObject, see 9.2.1.4
+
+COSE_Sign1 = "COSE_Sign1"
+COSE_Mac0 = "COSE_Mac0"

data/test-data/mdl.cddl

@@ -0,0 +1,11 @@
+driving_privileges = [
+    * driving_privilege
+]
+driving_privilege  = {
+    vehicle_category_code: tstr
+    ?issue_date: #6.0(tstr)
+    ?expiry_date: #6.0(tstr)
+    ?code: tstr
+    ?sign: tstr
+    ?value: int
+}

data/test-data/mon-val.cddl

@@ -0,0 +1 @@
+decimal-monetary-value = text .regexp "-?[0-9]+(\\.[0-9]+)?"

data/test-data/multipart-ct.cddl

@@ -0,0 +1,2 @@
+multipart-core = [* multipart-part]
+multipart-part = (type: uint .size 2, part: bytes / null)

data/test-data/named-group.cddl

@@ -0,0 +1,7 @@
+foo = { + $$elements }
+
+$$elements //= element1
+$$elements //= element2
+
+element1 = (1: "a")
+element2 = (2: "b")

data/test-data/test-gen.cddl

@@ -0,0 +1,3 @@
+foo = arr<mapa<arr<int>, arr<text>>>
+arr<X> = [* X]
+mapa<X, Y> = {a: X, b: Y}

data/test/test-cddl.rb

@@ -171,6 +171,57 @@ HERE
     assert parser.validate_for_test(true)
   end
 
+  def test_validate_bignum
+    parser = CDDL::Parser.new <<HERE
+test = bigint
+HERE
+    assert parser.validate_for_test(2**4711)
+    assert parser.validate_for_test(-2**815)
+    assert parser.validate_for_test(1)
+    assert parser.validate_for_test(0)
+    assert parser.validate_for_test(-11)
+  end
+
+  def test_aaaaaaaa_invalidate_bignum
+    parser = CDDL::Parser.new <<HERE
+test = bignint
+HERE
+    refute parser.validate_for_test(2**4711, false)
+    assert parser.validate_for_test(-2**815)
+    refute parser.validate_for_test(1, false)
+    refute parser.validate_for_test(0, false)
+    assert parser.validate_for_test(-11)
+  end
+
+  
+  def test_aaaaaaaa_validate_bignum0b
+    parser = CDDL::Parser.new <<HERE
+test = #6.2("")
+HERE
+    refute parser.validate_for_test(1, false)
+    refute parser.validate_for_test(0, false)
+  end
+
+  
+  def test_aaaaaaaa_validate_bignum0
+    parser = CDDL::Parser.new <<HERE
+test = #6.2(h'')
+HERE
+    assert parser.validate_for_test(0)
+    refute parser.validate_for_test(1, false)
+  end
+
+  
+  def test_aaaaaaaa_validate_bignum1
+    parser = CDDL::Parser.new <<HERE
+test = #6.2(h'01')
+HERE
+    assert parser.validate_for_test(1)
+    refute parser.validate_for_test(0, false)
+    refute parser.validate_for_test(2, false)
+  end
+
+
   def test_validate_a
     parser = CDDL::Parser.new <<HERE
 test = [* one: 1]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.12
 platform: ruby
 authors:
 - Carsten Bormann
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-04 00:00:00.000000000 Z
+date: 2020-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -97,16 +97,28 @@ files:
 - test-data/7071-concise-cut.cddl
 - test-data/7071-concise.cddl
 - test-data/7071-verbose.cddl
+- test-data/7807.cddl
 - test-data/a.cddl
+- test-data/abignum.cddl
 - test-data/ambig.cddl
 - test-data/b.cddl
 - test-data/badaddr.cddl
 - test-data/basic_syntax_example.cddl
+- test-data/bpv7.cddl
+- test-data/bpv7a.cddl
+- test-data/bpv7b.cddl
 - test-data/cdni-ct.cddl
+- test-data/coral.cddl
+- test-data/coral1.cddl
+- test-data/coral2.cddl
+- test-data/coral3.cddl
 - test-data/cose.cddl
 - test-data/dcaf.cddl
 - test-data/dcaf1.cddl
+- test-data/dotsize.cddl
 - test-data/extractor-demo.cddl
+- test-data/feat1.cddl
+- test-data/foo.cddl
 - test-data/grasp-01-extract.cddl
 - test-data/grasp-01-test.cddl
 - test-data/grasp-01.cddl
@@ -118,13 +130,27 @@ files:
 - test-data/ifmap-metadata-2.2v9_fh-cabo.cddl
 - test-data/ifmap2.cddl
 - test-data/jcr-ex.cddl
+- test-data/jim-cut-2.cddl
+- test-data/jim-cut.cddl
+- test-data/jsoniodef.cddl
 - test-data/kevin5.cddl
 - test-data/map-group.cddl
 - test-data/mapkey.cddl
+- test-data/mdl-ble.cddl
+- test-data/mdl-deve.cddl
+- test-data/mdl-dp.cddl
+- test-data/mdl-mso.cddl
+- test-data/mdl-request.cddl
+- test-data/mdl-response.cddl
+- test-data/mdl.cddl
 - test-data/minimal.cddl
+- test-data/mon-val.cddl
+- test-data/multipart-ct.cddl
+- test-data/named-group.cddl
 - test-data/patch1.cddl
 - test-data/reused_named_group.cddl
 - test-data/structure.cddl
+- test-data/test-gen.cddl
 - test-data/toerless0.cddl
 - test-data/toerless1.cddl
 - test-data/two_anonymous_groups.cddl
@@ -138,7 +164,7 @@ homepage: http://github.com/cabo/cddl
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -153,9 +179,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: CDDL generator and validator.
 test_files: []