Skip to content

Commit d15538e

Browse files
fix github actions workflows
1 parent bee2a6f commit d15538e

File tree

7 files changed

+21
-17
lines changed

7 files changed

+21
-17
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ jobs:
2525
- openssl_3_0
2626
- openssl_2_2
2727
- openssl_2_1
28-
- openssl_2_0
28+
exclude:
29+
- ruby: '2.4.10'
30+
gemfile: openssl_3_0
31+
- ruby: '2.5.8'
32+
gemfile: openssl_3_0
2933
env:
3034
BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
3135
steps:

Appraisals

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,3 @@ end
1111
appraise "openssl_2_1" do
1212
gem "openssl", "~> 2.1.0"
1313
end
14-
15-
appraise "openssl_2_0" do
16-
gem "openssl", "~> 2.0.0"
17-
end

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
openssl-signature_algorithm (1.1.1)
4+
openssl-signature_algorithm (1.2.1)
55
openssl (> 2.0, < 3.1)
66

77
GEM

gemfiles/openssl_2_1.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ source "https://rubygems.org"
44

55
gem "appraisal", "~> 2.2"
66
gem "byebug", "~> 11.0"
7+
gem "ed25519", "~> 1.2"
78
gem "rake", "~> 13.0"
89
gem "rspec", "~> 3.0"
910
gem "rubocop", "~> 0.80.1"
10-
gem "ed25519", "~> 1.2"
1111
gem "openssl", "~> 2.1.0"
1212

1313
gemspec path: "../"

gemfiles/openssl_2_2.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ source "https://rubygems.org"
44

55
gem "appraisal", "~> 2.2"
66
gem "byebug", "~> 11.0"
7+
gem "ed25519", "~> 1.2"
78
gem "rake", "~> 13.0"
89
gem "rspec", "~> 3.0"
910
gem "rubocop", "~> 0.80.1"
10-
gem "ed25519", "~> 1.2"
1111
gem "openssl", "~> 2.2.0"
1212

1313
gemspec path: "../"

gemfiles/openssl_2_0.gemfile renamed to gemfiles/openssl_3_0.gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ source "https://rubygems.org"
44

55
gem "appraisal", "~> 2.2"
66
gem "byebug", "~> 11.0"
7+
gem "ed25519", "~> 1.2"
78
gem "rake", "~> 13.0"
89
gem "rspec", "~> 3.0"
910
gem "rubocop", "~> 0.80.1"
10-
gem "ed25519", "~> 1.2"
11-
gem "openssl", "~> 2.0.0"
11+
gem "openssl", "~> 3.0.0"
1212

1313
gemspec path: "../"

lib/openssl/signature_algorithm/ecdsa.rb

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,17 @@ def ec_key
3636
@ec_key ||=
3737
begin
3838
# RFC5480 SubjectPublicKeyInfo
39-
asn1 = OpenSSL::ASN1::Sequence([
40-
OpenSSL::ASN1::Sequence([
41-
OpenSSL::ASN1::ObjectId("id-ecPublicKey"),
42-
OpenSSL::ASN1::ObjectId(group.curve_name),
43-
]),
44-
OpenSSL::ASN1::BitString(to_octet_string(:uncompressed))
45-
])
39+
asn1 = OpenSSL::ASN1::Sequence(
40+
[
41+
OpenSSL::ASN1::Sequence(
42+
[
43+
OpenSSL::ASN1::ObjectId("id-ecPublicKey"),
44+
OpenSSL::ASN1::ObjectId(group.curve_name),
45+
]
46+
),
47+
OpenSSL::ASN1::BitString(to_octet_string(:uncompressed))
48+
]
49+
)
4650

4751
OpenSSL::PKey::EC.new(asn1.to_der)
4852
end

0 commit comments

Comments
 (0)