Skip to content

Commit 6d66391

Browse files
committed
drop dependency on deprecated ruby-hmac gem, fixes fog#2034
Ruby 1.8 compiled against OpenSSL 0.9.8 supports SHA256 for some time now. Ref: https://github.com/ruby/ruby/blob/ruby_1_8_7/ChangeLog#L12025-L12029
1 parent 60e9268 commit 6d66391

File tree

2 files changed

+3
-17
lines changed

2 files changed

+3
-17
lines changed

fog.gemspec

-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ Gem::Specification.new do |s|
4949
s.add_dependency('net-scp', '~>1.1')
5050
s.add_dependency('net-ssh', '>=2.1.3')
5151
s.add_dependency('nokogiri', '~>1.5')
52-
s.add_dependency('ruby-hmac')
5352

5453
## List your development dependencies here. Development dependencies are
5554
## those that are only needed during development

lib/fog/core/hmac.rb

+3-16
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,9 @@ def setup_sha1
2525
end
2626

2727
def setup_sha256
28-
begin
29-
@digest = OpenSSL::Digest.new('sha256')
30-
@signer = lambda do |data|
31-
OpenSSL::HMAC.digest(@digest, @key, data)
32-
end
33-
rescue RuntimeError => error
34-
unless error.message == 'Unsupported digest algorithm (sha256).'
35-
raise error
36-
else
37-
require 'hmac-sha2'
38-
@hmac = ::HMAC::SHA256.new(@key)
39-
@signer = lambda do |data|
40-
@hmac.update(data)
41-
@hmac.digest
42-
end
43-
end
28+
@digest = OpenSSL::Digest.new('sha256')
29+
@signer = lambda do |data|
30+
OpenSSL::HMAC.digest(@digest, @key, data)
4431
end
4532
end
4633

0 commit comments

Comments
 (0)