cose-key 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cb49170acb17ea18e9ef50d25a4d1a04ffd1f92777dd0093d7d59ababaf558d
-  data.tar.gz: a239aef8a89fa66df33a57c77abd9a108a108e984100da0389ba4f62994a42d5
+  metadata.gz: c784f5570d8b6a8e70be5fab055c530c93fc11ae9c403f512b4104a82a48a14a
+  data.tar.gz: 80b22fce793a2855c191b86fd31bb553c461191d2707a81453a095bd8c1e6bd3
 SHA512:
-  metadata.gz: 1bdbcf363e1050948b07694c4957b73b44e52c1e042775a30fe68d058c98b9b9419d7c79e80bf1c848de7dd195665d30fd2461f7295c433104cdf21098734c34
-  data.tar.gz: bcfb14988ad3b698f7399fd4ea3c200d6ca01ac72b3033fc7b60eb468212ad6dcba4c58c3e3aa40aa61767d98c2e3ff365ed835e93c1b5d82ac3438a6dcc99e7
+  metadata.gz: 97b1bbeafae1df9a0389e0168402b4f985723050a79f50323c35752861232d9d0591890dc20d414f8362518e3e5fd11f9a3e91a2128e2826869bc4bd746c3e7d
+  data.tar.gz: 7c0c92e1a663b35b1021e284bb8bf11c20452ce6fbf1192d946aa780d21e2c30fa2917c07f32bcca8e6666badb5d39c3e64b562840c3c8bcd1c4f149f42a519a

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/cose/key/ec2.rb

@@ -6,13 +6,16 @@ module COSE
       Y = -3
       D = -4
 
-      ES256 = -7
-      ES384 = -35
-      ES512 = -36
-
-      P256 = 1
-      P384 = 2
-      P521 = 3
+      ALGS = {
+        ES256: -7,
+        ES384: -35,
+        ES512: -36
+      }
+      CRVS = {
+        P256: 1,
+        P384: 2,
+        P521: 3
+      }
 
       attr_accessor :crv, :x, :y, :d
 
@@ -24,37 +27,43 @@ module COSE
         self.d = attrs[D]
       end
 
-      def curve_name
-        case crv
-        when P256
+      def alg_key
+        ALGS.invert[alg] or
+        raise 'Unknown Algorithm'
+      end
+
+      def crv_key
+        CRVS.invert[crv] or
+        raise 'Unknown Curve'
+      end
+
+      def crv_name
+        case crv_key
+        when :P256
           'prime256v1'
-        when P384
+        when :P384
           'secp384r1'
-        when P521
+        when :P521
           'secp521r1'
-        else
-          raise 'Unknown Curve'
         end
       end
 
       def digest
-        case alg
-        when ES256
+        case alg_key
+        when :ES256
           OpenSSL::Digest::SHA256
-        when ES384
+        when :ES384
           OpenSSL::Digest::SHA384
-        when ES512
+        when :ES512
           OpenSSL::Digest::SHA512
-        else
-          raise 'Unknown Algorithm'
         end.new
       end
 
       def to_key
-        key = OpenSSL::PKey::EC.new curve_name
+        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(
-          OpenSSL::PKey::EC::Group.new(curve_name),
+          OpenSSL::PKey::EC::Group.new(crv_name),
           OpenSSL::BN.new([
             '04' +
             x.unpack('H*').first +

data/lib/cose/key/rsa.rb

@@ -10,12 +10,14 @@ module COSE
       DQ = -7
       QI = -8
 
-      PS256 = -37
-      PS384 = -38
-      PS512 = -39
-      RSAES_OAEP_SHA1   = -40
-      RSAES_OAEP_SHA256 = -41
-      RSAES_OAEP_SHA512 = -42
+      ALGS = {
+        PS256: -37,
+        PS384: -38,
+        PS512: -39,
+        RSAES_OAEP_SHA1: -40,
+        RSAES_OAEP_SHA256: -41,
+        RSAES_OAEP_SHA512: -42
+      }
 
       attr_accessor :n, :e, :d, :p, :q, :dp, :dq, :qi
 
@@ -31,18 +33,21 @@ module COSE
         self.qi = attrs[QI]
       end
 
+      def alg_key
+        ALGS.invert[alg] or
+        raise 'Unknown Algorithm'
+      end
+
       def digest
-        case alg
-        when RSAES_OAEP_SHA1
+        case alg_key
+        when :RSAES_OAEP_SHA1
           OpenSSL::Digest::SHA1
-        when PS256, RSAES_OAEP_SHA256
+        when :PS256, :RSAES_OAEP_SHA256
           OpenSSL::Digest::SHA256
-        when PS384
+        when :PS384
           OpenSSL::Digest::SHA384
-        when PS512, RSAES_OAEP_SHA512
+        when :PS512, :RSAES_OAEP_SHA512
           OpenSSL::Digest::SHA512
-        else
-          raise 'Unknown Algorithm'
         end.new
       end
 

data/lib/cose/key.rb

@@ -24,24 +24,16 @@ module COSE
       self.base_iv = attrs[BASE_IV]
     end
 
-    def digest
+    def alg_key
       raise 'Implement me'
     end
 
-    def to_key
+    def digest
       raise 'Implement me'
     end
 
-    def to_s
-      raw
-    end
-
-    def to_pem
-      to_key.to_pem
-    end
-
-    def to_text
-      to_key.to_text
+    def to_key
+      raise 'Implement me'
     end
 
     class << self

data/spec/cose/key_spec.rb

@@ -21,8 +21,23 @@ RSpec.describe COSE::Key do
       it { should be_instance_of COSE::Key::EC2 }
     end
 
-    describe '#curve_name' do
-      subject { decoded.curve_name }
+    describe '#raw' do
+      subject { decoded.raw }
+      it { should == ec2_cbor }
+    end
+
+    describe '#alg_key' do
+      subject { decoded.alg_key }
+      it { should == :ES256 }
+    end
+
+    describe '#crv_key' do
+      subject { decoded.crv_key }
+      it { should == :P256 }
+    end
+
+    describe '#crv_name' do
+      subject { decoded.crv_name }
       it { should == 'prime256v1' }
     end
 
@@ -35,21 +50,6 @@ RSpec.describe COSE::Key do
       subject { decoded.to_key }
       it { should be_instance_of OpenSSL::PKey::EC }
     end
-
-    # describe '#to_s' do
-    #   subject { decoded.to_s }
-    #   it { should == ec2_cbor }
-    # end
-
-    describe '#to_pem' do
-      subject { decoded.to_pem }
-      it { should == ec2_pem }
-    end
-
-    describe '#to_text' do
-      subject { decoded.to_text }
-      it { should == ec2_key.to_text }
-    end
   end
 
   context 'for RSA keys' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cose-key
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-08 00:00:00.000000000 Z
+date: 2018-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor