cddlc 0.4.2 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2a8aaeed392227b1d7650ddc62d010a577360f06c3bd07f879dd22d6a2e3ce9
-  data.tar.gz: e0db7efbdb77e5cc3f770e6a586ce710414e82419127f7b08302248943f1e045
+  metadata.gz: 170d7338cde350c8b6ee58e02b2c7b0ada1c72a1500b4ea9ce81414f9915f8a9
+  data.tar.gz: 6ac50c47755da10bea332c53b4986393541284197e266d1450d8035d11bf9333
 SHA512:
-  metadata.gz: 2b95180d14a2cab74e89e76a753a8519f3aa2b17abc7809ed5b9fd1bbbaf20e2dee87a6635c279b35d89cb754b2e9ac4b9051c4eb15a628ac6accb2ad5f3ccb1
-  data.tar.gz: 1ad97e5fc8ac2b5242dacedb9a8521b4ea376c79f54669370d7a1d1156d10ce6ca2b3d9ce2075844d5991dee8d1fa36e17fd9d5a175317f14516e92314396e89
+  metadata.gz: 53a637266de716c2e8e3a20b225f1ec1a141e0a91ee84a0666bcf8698eb85f7044e842e3735288071da6a66aa72bd9fd34be2ad1db35bfe7fbbcfac834be9c2c
+  data.tar.gz: c4f41f0fb34bc103e5d667a82b27757ea044e974689044e0d56df842452748e359903d56d7a4d8bad9918bd3a7bdf04a09e413ddc3281b3d8247c6b40634d7e8

data/bin/cddlc

@@ -42,6 +42,8 @@ require 'optparse'
 require 'ostruct'
 
 $options = OpenStruct.new
+$options.auto_choices = {}
+
 begin
   op = OptionParser.new do |opts|
     opts.banner = "Usage: cddlc [options] [-e cddl | file.cddl... | -]"
@@ -100,6 +102,12 @@ begin
       $options.include ||= []
       $options.include << v
     end
+    opts.on("-TRULE", "--type-choice=RULE", String, "Treat multiple assignments to RULE as type choice") do |v|
+      $options.auto_choices[v] = ["tcho", "tadd"]
+    end
+    opts.on("-GRULE", "--group-choice=RULE", String, "Treat multiple assignments to RULE as group choice") do |v|
+      $options.auto_choices[v] = ["gcho", "gadd"]
+    end
   end
   op.parse!
 rescue StandardError => e

data/cddlc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "cddlc"
-  s.version = "0.4.2"
+  s.version = "0.4.4"
   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/rfc9781.cddl

@@ -0,0 +1,47 @@
+UCCS-Untagged = Claims-Set
+UCCS-Tagged = #6.601(UCCS-Untagged)
+
+Claims-Set = {
+ * $$Claims-Set-Claims
+ * Claim-Label .feature "extended-claims-label" => any
+}
+Claim-Label = CBOR-ONLY<int> / text
+string-or-uri = text
+
+$$Claims-Set-Claims //= ( iss-claim-label => string-or-uri )
+$$Claims-Set-Claims //= ( sub-claim-label => string-or-uri )
+$$Claims-Set-Claims //= ( aud-claim-label => string-or-uri )
+$$Claims-Set-Claims //= ( exp-claim-label => ~time )
+$$Claims-Set-Claims //= ( nbf-claim-label => ~time )
+$$Claims-Set-Claims //= ( iat-claim-label => ~time )
+$$Claims-Set-Claims //= ( cti-claim-label => bytes )
+
+iss-claim-label = JC<"iss", 1>
+sub-claim-label = JC<"sub", 2>
+aud-claim-label = JC<"aud", 3>
+exp-claim-label = JC<"exp", 4>
+nbf-claim-label = JC<"nbf", 5>
+iat-claim-label = JC<"iat", 6>
+cti-claim-label = CBOR-ONLY<7>  ; jti in JWT: different name and text
+
+JSON-ONLY<J> = J .feature "json"
+CBOR-ONLY<C> = C .feature "cbor"
+JC<J,C> = JSON-ONLY<J> / CBOR-ONLY<C>
+
+; [RFC8747]
+$$Claims-Set-Claims //= ( 8: CWT-cnf ) ; cnf
+CWT-cnf = {
+  (1: CWT-COSE-Key) //
+  (2: CWT-Encrypted_COSE_Key) //
+  (3: CWT-kid)
+}
+
+CWT-COSE-Key = COSE_Key
+CWT-Encrypted_COSE_Key = COSE_Encrypt / COSE_Encrypt0
+CWT-kid = bytes
+
+;;; Insert the required CDDL from RFC 9052 to complete these
+;;; definitions.  This can be done manually or automated by a
+;;; tool that implements an import directive such as:
+;# import rfc9052
+

data/lib/cddlc.rb

@@ -280,6 +280,7 @@ class CDDL
         when "name"
           fail unless name.size == 2
           name = name[1]
+          cho ||= $options.auto_choices[name] if @rules[name]
         when "gen"
           parmnames = name[2..-1]
           name = name[1]        # XXX update val with parm/arg

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cddlc
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.4
 platform: ruby
 authors:
 - Carsten Bormann
 bindir: bin
 cert_chain: []
-date: 2025-02-16 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,6 +101,7 @@ files:
 - data/rfc9594-sign_info-parameter.cddl
 - data/rfc9594-sign_info_entry-with-a-gene.cddl
 - data/rfc9597.cddl
+- data/rfc9781.cddl
 - lib/cddlc.rb
 - lib/parser/cddl-util.rb
 - lib/parser/cddlgrammar.rb
@@ -129,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.8
 specification_version: 4
 summary: CDDL (Concise Data Definition Language) converters and miscellaneous tools
 test_files: []