cddl 0.8.22 → 0.8.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72490cb2a368cfaec3e71cae79f323665fc64f0049feeb30050a6e8275566cda
-  data.tar.gz: 6ad8a0c69b34745dcd41f7c5627c57e9a4292539115f4d63c502d4c0a3cd0218
+  metadata.gz: 47f3304378cd8f42807f0b96551a9b8cd5c609741d9a1e508c7c68913bf591d0
+  data.tar.gz: 312535858550c20a3415238c8f26b5c96f2036707e305bd6665b12bb73e4addc
 SHA512:
-  metadata.gz: 1fcbc5a8d49391656566b9f4b7d03392a579b5e999d301b2dab877aa25ff6d31c4575a94a771bdf8df0d0c3b88dd086bafe952359bb297690325204fbf732c11
-  data.tar.gz: 15ce2e416c02c834d3853520ca2fc8baa8b26359623dff75f6615a755a6ef4007abc2fb0170248ae5b57783e52fd779bc5c88be9cea70e7534ac9104cbfc67a8
+  metadata.gz: 36ef0f6662d44814da072251405894b4b70ef20a6a493e8de7b597ece370e774cbf8fe8d2da35c2baa5f8b08adffc1a98dffaf1535907aca11a1a3936b11286a
+  data.tar.gz: a6a731d5d348156deb0b2e3415bf6c944198bcfc7ca33632ee7f4d40e07ce832bbcadcc1b4bab4d8f75653932b9f82cba2c4ccbef662af49c81554edb2e77480

data/bin/cddl

@@ -19,17 +19,19 @@ def usage
   exit EX_USAGE
 end
 
-def read_arg(arg)
+def read_arg(arg, remember_fn = true)
   if arg == "-"
+    $fn = "(stdin)" if remember_fn
     STDIN.read
   else
     usage unless arg
+    $fn = arg if remember_fn
     File.read(arg, mode: "rb")
   end
 end
 
 def parser
-  @parser ||= CDDL::Parser.new(read_arg(ARGV[0]))
+  @parser ||= CDDL::Parser.new(read_arg(ARGV[0], false))
 end
 
 def my_pp(v)

data/cddl.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'cddl'
-  s.version = '0.8.22'
+  s.version = '0.8.26'
   s.summary = "CDDL generator and validator."
   s.description = %{A parser, generator, and validator for CDDL}
   s.add_dependency('cbor-diag')

data/lib/cddl.rb

@@ -463,7 +463,10 @@ module CDDL
         when :cat, :det
           lhs = generate1(target, inmap)
           rhs = generate1(control)
-          rhs = remove_indentation(rhs) if conop == :det
+          if conop == :det
+            lhs = remove_indentation(lhs)
+            rhs = remove_indentation(rhs)
+          end
           begin
             lhs + rhs
           rescue Exception => e
@@ -611,7 +614,10 @@ module CDDL
             elsif vt1 == Float
               [true, v1 + v2, vt1] if vt2 == Integer || vt2 == Float
             else
-              v2 = remove_indentation(v2) if conop == :det
+              if conop == :det
+                v1 = remove_indentation(v1)
+                v2 = remove_indentation(v2)
+              end
               [true, v1 + v2, vt1] if vt1 == vt2
             end
           end rescue nil
@@ -643,7 +649,7 @@ module CDDL
             ok = ENV["CDDL_FEATURE_OK"] and ok = ok.split(/,\s*/) or ok = []
             # warn([:OK, ok, $features].inspect)
             features = $features.reject {|k, v| ok.include? k.to_s }
-            warn "** Features potentially used: #{features.map {|k, v| "#{k}: #{v.keys}"}.join(", ")}" if features != {}
+            warn "** Features potentially used (#$fn): #{features.map {|k, v| "#{k}: #{v.keys}"}.join(", ")}" if features != {}
           end
         else
           warn "CDDL validation failure (#{result.inspect} for #{d.inspect}):"
@@ -780,13 +786,17 @@ module CDDL
                           puts "COMPLEX: #{k.inspect} #{simple.inspect} #{simpleval.inspect}"         if ENV["CDDL_TRACE"]
             keys = d_check.keys
             ta, keys = keys.partition{ |key| validate1(key, k)}
-            # XXX check ta.size against s/e
-            ta.all? { |val|
-              if (ann2 = validate1a(d[val], v)) && 
-                 d_check.delete(val) {:not_found} != :not_found
-                anno.concat(ann2)
-              end
-            }
+            count = 0
+            catch :enough do
+              ta.all? { |val|
+                if (ann2 = validate1a(d[val], v)) && # XXX check cut or not!
+                   d_check.delete(val) {:not_found} != :not_found
+                  anno.concat(ann2)
+                  throw :enough, true if (count += 1) == e
+                  true
+                end
+              }
+            end and validate_result(count >= s) { "not enough #{ta.inspect} for #{r.inspect}" }
           end
           end
         else
@@ -850,13 +860,16 @@ module CDDL
         [] if where[2] === d && where[1].include?(d)
       when :anno
         _, conop, target, control = where
-        if conop == :cat || conop == :plus
+        if conop == :cat || conop == :plus || conop == :det
           ok1, v1, vt1 = extract_value(target)
           ok2, v2, vt2 = extract_value(control)
           # warn ["ANNO0", ok1, v1, vt1, ok2, v2, vt2, d].inspect
           if ok1 && ok2
             v2 = Integer(v2) if vt1 == Integer
-            v2 = remove_indentation(v2) if conop == :det
+            if conop == :det
+              v1 = remove_indentation(v1)
+              v2 = remove_indentation(v2)
+            end
             # warn ["ANNO", ok1, v1, vt1, ok2, v2, vt2, d].inspect
             [] if d == v1 + v2  # XXX Focus ArgumentError
           end
@@ -905,11 +918,13 @@ module CDDL
             if ok
               nm = v
               det = d
+              warn "*** feature controller should be a string: #{control.inspect}" unless String == vt
             else
               ok, *v = extract_array(control)
               if ok && v.size == 2
                 nm = v[0][0]
                 det = v[1][0]
+                warn "*** first element of feature controller should be a string: #{control.inspect}" unless String === nm
               else
                 warn "*** feature controller not implemented: #{control.inspect}"
               end

data/test-data/complex-occ.cddl

@@ -0,0 +1,11 @@
+foo = {
+  2*4 any => any
+}
+
+;;sed -n 's/^; //p' complex-occ.cddl | sh
+; echo '{}' | cddl complex-occ.cddl v -
+; echo '{"1": 2}' | cddl complex-occ.cddl v -
+; echo '{"1": 2, "2": 3}' | cddl complex-occ.cddl v -
+; echo '{"1": 2, "2": 3, "3": 4}' | cddl complex-occ.cddl v -
+; echo '{"1": 2, "2": 3, "3": 4, "4": 5}' | cddl complex-occ.cddl v -
+; echo '{"1": 2, "2": 3, "3": 4, "4": 5, "5": 6}' | cddl complex-occ.cddl v -

data/test-data/det1.cddl

@@ -0,0 +1,12 @@
+bar = ["" .cat foo, "" .cat cbor-tags-oid]
+
+foo = '' .det cbor-tags-oid
+
+ cbor-tags-oid = '
+   oid = 1*arc
+   roid = *arc
+   arc = [nlsb] %x00-7f
+   nlsb = %x81-ff *%x80-ff
+ ' .det ''
+
+cbor-tags-oid-decrypted = cbor-tags-oid .det (([]) .det ([]))

data/test-data/feature-controller.cddl

@@ -0,0 +1,6 @@
+a = b .feature 3
+b = c .feature 3.3
+c = d .feature (["drei", "ok"])
+d = e .feature ([[], "ok"])
+e = f .feature ([1, "ok"])
+f = int .feature (1)

data/test-data/homenet-de.cddl

@@ -0,0 +1,12 @@
+   hna-configuration = {
+     "registred_domain" : tstr,
+     "dm"               : tstr,
+     ? "dm_transport" : "53" // "DoT" // "DoH" // "DoQ"
+     ? "dm_port"        : uint,
+     ? "dm_acl"         : hna-acl // [ +hna-acl ]
+     ? "hna_auth_method": hna-auth-method
+     ? "hna_certificate": tstr
+   }
+
+   hna-acl          = tstr
+   hna-auth-method  /= "certificate"

data/test-data/homenet-fe.cddl

@@ -0,0 +1,12 @@
+hna-configuration = {
+  "registered_domain" : tstr,
+  "dm"                : tstr,
+  ? "dm_transport" : "53" / "DoT" / "DoH" / "DoQ"
+  ? "dm_port"        : uint,
+  ? "dm_acl"         : hna-acl / [ +hna-acl ]
+  ? "hna_auth_method": hna-auth-method
+  ? "hna_certificate": tstr
+}
+
+hna-acl          = tstr
+hna-auth-method  /= "certificate"

data/test-data/lint1.cddl

@@ -0,0 +1,9 @@
+$instance-value-choice = (
+  comid.mac-addr => mac-addr-type //
+  comid.ip-addr => ip-addr-type //
+  comid.serial-number => serial-number-type //
+  comid.ueid => ueid //
+  comid.uuid => uuid
+)
+
+; this populates a type socket with a group choice

data/test-data/non-empty.cddl

@@ -0,0 +1,5 @@
+distinguishedName = non-empty<{
+   ? country: text
+ }>
+
+ non-empty<M> = (M) .and ({ + any => any })

data/test-data/plus.cddl

@@ -0,0 +1,3 @@
+a = {
++ any => any
+}

data/test-data/sipos.cddl

@@ -0,0 +1,8 @@
+; start = {*$$socket}
+; $$socket //= (4: bstr)
+; $ cddl works.cddl generate 
+; {4: h'6F7267616E69736D'}
+; $ cat fails.cddl
+start = {*$$socket}
+$$socket //= (some,)
+some = (4: bstr)

data/test-data/star-edited.cddl

@@ -0,0 +1,98 @@
+csr-template-schema = {
+  keyTypes: [ 1* $keyType ]
+  ? subject: distinguishedName
+  extensions: extensions
+}
+
+mandatory-wildcard = "**"
+optional-wildcard = "*"
+wildcard = mandatory-wildcard / optional-wildcard
+
+; non-empty = { + any => any }
+non-empty<M> = (M) .and ({ + any => any })
+
+; regtext matches all text strings but "*" and "**"
+regtext = text .regexp "([^\*].*)|([\*][^\*].*)|([\*][\*].+)"
+
+regtext-or-wildcard = regtext / wildcard
+
+distinguishedName = non-empty<{
+  ? country: regtext-or-wildcard
+  ? stateOrProvince: regtext-or-wildcard
+  ? locality: regtext-or-wildcard
+  ? organization: regtext-or-wildcard
+  ? organizationalUnit: regtext-or-wildcard
+  ? emailAddress: regtext-or-wildcard
+  ? commonName: regtext-or-wildcard
+}>
+
+$keyType /= rsaKeyType
+$keyType /= ecdsaKeyType
+
+rsaKeyType = {
+  PublicKeyType: "rsaEncryption" ; OID: 1.2.840.113549.1.1.1
+  PublicKeyLength: rsaKeySize
+  SignatureType: $rsaSignatureType
+}
+
+rsaKeySize = int .ge 2048
+
+; RSASSA-PKCS1-v1_5 with SHA-256
+$rsaSignatureType /= "sha256WithRSAEncryption"
+; RSASSA-PCKS1-v1_5 with SHA-384
+$rsaSignatureType /= "sha384WithRSAEncryption"
+; RSASSA-PCKS1-v1_5 with SHA-512
+$rsaSignatureType /= "sha512WithRSAEncryption"
+; RSASSA-PSS with SHA-256, MGF-1 with SHA-256, and a 32 byte salt
+$rsaSignatureType /= "sha256WithRSAandMGF1"
+; RSASSA-PSS with SHA-384, MGF-1 with SHA-384, and a 48 byte salt
+$rsaSignatureType /= "sha384WithRSAandMGF1"
+; RSASSA-PSS with SHA-512, MGF-1 with SHA-512, and a 64 byte salt
+$rsaSignatureType /= "sha512WithRSAandMGF1"
+
+ecdsaKeyType = {
+  PublicKeyType: "id-ecPublicKey" ; OID: 1.2.840.10045.2.1
+  namedCurve: $ecdsaCurve
+  SignatureType: $ecdsaSignatureType
+}
+
+$ecdsaCurve /= "secp256r1" ; OID: 1.2.840.10045.3.1.7
+$ecdsaCurve /= "secp384r1" ; OID: 1.3.132.0.34
+$ecdsaCurve /= "secp521r1" ; OID: 1.3.132.0.3
+
+$ecdsaSignatureType /= "ecdsa-with-SHA256" ; paired with secp256r1
+$ecdsaSignatureType /= "ecdsa-with-SHA384" ; paired with secp384r1
+$ecdsaSignatureType /= "ecdsa-with-SHA512" ; paired with secp521r1
+
+subjectaltname = {
+  ? DNS: [ 1* regtext-or-wildcard ]
+  ? Email: [ 1* regtext ]
+  ? URI: [ 1* regtext ]
+  * $$subjectaltname-extension
+}
+
+extensions = {
+  ? keyUsage: [ 1* keyUsageType ]
+  ? extendedKeyUsage: [ 1* extendedKeyUsageType ]
+  subjectAltName: subjectaltname
+}
+
+keyUsageType /= "digitalSignature"
+keyUsageType /= "nonRepudiation"
+keyUsageType /= "keyEncipherment"
+keyUsageType /= "dataEncipherment"
+keyUsageType /= "keyAgreement"
+keyUsageType /= "keyCertSign"
+keyUsageType /= "cRLSign"
+keyUsageType /= "encipherOnly"
+keyUsageType /= "decipherOnly"
+
+extendedKeyUsageType /= "serverAuth"
+extendedKeyUsageType /= "clientAuth"
+extendedKeyUsageType /= "codeSigning"
+extendedKeyUsageType /= "emailProtection"
+extendedKeyUsageType /= "timeStamping"
+extendedKeyUsageType /= "OCSPSigning"
+extendedKeyUsageType /= oid
+
+oid = text .regexp "[0-9]+(\\.[0-9]+)*"

data/test-data/star.cddl

@@ -0,0 +1,95 @@
+csr-template-schema = {
+  keyTypes: [ 1* $keyType ]
+  ? subject: distinguishedName
+  extensions: extensions
+}
+
+mandatory-wildcard = "**"
+optional-wildcard = "*"
+wildcard = mandatory-wildcard / optional-wildcard
+
+; regtext matches all text strings but "*" and "**"
+regtext = text .regexp "([^\*].*)|([\*][^\*].*)|([\*][\*].+)"
+
+regtext-or-wildcard = regtext / wildcard
+
+distinguishedName = {
+  ? country: regtext-or-wildcard
+  ? stateOrProvince: regtext-or-wildcard
+  ? locality: regtext-or-wildcard
+  ? organization: regtext-or-wildcard
+  ? organizationalUnit: regtext-or-wildcard
+  ? emailAddress: regtext-or-wildcard
+  ? commonName: regtext-or-wildcard
+}
+
+$keyType /= rsaKeyType
+$keyType /= ecdsaKeyType
+
+rsaKeyType = {
+  PublicKeyType: "rsaEncryption" ; OID: 1.2.840.113549.1.1.1
+  PublicKeyLength: rsaKeySize
+  SignatureType: $rsaSignatureType
+}
+
+rsaKeySize = int .ge 2048
+
+; RSASSA-PKCS1-v1_5 with SHA-256
+$rsaSignatureType /= "sha256WithRSAEncryption"
+; RSASSA-PCKS1-v1_5 with SHA-384
+$rsaSignatureType /= "sha384WithRSAEncryption"
+; RSASSA-PCKS1-v1_5 with SHA-512
+$rsaSignatureType /= "sha512WithRSAEncryption"
+; RSASSA-PSS with SHA-256, MGF-1 with SHA-256, and a 32 byte salt
+$rsaSignatureType /= "sha256WithRSAandMGF1"
+; RSASSA-PSS with SHA-384, MGF-1 with SHA-384, and a 48 byte salt
+$rsaSignatureType /= "sha384WithRSAandMGF1"
+; RSASSA-PSS with SHA-512, MGF-1 with SHA-512, and a 64 byte salt
+$rsaSignatureType /= "sha512WithRSAandMGF1"
+
+ecdsaKeyType = {
+  PublicKeyType: "id-ecPublicKey" ; OID: 1.2.840.10045.2.1
+  namedCurve: $ecdsaCurve
+  SignatureType: $ecdsaSignatureType
+}
+
+$ecdsaCurve /= "secp256r1" ; OID: 1.2.840.10045.3.1.7
+$ecdsaCurve /= "secp384r1" ; OID: 1.3.132.0.34
+$ecdsaCurve /= "secp521r1" ; OID: 1.3.132.0.3
+
+$ecdsaSignatureType /= "ecdsa-with-SHA256" ; paired with secp256r1
+$ecdsaSignatureType /= "ecdsa-with-SHA384" ; paired with secp384r1
+$ecdsaSignatureType /= "ecdsa-with-SHA512" ; paired with secp521r1
+
+subjectaltname = {
+  ? DNS: [ 1* regtext-or-wildcard ]
+  ? Email: [ 1* regtext ]
+  ? URI: [ 1* regtext ]
+  * $$subjectaltname-extension
+}
+
+extensions = {
+  ? keyUsage: [ 1* keyUsageType ]
+  ? extendedKeyUsage: [ 1* extendedKeyUsageType ]
+  subjectAltName: subjectaltname
+}
+
+keyUsageType /= "digitalSignature"
+keyUsageType /= "nonRepudiation"
+keyUsageType /= "keyEncipherment"
+keyUsageType /= "dataEncipherment"
+keyUsageType /= "keyAgreement"
+keyUsageType /= "keyCertSign"
+keyUsageType /= "cRLSign"
+keyUsageType /= "encipherOnly"
+keyUsageType /= "decipherOnly"
+
+extendedKeyUsageType /= "serverAuth"
+extendedKeyUsageType /= "clientAuth"
+extendedKeyUsageType /= "codeSigning"
+extendedKeyUsageType /= "emailProtection"
+extendedKeyUsageType /= "timeStamping"
+extendedKeyUsageType /= "OCSPSigning"
+extendedKeyUsageType /= oid
+
+oid = text .regexp "[0-9]+(\\.[0-9]+)*"

data/test-data/time.cddl

@@ -0,0 +1,11 @@
+etime = #6.1001({
+  1: int,
+  ? (
+    -3: uint .lt 1000 //
+    -6: uint .lt 1000000 //
+    -9: uint .lt 1000000000 //
+    -12: uint .lt 1000000000000 //
+    -15: uint .lt 1000000000000000 //
+    -18: uint .lt 1000000000000000000
+  )
+})

data/test-data/yangid.cddl

@@ -0,0 +1 @@
+a = text .regexp "[a-z][a-z0-9]*(-[a-z0-9]+)*"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.8.22
+  version: 0.8.26
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-21 00:00:00.000000000 Z
+date: 2021-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -127,6 +127,7 @@ files:
 - test-data/bpv7b.cddl
 - test-data/cat-re.cddl
 - test-data/cdni-ct.cddl
+- test-data/complex-occ.cddl
 - test-data/coral.cddl
 - test-data/coral1.cddl
 - test-data/coral2.cddl
@@ -134,9 +135,11 @@ files:
 - test-data/cose.cddl
 - test-data/dcaf.cddl
 - test-data/dcaf1.cddl
+- test-data/det1.cddl
 - test-data/dotsize.cddl
 - test-data/extractor-demo.cddl
 - test-data/feat1.cddl
+- test-data/feature-controller.cddl
 - test-data/feature-detail.cddl
 - test-data/foo.cddl
 - test-data/grasp-01-extract.cddl
@@ -145,6 +148,8 @@ files:
 - test-data/grasp-09.cddl
 - test-data/grasp-v1.cddl
 - test-data/grasp-v2X.cddl
+- test-data/homenet-de.cddl
+- test-data/homenet-fe.cddl
 - test-data/ifmap-base-2.0v17.cddl
 - test-data/ifmap-base-2.2v9_fh-cabo.cddl
 - test-data/ifmap-metadata-2.2v9_fh-cabo.cddl
@@ -154,6 +159,7 @@ files:
 - test-data/jim-cut.cddl
 - test-data/jsoniodef.cddl
 - test-data/kevin5.cddl
+- test-data/lint1.cddl
 - test-data/map-group.cddl
 - test-data/mapkey.cddl
 - test-data/mdl-ble.cddl
@@ -167,14 +173,20 @@ files:
 - test-data/mon-val.cddl
 - test-data/multipart-ct.cddl
 - test-data/named-group.cddl
+- test-data/non-empty.cddl
 - test-data/oid.cddl
 - test-data/oidbat.cddl
 - test-data/patch1.cddl
+- test-data/plus.cddl
 - test-data/reused_named_group.cddl
 - test-data/sasl.cddl
 - test-data/sequence.cddl
+- test-data/sipos.cddl
+- test-data/star-edited.cddl
+- test-data/star.cddl
 - test-data/structure.cddl
 - test-data/test-gen.cddl
+- test-data/time.cddl
 - test-data/toerless0.cddl
 - test-data/toerless1.cddl
 - test-data/two_anonymous_groups.cddl
@@ -183,6 +195,7 @@ files:
 - test-data/wrong2.cddl
 - test-data/wrong2a.cddl
 - test-data/xmlmig.cddl
+- test-data/yangid.cddl
 - test-data/yaron1.cddl
 - test/test-cddl.rb
 homepage: http://github.com/cabo/cddl
@@ -204,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: CDDL generator and validator.