cose 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5417c864087ecc89f9f82bb341050b831b1854de193d0e9724e2a6105cf492ce
-  data.tar.gz: f74cfbcca9261e14fb1e170d981d18d0281bb817663a7df9484673b22d41da42
+  metadata.gz: aceb3ea289c6adab5874f31854aebcf18cd5eed0777852858a4fb3a94ac74f54
+  data.tar.gz: a7e16463701f8901a3384cac76b76585927a074c98ec6418ebadf032d2454617
 SHA512:
-  metadata.gz: 6377547f6db9eb87814455f4d48a8f84d8fc5df26df0b7d1a0c72f423a0ccbdb1e0f6367fcecf4e34db6025a145479088d89e79abdda7519849d12e4e62b7b48
-  data.tar.gz: 5227f43154bb5225c2a7354dcd5d0d271df281335e2dcab600c86c5910d37618b6b69473c6d04ee9f9cee1b76b85f789b50852fb2a88a9ae7aa63ed5bd1bb633
+  metadata.gz: 8dbcd246e8a1ab365800f802e3b36433a083d7993c769dc35ab6480657550ff34ff4b68cff867ad2e232d06687c97104074b3994030f6d081c3bfca80087ba8b
+  data.tar.gz: 10b37822696c206a21e682c706dc2457af5edc49209f1939ae49835ba99c4d62d02e5f62ef0c7149aa78efe28390b91e769521cb65cd31f5608c0f69df9bc34d

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [v0.7.0] - 2019-05-02
+
+### Fixed
+
+- `require "cose"` now correctly requires all features
+
 ## [v0.6.1] - 2019-04-06
 
 ### Fixed
@@ -73,6 +79,7 @@
 - EC2 key object
 - Works with ruby 2.5
 
+[v0.7.0]: https://github.com/cedarcode/cose-ruby/compare/v0.6.1...v0.7.0/
 [v0.6.1]: https://github.com/cedarcode/cose-ruby/compare/v0.6.0...v0.6.1/
 [v0.6.0]: https://github.com/cedarcode/cose-ruby/compare/v0.5.0...v0.6.0/
 [v0.5.0]: https://github.com/cedarcode/cose-ruby/compare/v0.4.1...v0.5.0/

data/lib/cose.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
+require "cose/encrypt"
+require "cose/encrypt0"
+require "cose/key"
+require "cose/mac"
+require "cose/mac0"
+require "cose/sign"
+require "cose/sign1"
 require "cose/version"
-
-module COSE
-  # Your code goes here...
-end

data/lib/cose/key/curve.rb

@@ -0,0 +1,32 @@
+module COSE
+  module Key
+    # https://tools.ietf.org/html/rfc8152#section-13.1
+    Curve = Struct.new(:id, :name, :pkey_name) do
+      @curves = {}
+
+      def self.register(id, name, pkey_name)
+        @curves[id] = new(id, name, pkey_name)
+      end
+
+      def self.find(id)
+        @curves[id]
+      end
+
+      def self.by_name(name)
+        @curves.values.detect { |curve| curve.name == name }
+      end
+
+      def self.by_pkey_name(pkey_name)
+        @curves.values.detect { |curve| curve.pkey_name == pkey_name }
+      end
+
+      def value
+        id
+      end
+    end
+  end
+end
+
+COSE::Key::Curve.register(1, "P-256", "prime256v1")
+COSE::Key::Curve.register(2, "P-384", "secp384r1")
+COSE::Key::Curve.register(3, "P-521", "secp521r1")

data/lib/cose/key/ec2.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "cose/key/curve"
 require "cose/key/curve_key"
 require "openssl"
 
@@ -9,15 +10,6 @@ module COSE
       LABEL_Y = -3
 
       KTY_EC2 = 2
-      CRV_P256 = 1
-      CRV_P384 = 2
-      CRV_P521 = 3
-
-      PKEY_CURVES = {
-        CRV_P256 => "prime256v1",
-        CRV_P384 => "secp384r1",
-        CRV_P521 => "secp521r1"
-      }.freeze
 
       def self.enforce_type(map)
         if map[LABEL_KTY] != KTY_EC2
@@ -26,7 +18,7 @@ module COSE
       end
 
       def self.from_pkey(pkey)
-        curve = PKEY_CURVES.key(pkey.group.curve_name) || raise("Unsupported EC curve #{pkey.group.curve_name}")
+        curve = Curve.by_pkey_name(pkey.group.curve_name) || raise("Unsupported EC curve #{pkey.group.curve_name}")
 
         case pkey
         when OpenSSL::PKey::EC::Point
@@ -51,7 +43,7 @@ module COSE
           d = private_key.to_s(2)
         end
 
-        new(crv: curve, x: x, y: y, d: d)
+        new(crv: curve.id, x: x, y: y, d: d)
       end
 
       attr_reader :y
@@ -76,8 +68,8 @@ module COSE
       end
 
       def to_pkey
-        if PKEY_CURVES[crv]
-          group = OpenSSL::PKey::EC::Group.new(PKEY_CURVES[crv])
+        if curve
+          group = OpenSSL::PKey::EC::Group.new(curve.pkey_name)
           pkey = OpenSSL::PKey::EC.new(group)
           public_key_bn = OpenSSL::BN.new("\x04" + x + y, 2)
           public_key_point = OpenSSL::PKey::EC::Point.new(group, public_key_bn)
@@ -93,6 +85,10 @@ module COSE
         end
       end
 
+      def curve
+        Curve.find(crv)
+      end
+
       def self.keyword_arguments_for_initialize(map)
         super.merge(y: map[LABEL_Y])
       end

data/lib/cose/mac.rb

@@ -1,4 +1,5 @@
 require "cbor"
+require "cose/recipient"
 require "cose/security_message"
 
 module COSE

data/lib/cose/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module COSE
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cose
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Gonzalo Rodriguez
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-06 00:00:00.000000000 Z
+date: 2019-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor
@@ -144,6 +144,7 @@ files:
 - lib/cose/encrypt0.rb
 - lib/cose/key.rb
 - lib/cose/key/base.rb
+- lib/cose/key/curve.rb
 - lib/cose/key/curve_key.rb
 - lib/cose/key/ec2.rb
 - lib/cose/key/okp.rb