cddlc 0.1.7 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d56a7033911531ad73966b0807a1c6b9d9c09b9b09638d43274337e067a02fa
-  data.tar.gz: 609ab555ddc49c64a1dde396b99e01b2c79fd9a4fb63b1efb19ccd0ba3a311c1
+  metadata.gz: f2ac8a4458103e760994cda656a70d934555d3b3a5f86416c53b6c3be353fd38
+  data.tar.gz: 7f8d5cd6a43fb98f3d201fb218d30b865f47cc0b8b0714db6ce68e2770b130bc
 SHA512:
-  metadata.gz: c704b7fbc908dd1449a6c267936bea906f689852d54b54291fc8a2bc4ca62c39b2e947223da42069343e5d1b28e997907ffeb451d528c5436a7a96f82de17498
-  data.tar.gz: 8e9f965b91b31eae2986a5e4c621dc0048bb64308017ec917d1a7b90853b9c6322674eaf4ef034905c8f0c555791e5664112cb905b03255fe72b857f57830f67
+  metadata.gz: 82ef745cc5ccae3bfb100227f9713bc923b535d9f7c6087c7b091a0570be012236f2756280319163574d145745370f8193467c0824e2a66b3e48cf67621c69c6
+  data.tar.gz: 369473fb2b9ed8b88c6f42f627af9fa41a5a0fe3c0600a0574bd7a2815284b4c68fc9d33cfcd8a1f8fad107c7aba0282063d8a2e34be6677fc2b1d9bc9f78885

data/bin/cddlc

@@ -15,7 +15,7 @@ def named_keys(tree)
   when "rep"
     named_keys(tree[3])
   when "mem"
-    key = tree[1]
+    key = tree[2]
     if Array === key && key[0] == "name"
       [key[1]]
     end

data/cddlc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "cddlc"
-  s.version = "0.1.7"
+  s.version = "0.2.2"
   s.summary = "CDDL (Concise Data Definition Language) converters and miscellaneous tools"
   s.description = %q{cddlc implements converters and miscellaneous tools for CDDL, RFC 8610}
   s.author = "Carsten Bormann"

data/data/rfc9393-concise-swid-tag.cddl

@@ -0,0 +1,279 @@
+concise-swid-tag = {
+  tag-id => text / bstr .size 16,
+  tag-version => integer,
+  ? corpus => bool,
+  ? patch => bool,
+  ? supplemental => bool,
+  software-name => text,
+  ? software-version => text,
+  ? version-scheme => $version-scheme,
+  ? media => text,
+  ? software-meta => one-or-more<software-meta-entry>,
+  entity => one-or-more<entity-entry>,
+  ? link => one-or-more<link-entry>,
+  ? payload-or-evidence,
+  * $$coswid-extension,
+  global-attributes,
+}
+
+payload-or-evidence //= ( payload => payload-entry )
+payload-or-evidence //= ( evidence => evidence-entry )
+
+any-uri = uri
+label = text / int
+
+$version-scheme /= multipartnumeric
+$version-scheme /= multipartnumeric-suffix
+$version-scheme /= alphanumeric
+$version-scheme /= decimal
+$version-scheme /= semver
+$version-scheme /= int / text
+
+any-attribute = (
+  label => one-or-more<text> / one-or-more<int>
+)
+
+one-or-more<T> = T / [ 2* T ]
+
+global-attributes = (
+  ? lang => text,
+  * any-attribute,
+)
+
+hash-entry = [
+  hash-alg-id: int,
+  hash-value: bytes,
+]
+
+entity-entry = {
+  entity-name => text,
+  ? reg-id => any-uri,
+  role => one-or-more<$role>,
+  ? thumbprint => hash-entry,
+  * $$entity-extension,
+  global-attributes,
+}
+
+$role /= tag-creator
+$role /= software-creator
+$role /= aggregator
+$role /= distributor
+$role /= licensor
+$role /= maintainer
+$role /= int / text
+
+link-entry = {
+  ? artifact => text,
+  href => any-uri,
+  ? media => text,
+  ? ownership => $ownership,
+  rel => $rel,
+  ? media-type => text,
+  ? use => $use,
+  * $$link-extension,
+  global-attributes,
+}
+
+$ownership /= shared
+$ownership /= private
+$ownership /= abandon
+$ownership /= int / text
+
+$rel /= ancestor
+$rel /= component
+$rel /= feature
+$rel /= installationmedia
+$rel /= packageinstaller
+$rel /= parent
+$rel /= patches
+$rel /= requires
+$rel /= see-also
+$rel /= supersedes
+$rel /= supplemental
+$rel /= -256..65536 / text
+
+$use /= optional
+$use /= required
+$use /= recommended
+$use /= int / text
+
+software-meta-entry = {
+  ? activation-status => text,
+  ? channel-type => text,
+  ? colloquial-version => text,
+  ? description => text,
+  ? edition => text,
+  ? entitlement-data-required => bool,
+  ? entitlement-key => text,
+  ? generator => text / bstr .size 16,
+  ? persistent-id => text,
+  ? product => text,
+  ? product-family => text,
+  ? revision => text,
+  ? summary => text,
+  ? unspsc-code => text,
+  ? unspsc-version => text,
+  * $$software-meta-extension,
+  global-attributes,
+}
+
+path-elements-group = ( ? directory => one-or-more<directory-entry>,
+                        ? file => one-or-more<file-entry>,
+                      )
+
+resource-collection = (
+  path-elements-group,
+  ? process => one-or-more<process-entry>,
+  ? resource => one-or-more<resource-entry>,
+  * $$resource-collection-extension,
+)
+
+file-entry = {
+  filesystem-item,
+  ? size => uint,
+  ? file-version => text,
+  ? hash => hash-entry,
+  * $$file-extension,
+  global-attributes,
+}
+
+directory-entry = {
+  filesystem-item,
+  ? path-elements => { path-elements-group },
+  * $$directory-extension,
+  global-attributes,
+}
+
+process-entry = {
+  process-name => text,
+  ? pid => integer,
+  * $$process-extension,
+  global-attributes,
+}
+
+resource-entry = {
+  type => text,
+  * $$resource-extension,
+  global-attributes,
+}
+
+filesystem-item = (
+  ? key => bool,
+  ? location => text,
+  fs-name => text,
+  ? root => text,
+)
+
+payload-entry = {
+  resource-collection,
+  * $$payload-extension,
+  global-attributes,
+}
+
+evidence-entry = {
+  resource-collection,
+  ? date => integer-time,
+  ? device-id => text,
+  ? location => text,
+  * $$evidence-extension,
+  global-attributes,
+}
+
+integer-time = #6.1(int)
+
+; "global map member" integer indices
+tag-id = 0
+software-name = 1
+entity = 2
+evidence = 3
+link = 4
+software-meta = 5
+payload = 6
+hash = 7
+corpus = 8
+patch = 9
+media = 10
+supplemental = 11
+tag-version = 12
+software-version = 13
+version-scheme = 14
+lang = 15
+directory = 16
+file = 17
+process = 18
+resource = 19
+size = 20
+file-version = 21
+key = 22
+location = 23
+fs-name = 24
+root = 25
+path-elements = 26
+process-name = 27
+pid = 28
+type = 29
+entity-name = 31
+reg-id = 32
+role = 33
+thumbprint = 34
+date = 35
+device-id = 36
+artifact = 37
+href = 38
+ownership = 39
+rel = 40
+media-type = 41
+use = 42
+activation-status = 43
+channel-type = 44
+colloquial-version = 45
+description = 46
+edition = 47
+entitlement-data-required = 48
+entitlement-key = 49
+generator = 50
+persistent-id = 51
+product = 52
+product-family = 53
+revision = 54
+summary = 55
+unspsc-code = 56
+unspsc-version = 57
+
+; "version-scheme" integer indices
+multipartnumeric = 1
+multipartnumeric-suffix = 2
+alphanumeric = 3
+decimal = 4
+semver = 16384
+
+; "role" integer indices
+tag-creator=1
+software-creator=2
+aggregator=3
+distributor=4
+licensor=5
+maintainer=6
+
+; "ownership" integer indices
+abandon=1
+private=2
+shared=3
+
+; "rel" integer indices
+ancestor=1
+component=2
+feature=3
+installationmedia=4
+packageinstaller=5
+parent=6
+patches=7
+requires=8
+see-also=9
+supersedes=10
+; supplemental=11 ; already defined
+
+; "use" integer indices
+optional=1
+required=2
+recommended=3

data/data/rfc9393-sign.cddl

@@ -0,0 +1,26 @@
+COSE_Sign-coswid<payload> = [
+    protected: bstr .cbor protected-signed-coswid-header1,
+    unprotected: unprotected-signed-coswid-header,
+    payload: bstr .cbor payload,
+    signature: [ * COSE_Signature ],
+]
+
+protected-signed-coswid-header1 = {
+    3 => "application/swid+cbor",
+    * cose-label => cose-values,
+}
+
+protected-signature-coswid-header = {
+    1 => int,                      ; algorithm identifier
+    * cose-label => cose-values,
+}
+
+unprotected-signed-coswid-header = {
+    * cose-label => cose-values,
+}
+
+COSE_Signature =  [
+    protected: bstr .cbor protected-signature-coswid-header,
+    unprotected: unprotected-signed-coswid-header,
+    signature: bstr
+]

data/data/rfc9393-sign1.cddl

@@ -0,0 +1,19 @@
+COSE_Sign1-coswid<payload> = [
+    protected: bstr .cbor protected-signed-coswid-header,
+    unprotected: unprotected-signed-coswid-header,
+    payload: bstr .cbor payload,
+    signature: bstr,
+]
+
+cose-label = int / tstr
+cose-values = any
+
+protected-signed-coswid-header = {
+    1 => int,                      ; algorithm identifier
+    3 => "application/swid+cbor",
+    * cose-label => cose-values,
+}
+
+unprotected-signed-coswid-header = {
+    * cose-label => cose-values,
+}

data/data/rfc9393-tags.cddl

@@ -0,0 +1,9 @@
+coswid = unsigned-coswid / signed-coswid
+unsigned-coswid = concise-swid-tag / tagged-coswid<concise-swid-tag>
+signed-coswid1 = signed-coswid-for<unsigned-coswid>
+signed-coswid = signed-coswid1 / tagged-coswid<signed-coswid1>
+
+tagged-coswid<T> = #6.1398229316(T)
+
+signed-coswid-for<payload> = #6.18(COSE_Sign1-coswid<payload>)
+    / #6.98(COSE_Sign-coswid<payload>)

data/data/rfc9393.cddl

@@ -0,0 +1 @@
+rfc9393-concise-swid-tag.cddl

data/lib/cddlc.rb

@@ -55,6 +55,7 @@ class CDDL
   SAFE_FN = /\A[-._a-zA-Z0-9]+\z/
   IMPINC = /\A(?:import|include)\z/
   IDENTIFIER_RE = /\A[A-Za-z@_$]([-.]*[A-Za-z@_$0-9])*\z/
+  INT_RE = /\A0|[-]?[1-9][0-9]*\z/
 
   def self.from_cddl(s)
     ast = @@parser.parse s

data/lib/parser/cddlgrammar.rb

@@ -1812,7 +1812,9 @@ module CDDLGRAMMAR
   end
 
   module Grpent2
-    def ast() repwrap(elements[0], ["mem", elements[1].elements ? elements[1].memberkey.ast : nil, elements[2].ast]) end
+    def ast()
+     repwrap(elements[0], ["mem", *elements[1].elements ? elements[1].memberkey.ast : [false, nil],
+                                  elements[2].ast]) end
   end
 
   module Grpent3
@@ -2012,7 +2014,7 @@ module CDDLGRAMMAR
   end
 
   module Memberkey2
-    def ast() type1.ast end
+    def ast() [!!elements[2].elements, type1.ast] end
   end
 
   module Memberkey3
@@ -2027,7 +2029,7 @@ module CDDLGRAMMAR
   end
 
   module Memberkey4
-    def ast() ["text", bareword.text_value] end
+    def ast() [true, ["text", bareword.text_value]] end
   end
 
   module Memberkey5
@@ -2042,7 +2044,7 @@ module CDDLGRAMMAR
   end
 
   module Memberkey6
-    def ast() value.ast end
+    def ast() [true, value.ast] end
   end
 
   def _nt_memberkey
@@ -3148,15 +3150,9 @@ module CDDLGRAMMAR
           r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r0 = r3
         else
-          if has_terminal?(@regexps[gr = '\A[€-􏿽]'] ||= Regexp.new(gr), :regexp, index)
-            r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
-            r4.extend(SCHAR3)
-            r4.extend(SCHAR3)
-            @index += 1
-          else
-            terminal_parse_failure('[€-􏿽]')
-            r4 = nil
-          end
+          r4 = _nt_NONASCII
+          r4.extend(SCHAR3)
+          r4.extend(SCHAR3)
           if r4
             r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
             r0 = r4
@@ -3951,40 +3947,46 @@ module CDDLGRAMMAR
         r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
       else
-        if has_terminal?(@regexps[gr = '\A[\\]-􏿽]'] ||= Regexp.new(gr), :regexp, index)
+        if has_terminal?(@regexps[gr = '\A[\\]-~]'] ||= Regexp.new(gr), :regexp, index)
           r3 = true
           @index += 1
         else
-          terminal_parse_failure('[\\]-􏿽]')
+          terminal_parse_failure('[\\]-~]')
           r3 = nil
         end
         if r3
           r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r0 = r3
         else
-          r4 = _nt_SESC
+          r4 = _nt_NONASCII
           if r4
             r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
             r0 = r4
           else
-            if (match_len = has_terminal?("\\'", false, index))
-              r5 = instantiate_node(SyntaxNode,input, index...(index + match_len))
-              @index += match_len
-            else
-              terminal_parse_failure('"\\\\\'"')
-              r5 = nil
-            end
+            r5 = _nt_SESC
             if r5
               r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
               r0 = r5
             else
-              r6 = _nt_CRLF
+              if (match_len = has_terminal?("\\'", false, index))
+                r6 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                @index += match_len
+              else
+                terminal_parse_failure('"\\\\\'"')
+                r6 = nil
+              end
               if r6
                 r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
                 r0 = r6
               else
-                @index = i0
-                r0 = nil
+                r7 = _nt_CRLF
+                if r7
+                  r7 = SyntaxNode.new(input, (index-1)...index) if r7 == true
+                  r0 = r7
+                else
+                  @index = i0
+                  r0 = nil
+                end
               end
             end
           end
@@ -4623,11 +4625,49 @@ module CDDLGRAMMAR
       r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
     else
-      if has_terminal?(@regexps[gr = '\A[€-􏿽]'] ||= Regexp.new(gr), :regexp, index)
+      r2 = _nt_NONASCII
+      if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
+        r0 = r2
+      else
+        @index = i0
+        r0 = nil
+      end
+    end
+
+    node_cache[:PCHAR][start_index] = r0
+
+    r0
+  end
+
+  def _nt_NONASCII
+    start_index = index
+    if node_cache[:NONASCII].has_key?(index)
+      cached = node_cache[:NONASCII][index]
+      if cached
+        node_cache[:NONASCII][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0 = index
+    if has_terminal?(@regexps[gr = '\A[ -퟿]'] ||= Regexp.new(gr), :regexp, index)
+      r1 = true
+      @index += 1
+    else
+      terminal_parse_failure('[ -퟿]')
+      r1 = nil
+    end
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+    else
+      if has_terminal?(@regexps[gr = '\A[-􏿽]'] ||= Regexp.new(gr), :regexp, index)
         r2 = true
         @index += 1
       else
-        terminal_parse_failure('[€-􏿽]')
+        terminal_parse_failure('[-􏿽]')
         r2 = nil
       end
       if r2
@@ -4639,7 +4679,7 @@ module CDDLGRAMMAR
       end
     end
 
-    node_cache[:PCHAR][start_index] = r0
+    node_cache[:NONASCII][start_index] = r0
 
     r0
   end

data/lib/processor/cddl-flattening.rb

@@ -2,15 +2,14 @@ require_relative "../cddlc.rb"
 require_relative "./cddl-visitor.rb"
 
 class CDDL
-  ID_RE = /\A[A-Za-z@_$]([-.]*[A-Za-z@_$0-9])*\z/
   MOGRIFIED_ID_RE = /\A\$\.[A-Za-z@_$]([-.]*[A-Za-z@_$0-9])*\z/
   def flattening_key_name(key, value, env = nil)
     case key
-    in ["enum", ["mem", ["text", ID_RE => text], _]]
+    in ["enum", ["mem", _cut, ["text", IDENTIFIER_RE => text], _]]
       [false, text]
-    in ["text", ID_RE => text]
+    in ["text", IDENTIFIER_RE => text]
       [false, text]
-    in ["number", /\A0|[-]?[1-9][0-9]*\z/ => intval] if env
+    in ["number", INT_RE => intval] if env
       [true, "$.#{env}$#{intval}"]
     else
       [false]
@@ -21,7 +20,7 @@ class CDDL
     rules.each do |name, prod|
       visit(prod) do |here|
         case here
-        in ["mem", key, value]
+        in ["mem", _cut, key, value]
           _labeled, keyname = flattening_key_name(key, value, false)
           if keyname
             symtab[keyname] << [name, value]
@@ -45,7 +44,7 @@ class CDDL
   def flattening_mogrify(name, prod, symtab, alias_rules)
     step1 = visit(prod) do |here|
         case here
-        in ["mem", key, value]
+        in ["mem", cut, key, value]
           ### mogrify
           labeled, keyname = flattening_key_name(key, value, name)
           if keyname
@@ -67,7 +66,7 @@ class CDDL
             else
               alias_rules[new_name] = new_value2
             end
-            [true, ["mem", key, ["name", new_name]]]
+            [true, ["mem", cut, key, ["name", new_name]]]
           end
         else
           false
@@ -75,7 +74,7 @@ class CDDL
       end
     step2 = visit(step1) do |here|
       case here
-      in ["enum", ["mem", ["text", ID_RE], ["name", MOGRIFIED_ID_RE => new_name]]]
+      in ["enum", ["mem", _cut, ["text", IDENTIFIER_RE], ["name", MOGRIFIED_ID_RE => new_name]]]
         [true, ["name", new_name]]
       else
         false

data/lib/processor/cddl-visitor.rb

@@ -33,8 +33,8 @@ class CDDL
       ["unwrap", visit(prod, &block)] # XXX, this may need to be bottled in a rule
     in ["prim", prod, *prods]
       ["prim", visit(prod, &block), *visit_all(prods, &block)]
-    in ["mem", *prods]
-      ["mem", *visit_all(prods, &block)]
+    in ["mem", cut, *prods]
+      ["mem", cut, *visit_all(prods, &block)]
     in ["rep", s, e, prod]
       ["rep", s, e, visit(prod, &block)]
     else

data/lib/writer/cddl-writer.rb

@@ -42,7 +42,7 @@ class CDDL
     in ["gen", id, *parms]  # oops -- namep vs. namea; ouch
       [4, "#{id}<#{parms.map{write_rhs(_1, 2, indent, pn)}.join(", ")}>"]
     in ["tcho", *types]
-      [2, types.map{write_rhs(_1, 3, indent, pn)}.join(" / ")]
+      [2.1, types.map{write_rhs(_1, 3, indent, pn)}.join(" / ")]
     in ["gcho", *groups]
       [0, groups.map{write_rhs(_1, 2, indent, pn)}.join(" // ")]
     in ["op", op, l, r]
@@ -90,10 +90,14 @@ class CDDL
                 "#{s}*#{e || ""}"
               end
       [1, "#{occur}#{write_rhs(group, 2, indent, pn)}"]
-    in ["mem", nil, t2]
+    in ["mem", false, nil, t2]
       [2, write_rhs(t2, 2, indent, pn)]
-    in ["mem", t1, t2]
-      [2, "#{write_rhs(t1, 3, indent, pn)} => #{write_rhs(t2, 2, indent, pn)}"]
+    in ["mem", true, ["text", IDENTIFIER_RE => bareword], t2]
+      [2, "#{bareword}: #{write_rhs(t2, 2, indent, pn)}"]
+    in ["mem", true, ["number", INT_RE => bareword], t2]
+      [2, "#{bareword}: #{write_rhs(t2, 2, indent, pn)}"]
+    in ["mem", cut, t1, t2]
+      [2, "#{write_rhs(t1, 3, indent, pn)} #{cut ? "^" : ""}=> #{write_rhs(t2, 2, indent, pn)}"]
       # 2->3: work around cddl tool limitation
     in ["bytes", t]
       [4, t]                    # XXX not very clean
@@ -112,7 +116,7 @@ class CDDL
       in ["parm", parmnames, _type]
       else
       end
-      "#{write_lhs(k, parmnames)} = #{write_rhs(v, 2)}" # 2: parenthesize groups
+      "#{write_lhs(k, parmnames)} = #{write_rhs(v, 2.1)}" # 2: parenthesize groups
     }.join("\n")
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddlc
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.2
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-11 00:00:00.000000000 Z
+date: 2024-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,6 +97,11 @@ files:
 - data/rfc9290.cddl
 - data/rfc9321.cddl
 - data/rfc9338.cddl
+- data/rfc9393-concise-swid-tag.cddl
+- data/rfc9393-sign.cddl
+- data/rfc9393-sign1.cddl
+- data/rfc9393-tags.cddl
+- data/rfc9393.cddl
 - lib/cddlc.rb
 - lib/parser/cddl-util.rb
 - lib/parser/cddlgrammar.rb
@@ -124,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: CDDL (Concise Data Definition Language) converters and miscellaneous tools