cose-key 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 370bd05f8c80d2cacbc2fbae89fae839cb1f8096237a6d5e528900e188aaee86
-  data.tar.gz: 5aedf59dc00d832569871159456972932b6c2ff2822f9bda791206c9765e0907
+  metadata.gz: 25e33a9ab42b0150e080aed45e9d969075129d6659d89eaad9942b980189469e
+  data.tar.gz: 42c6a23ae4be58f4d10fabb072a38232a6d11cfd92c2ad5fbade3169298d5cee
 SHA512:
-  metadata.gz: 7e2a11691e743478199591f8f363c5c64cb9eef7e2b1c6164a81678111a20b3a91d43dbe8f879e26fc03e9ca917b2c2772681e0e62c0f786433fd5e4d4572d9b
-  data.tar.gz: b7d56af7a6caf5c4f13392410af8e353465b1d352b115de783916c2ded3faa83aef6b4662b15fa74a7c834fa8e323e6c30207d73c0fdf0560736c054d82ac0be
+  metadata.gz: c3562e579900195cb9d85db75b5b7d7243800414f393b53203b56774fd1a0b5dbd854a7f06b4b4e32aab4d7fb5d21cd470074a5887be6c1c9910fdb3f235bed0
+  data.tar.gz: 0e43542e04582310e4d0790fe5200cd5500da44ffdea75aff5c9f2f653af6a70ef2f9be235c466893eea888526e5ad289ab046f9da651424313a7b23f0ff303f

data/.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: nov

data/.github/workflows/spec.yml

@@ -0,0 +1,32 @@
+name: Spec
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  spec:
+    strategy:
+      matrix:
+        os: ['ubuntu-20.04']
+        ruby-version: ['2.6', '2.7', '3.0', '3.1']
+        # ubuntu 22.04 only supports ssl 3 and thus only ruby 3.1
+        include:
+        - os: 'ubuntu-22.04'
+          ruby-version: '3.1'
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Run Specs
+      run: bundle exec rake spec

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/cose-key.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.required_ruby_version = '>= 2.3'
   gem.add_runtime_dependency 'cbor'
-  gem.add_development_dependency 'rake', '~> 10.0'
+  gem.add_development_dependency 'rake'
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rspec-its'

data/lib/cose/key/ec2.rb

@@ -60,17 +60,31 @@ module COSE
       end
 
       def to_key
-        key = OpenSSL::PKey::EC.new crv_name
-        key.private_key = OpenSSL::BN.new(d, 2) if d
-        key.public_key = OpenSSL::PKey::EC::Point.new(
+        point = OpenSSL::PKey::EC::Point.new(
           OpenSSL::PKey::EC::Group.new(crv_name),
-          OpenSSL::BN.new([
-            '04' +
-            x.unpack('H*').first +
-            y.unpack('H*').first
-          ].pack('H*'), 2)
+          OpenSSL::BN.new(['04' + x.unpack('H*').first + y.unpack('H*').first].pack('H*'), 2)
         )
-        key
+
+        # Public key
+        data_sequence = OpenSSL::ASN1::Sequence([
+          OpenSSL::ASN1::Sequence([
+            OpenSSL::ASN1::ObjectId("id-ecPublicKey"),
+            OpenSSL::ASN1::ObjectId(crv_name)
+          ]),
+          OpenSSL::ASN1::BitString(point.to_octet_string(:uncompressed))
+        ])
+
+        if d
+          # Private key
+          data_sequence = OpenSSL::ASN1::Sequence([
+            OpenSSL::ASN1::Integer(1),
+            OpenSSL::ASN1::OctetString(OpenSSL::BN.new(d, 2).to_s(2)),
+            OpenSSL::ASN1::ObjectId(crv_name, 0, :EXPLICIT),
+            OpenSSL::ASN1::BitString(point.to_octet_string(:uncompressed), 1, :EXPLICIT)
+          ])
+        end
+
+        OpenSSL::PKey::EC.new(data_sequence.to_der)
       end
 
       def verify(signature, signature_base_string)

data/lib/cose/key/rsa.rb

@@ -52,6 +52,28 @@ module COSE
       end
 
       def to_key
+        # Public key
+        data_sequence = OpenSSL::ASN1::Sequence([
+          OpenSSL::ASN1::Integer(n),
+          OpenSSL::ASN1::Integer(e),
+        ])
+
+        if d && p && q && dp && dq && qi
+          data_sequence = OpenSSL::ASN1::Sequence([
+            OpenSSL::ASN1::Integer(0),
+            OpenSSL::ASN1::Integer(n),
+            OpenSSL::ASN1::Integer(e),
+            OpenSSL::ASN1::Integer(d),
+            OpenSSL::ASN1::Integer(p),
+            OpenSSL::ASN1::Integer(q),
+            OpenSSL::ASN1::Integer(dp),
+            OpenSSL::ASN1::Integer(dq),
+            OpenSSL::ASN1::Integer(qi),
+          ])
+        end
+
+        asn1 = OpenSSL::ASN1::Sequence(data_sequence)
+        OpenSSL::PKey::RSA.new(asn1.to_der)
         key = OpenSSL::PKey::RSA.new
         if key.respond_to? :set_key
           key.set_key n, e, d

data/lib/cose/key.rb

@@ -40,6 +40,10 @@ module COSE
       raise NotImplementedError, 'Implement me'
     end
 
+    def verify(signature, signature_base_string)
+      raise NotImplementedError, 'Implement me'
+    end
+
     class << self
       def decode(cbor)
         key = detect CBOR.decode(cbor)
@@ -67,4 +71,4 @@ module COSE
 end
 
 require 'cose/key/ec2'
-require 'cose/key/rsa'
+require 'cose/key/rsa'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cose-key
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - nov matake
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-05 00:00:00.000000000 Z
+date: 2022-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor
@@ -28,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -87,9 +87,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
+- ".github/workflows/spec.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -107,7 +108,7 @@ homepage: https://github.com/nov/cose-key
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -122,9 +123,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: COSE Key in Ruby
 test_files:

data/.travis.yml

@@ -1,9 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.5.1
-  - 2.4.4
-  - 2.3.7
-before_install: gem install bundler -v 1.16.4