cert-to-cwt 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f30a9c6e0631d3daaca07bac5a27a9dc34bd4cb
-  data.tar.gz: e78ff0859be82052447ac491c072d78b5f217919
+  metadata.gz: 599594ac004acd8a7fdf29c302d566bf6253f5d6
+  data.tar.gz: 53de4844c860c9eb8f498f0dcc639631dec2b55f
 SHA512:
-  metadata.gz: 9ff25fea72d4b4ae22172b72ccf3f739d2607d221ac855a498a24dabb00f2f8900cd7b8f33a49217a102ddb091b781f9f93c8d25d83e6600372059729f432a86
-  data.tar.gz: e1626c35abfbca01ad4d00157ce149add3330414ac5dee2ce532d6ed65709a3244f15f6814df534ad0fd18e23f08252887dba1da1df6f262e3a89b7c94b71f87
+  metadata.gz: 2f45ef0d8dafd166e4f6c9ed03605ce0f41aa0715684836124bc3b262cc23526c98adc16d7c95008b802476c76e1b1815c31f03b4b4ea6076a732ef63522bc9f
+  data.tar.gz: 213f1f078d04f38865e663f6985b0510eabd3d9c43487dc358f4f0a8a2913f48cb03b7cf12d0508459041a0316182db8f519e91b9f0b06717e46d28ef9cfadc7

data/bin/cert-to-cwt.rb

@@ -50,7 +50,14 @@ def bitstringtobytes(s)
 end
 
 def datetimeasn1(s)
-  Time.iso8601(s.sub(/\A(..)(..)(..)(..)(..)(..)Z\z/){"20#$1-#$2-#$3T#$4:#$5:#$6Z"}).to_i
+  case s.keys
+  when [:t]
+    Time.iso8601(s.fetch(:t).sub(/\A(..)(..)(..)(..)(..)(..)Z\z/){"20#$1-#$2-#$3T#$4:#$5:#$6Z"}).to_i
+  when [:gt]
+    Time.iso8601(s.fetch(:gt).sub(/\A(....)(..)(..)(..)(..)(..(?:[.]\d*)?)Z\z/){"#$1-#$2-#$3T#$4:#$5:#$6Z"}).to_i
+  else
+    fail ["unknown date/time type", s.keys].inspect
+  end
 end
 
 OIDLOOKUP = Hash.new {|h, k| k}
@@ -93,7 +100,13 @@ ALGLOOKUP = Hash.new {|h, k| k}
 %w(
 1.2.840.113549.1.1.11 sha256WithRSAEncryption
 1.2.840.113549.1.1.1  rsaEncryption
+1.2.840.10045.2.1     ecPublicKey
+
+1.2.840.10045.3.1.7   secp256r1
+1.2.840.10045.3.1.34  secp384r1
+1.2.840.10045.3.1.35  secp521r1
 ).each_slice(2).map{ |x, y| ALGLOOKUP[x] = y.intern}
+# prime192v1(1)   prime192v2(2)   prime192v3(3)  prime239v1(4)   prime239v2(5)   prime239v3(6)   prime256v1(7) 
 
 SYMLOOKUP = Hash.new {|h, k| warn "label unknown for key :#{k}"; k}
 %w(
@@ -110,7 +123,10 @@ kty 1
 n -1
 e -2
 
-serial -100000
+crv -1
+x -2
+y -3
+
 pk -100001
 ).each_slice(2).map{ |x, y| SYMLOOKUP[x.intern] = y.to_i}
 
@@ -139,13 +155,13 @@ tbs, sigalg, sigval = cert.fetch(:seq)
 ver, ser, sigalg1, iss, validity, sub, spki, *rest = tbs.fetch(:seq)
 fail [:ver, ver].inspect unless ver == {exp0: [2]}
 fail [:ser, set].inspect unless Integer === ser
-claimset[:serial] = ser
+claimset[:cti] = numbertobytes(ser)
 fail [:alg, sigalg, sigalg1].inspect unless sigalg == sigalg1
 
 decoded_sigalg = ALGLOOKUP[sigalg.fetch(:seq).first]
 # p decoded_sigalg
 
-notbefore, notafter = validity.fetch(:seq).map{|x| datetimeasn1(x.fetch(:t))}
+notbefore, notafter = validity.fetch(:seq).map{|x| datetimeasn1(x)}
 # p [notbefore, notafter]
 claimset[:nbf] = notbefore
 claimset[:exp] = notafter
@@ -154,7 +170,9 @@ claimset[:iss] = dntostring(iss)
 claimset[:sub] = dntostring(sub)
 
 pkalg, pkbits = spki.fetch(:seq)
-decoded_pkalg = ALGLOOKUP[pkalg.fetch(:seq).first]
+pkalgseq1, pkalgseq2 = pkalg.fetch(:seq)
+decoded_pkalg = ALGLOOKUP[pkalgseq1]
+decoded_pkalgparm = ALGLOOKUP[pkalgseq2]
 kk = bitstringtobytes(pkbits.fetch(:bits))
 case decoded_pkalg
 when  :rsaEncryption
@@ -162,8 +180,29 @@ when  :rsaEncryption
   n, e = kk.fetch(:seq)
   u = CBOR.encode(n)
   claimset[:pk] = {kty: 3, n: numbertobytes(n), e: numbertobytes(e)}
+when :ecPublicKey
+  case decoded_pkalgparm
+  when :secp256r1
+    case kk.getbyte(0)
+    # XXX: check lengths
+    when 4
+      fail "Weird EC key #{kk.hexi}" unless kk.size == 65
+      y = kk[33..64]
+    when 2
+      fail "Weird EC key #{kk.hexi}" unless kk.size == 33
+      y = false
+    when 3
+      fail "Weird EC key #{kk.hexi}" unless kk.size == 33
+      y = true
+    else
+      fail "Weird EC key #{kk.hexi}"
+    end
+    claimset[:pk] = {kty: 2, crv: 1, x: kk[1..32], y: y}
+  else
+    claimset[:pk] = ["ecPublicKey", pkalgseq2, kk] # TODO convert to COSE key
+  end
 else
-  claimset[:pk] = [decoded_pkalg, kk] # TODO convert to COSE key
+  claimset[:pk] = [decoded_pkalg, pkalgseq2, kk] # TODO convert to COSE key
 end
 
 rest1 = rest.reduce({}, :merge)

data/cert-to-cwt.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "cert-to-cwt"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
   s.summary = "Convert an X.509 cert into a CWT claim set"
   s.description = %q{cert-to-cwt is a highly experimental converter for X.509 certificates into CWT claim sets.}
   s.author = "Carsten Bormann"
@@ -9,11 +9,11 @@ Gem::Specification.new do |s|
   s.has_rdoc = false
   s.files = Dir['lib/**/*.rb'] + %w(cert-to-cwt.gemspec) + Dir['bin/**/*.rb']
   s.executables = Dir['bin/**/*.rb'].map {|x| File.basename(x)}
-  s.required_ruby_version = '>= 2.4.1'
+  s.required_ruby_version = '>= 2.3.1'
 
   s.require_paths = ["lib"]
 
   s.add_development_dependency 'bundler', '~>1'
   s.add_dependency 'cbor-diag'
-  s.add_dependency 'asn1-diag'
+  s.add_dependency 'asn1-diag', ">= 0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cert-to-cwt
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-21 00:00:00.000000000 Z
+date: 2017-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
 description: cert-to-cwt is a highly experimental converter for X.509 certificates
   into CWT claim sets.
 email: cabo@tzi.org
@@ -74,7 +74,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.1
+      version: 2.3.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="