fix github actions workflows

Author: brauliomartinezlm

.github/workflows/build.yml

@@ -25,8 +25,12 @@ jobs:
           - openssl_3_0
           - openssl_2_2
           - openssl_2_1
-          - openssl_2_0
           - openssl_default
+        exclude:
+          - ruby: '2.4.10'
+            gemfile: openssl_3_0
+          - ruby: '2.5.8'
+            gemfile: openssl_3_0
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
     steps:

Appraisals

@@ -8,10 +8,6 @@ appraise "openssl_2_1" do
   gem "openssl", "~> 2.1.0"
 end
 
-appraise "openssl_2_0" do
-  gem "openssl", "~> 2.0.0"
-end
-
 appraise "openssl_3_0" do
   gem "openssl", "~> 3.0.0"
 end

lib/cose/key/ec2.rb

@@ -68,28 +68,33 @@ def map
       def to_pkey
         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)
 
           # RFC5480 SubjectPublicKeyInfo
-          asn1 = OpenSSL::ASN1::Sequence([
-            OpenSSL::ASN1::Sequence([
-              OpenSSL::ASN1::ObjectId("id-ecPublicKey"),
-              OpenSSL::ASN1::ObjectId(curve.pkey_name),
-            ]),
-            OpenSSL::ASN1::BitString(public_key_point.to_octet_string(:uncompressed))
-          ])
+          asn1 = OpenSSL::ASN1::Sequence(
+            [
+              OpenSSL::ASN1::Sequence(
+                [
+                  OpenSSL::ASN1::ObjectId("id-ecPublicKey"),
+                  OpenSSL::ASN1::ObjectId(curve.pkey_name),
+                ]
+              ),
+              OpenSSL::ASN1::BitString(public_key_point.to_octet_string(:uncompressed))
+            ]
+          )
 
           if d
             # RFC5915 ECPrivateKey
-            asn1 = OpenSSL::ASN1::Sequence([
-              OpenSSL::ASN1::Integer.new(1),
-              # Not properly padded but OpenSSL doesn't mind
-              OpenSSL::ASN1::OctetString(OpenSSL::BN.new(d, 2).to_s(2)),
-              OpenSSL::ASN1::ObjectId(curve.pkey_name, 0, :EXPLICIT),
-              OpenSSL::ASN1::BitString(public_key_point.to_octet_string(:uncompressed), 1, :EXPLICIT),
-            ])
+            asn1 = OpenSSL::ASN1::Sequence(
+              [
+                OpenSSL::ASN1::Integer.new(1),
+                # Not properly padded but OpenSSL doesn't mind
+                OpenSSL::ASN1::OctetString(OpenSSL::BN.new(d, 2).to_s(2)),
+                OpenSSL::ASN1::ObjectId(curve.pkey_name, 0, :EXPLICIT),
+                OpenSSL::ASN1::BitString(public_key_point.to_octet_string(:uncompressed), 1, :EXPLICIT),
+              ]
+            )
 
             der = asn1.to_der
             return OpenSSL::PKey::EC.new(der)

lib/cose/key/rsa.rb

@@ -89,25 +89,29 @@ def map
 
       def to_pkey
         # PKCS#1 RSAPublicKey
-        asn1 = OpenSSL::ASN1::Sequence([
-          OpenSSL::ASN1::Integer.new(bn(n)),
-          OpenSSL::ASN1::Integer.new(bn(e)),
-        ])
+        asn1 = OpenSSL::ASN1::Sequence(
+          [
+            OpenSSL::ASN1::Integer.new(bn(n)),
+            OpenSSL::ASN1::Integer.new(bn(e)),
+          ]
+        )
         pkey = OpenSSL::PKey::RSA.new(asn1.to_der)
 
         if private?
           # PKCS#1 RSAPrivateKey
-          asn1 = OpenSSL::ASN1::Sequence([
-            OpenSSL::ASN1::Integer.new(0),
-            OpenSSL::ASN1::Integer.new(bn(n)),
-            OpenSSL::ASN1::Integer.new(bn(e)),
-            OpenSSL::ASN1::Integer.new(bn(d)),
-            OpenSSL::ASN1::Integer.new(bn(p)),
-            OpenSSL::ASN1::Integer.new(bn(q)),
-            OpenSSL::ASN1::Integer.new(bn(dp)),
-            OpenSSL::ASN1::Integer.new(bn(dq)),
-            OpenSSL::ASN1::Integer.new(bn(qinv)),
-          ])
+          asn1 = OpenSSL::ASN1::Sequence(
+            [
+              OpenSSL::ASN1::Integer.new(0),
+              OpenSSL::ASN1::Integer.new(bn(n)),
+              OpenSSL::ASN1::Integer.new(bn(e)),
+              OpenSSL::ASN1::Integer.new(bn(d)),
+              OpenSSL::ASN1::Integer.new(bn(p)),
+              OpenSSL::ASN1::Integer.new(bn(q)),
+              OpenSSL::ASN1::Integer.new(bn(dp)),
+              OpenSSL::ASN1::Integer.new(bn(dq)),
+              OpenSSL::ASN1::Integer.new(bn(qinv)),
+            ]
+          )
 
           pkey = OpenSSL::PKey::RSA.new(asn1.to_der)
         end