зеркало из https://github.com/github/ruby.git
Digest::HMAC is finally removed as previously noticed. [fix GH-648]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46635 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu
Родитель
91dfb379ea
Коммит
e2e4ac3a8f
|
|
@ -1,3 +1,9 @@
|
||||||
|
Tue Jul 1 16:18:22 2014 Akinori MUSHA <knu@iDaemons.org>
|
||||||
|
|
||||||
|
* ext/digest/lib/digest/hmac.rb, test/digest/test_digest_hmac.rb:
|
||||||
|
Digest::HMAC is finally removed as previously noticed.
|
||||||
|
[fix GH-648]
|
||||||
|
|
||||||
Tue Jul 1 11:13:43 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
|
Tue Jul 1 11:13:43 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
|
||||||
|
|
||||||
* ext/date/lib/date/format.rb: removed empty file by @vipulnsward.
|
* ext/date/lib/date/format.rb: removed empty file by @vipulnsward.
|
||||||
|
|
|
||||||
6
NEWS
6
NEWS
|
|
@ -89,6 +89,9 @@ with all sufficient information, see the ChangeLog file.
|
||||||
|
|
||||||
=== Stdlib updates (outstanding ones only)
|
=== Stdlib updates (outstanding ones only)
|
||||||
|
|
||||||
|
* Digest
|
||||||
|
* Digest::HMAC has been removed just as previously noticed.
|
||||||
|
|
||||||
* Etc
|
* Etc
|
||||||
* New methods:
|
* New methods:
|
||||||
* Etc.uname
|
* Etc.uname
|
||||||
|
|
@ -107,6 +110,9 @@ with all sufficient information, see the ChangeLog file.
|
||||||
|
|
||||||
=== Stdlib compatibility issues (excluding feature bug fixes)
|
=== Stdlib compatibility issues (excluding feature bug fixes)
|
||||||
|
|
||||||
|
* Digest
|
||||||
|
* Digest::HMAC has finally ceased to exist. Use OpenSSL::HMAC or an external gem instead.
|
||||||
|
|
||||||
* time.rb
|
* time.rb
|
||||||
* Time.parse, Time.strptime, Time.rfc2822, Time.xmlschema may produce
|
* Time.parse, Time.strptime, Time.rfc2822, Time.xmlschema may produce
|
||||||
fixed-offset Time objects.
|
fixed-offset Time objects.
|
||||||
|
|
|
||||||
|
|
@ -1,130 +0,0 @@
|
||||||
# == License
|
|
||||||
#
|
|
||||||
# Copyright (c) 2006 Akinori MUSHA <knu@iDaemons.org>
|
|
||||||
#
|
|
||||||
# Documentation by Akinori MUSHA
|
|
||||||
#
|
|
||||||
# All rights reserved. You can redistribute and/or modify it under
|
|
||||||
# the same terms as Ruby.
|
|
||||||
#
|
|
||||||
# $Id$
|
|
||||||
#
|
|
||||||
|
|
||||||
warn "use of the experimetal library 'digest/hmac' is discouraged; require 'openssl' and use OpenSSL::HMAC instead." if $VERBOSE
|
|
||||||
|
|
||||||
require 'digest'
|
|
||||||
|
|
||||||
module Digest
|
|
||||||
# = digest/hmac.rb
|
|
||||||
#
|
|
||||||
# An experimental implementation of HMAC keyed-hashing algorithm
|
|
||||||
#
|
|
||||||
# == Overview
|
|
||||||
#
|
|
||||||
# CAUTION: Use of this library is discouraged, because this
|
|
||||||
# implementation was meant to be experimental but somehow got into the
|
|
||||||
# 1.9 series without being noticed. Please use OpenSSL::HMAC in the
|
|
||||||
# "openssl" library instead.
|
|
||||||
#
|
|
||||||
# == Examples
|
|
||||||
#
|
|
||||||
# require 'digest/hmac'
|
|
||||||
#
|
|
||||||
# # one-liner example
|
|
||||||
# puts Digest::HMAC.hexdigest("data", "hash key", Digest::SHA1)
|
|
||||||
#
|
|
||||||
# # rather longer one
|
|
||||||
# hmac = Digest::HMAC.new("foo", Digest::RMD160)
|
|
||||||
#
|
|
||||||
# buf = ""
|
|
||||||
# while stream.read(16384, buf)
|
|
||||||
# hmac.update(buf)
|
|
||||||
# end
|
|
||||||
#
|
|
||||||
# puts hmac.hexdigest
|
|
||||||
#
|
|
||||||
class HMAC < Digest::Class
|
|
||||||
|
|
||||||
# Creates a Digest::HMAC instance.
|
|
||||||
|
|
||||||
def initialize(key, digester)
|
|
||||||
@md = digester.new
|
|
||||||
|
|
||||||
block_len = @md.block_length
|
|
||||||
|
|
||||||
if key.bytesize > block_len
|
|
||||||
key = @md.digest(key)
|
|
||||||
end
|
|
||||||
|
|
||||||
ipad = Array.new(block_len, 0x36)
|
|
||||||
opad = Array.new(block_len, 0x5c)
|
|
||||||
|
|
||||||
key.bytes.each_with_index { |c, i|
|
|
||||||
ipad[i] ^= c
|
|
||||||
opad[i] ^= c
|
|
||||||
}
|
|
||||||
|
|
||||||
@key = key.freeze
|
|
||||||
@ipad = ipad.pack('C*').freeze
|
|
||||||
@opad = opad.pack('C*').freeze
|
|
||||||
@md.update(@ipad)
|
|
||||||
end
|
|
||||||
|
|
||||||
def initialize_copy(other) # :nodoc:
|
|
||||||
@md = other.instance_eval { @md.clone }
|
|
||||||
end
|
|
||||||
|
|
||||||
# call-seq:
|
|
||||||
# hmac.update(string) -> hmac
|
|
||||||
# hmac << string -> hmac
|
|
||||||
#
|
|
||||||
# Updates the hmac using a given +string+ and returns self.
|
|
||||||
def update(text)
|
|
||||||
@md.update(text)
|
|
||||||
self
|
|
||||||
end
|
|
||||||
alias << update
|
|
||||||
|
|
||||||
# call-seq:
|
|
||||||
# hmac.reset -> hmac
|
|
||||||
#
|
|
||||||
# Resets the hmac to the initial state and returns self.
|
|
||||||
def reset
|
|
||||||
@md.reset
|
|
||||||
@md.update(@ipad)
|
|
||||||
self
|
|
||||||
end
|
|
||||||
|
|
||||||
def finish # :nodoc:
|
|
||||||
d = @md.digest!
|
|
||||||
@md.update(@opad)
|
|
||||||
@md.update(d)
|
|
||||||
@md.digest!
|
|
||||||
end
|
|
||||||
private :finish
|
|
||||||
|
|
||||||
# call-seq:
|
|
||||||
# hmac.digest_length -> Integer
|
|
||||||
#
|
|
||||||
# Returns the length in bytes of the hash value of the digest.
|
|
||||||
def digest_length
|
|
||||||
@md.digest_length
|
|
||||||
end
|
|
||||||
|
|
||||||
# call-seq:
|
|
||||||
# hmac.block_length -> Integer
|
|
||||||
#
|
|
||||||
# Returns the block length in bytes of the hmac.
|
|
||||||
def block_length
|
|
||||||
@md.block_length
|
|
||||||
end
|
|
||||||
|
|
||||||
# call-seq:
|
|
||||||
# hmac.inspect -> string
|
|
||||||
#
|
|
||||||
# Creates a printable version of the hmac object.
|
|
||||||
def inspect
|
|
||||||
sprintf('#<%s: key=%s, digest=%s>', self.class.name, @key.inspect, @md.inspect.sub(/^\#<(.*)>$/) { $1 });
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
@ -1,166 +0,0 @@
|
||||||
require 'test/unit'
|
|
||||||
require 'digest/hmac'
|
|
||||||
|
|
||||||
module TM_HMAC
|
|
||||||
def test_s_hexdigest
|
|
||||||
cases.each { |h|
|
|
||||||
digesters.each { |d|
|
|
||||||
assert_equal(h[:hexdigest], Digest::HMAC.hexdigest(h[:data], h[:key], d))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
end
|
|
||||||
|
|
||||||
def test_hexdigest
|
|
||||||
cases.each { |h|
|
|
||||||
digesters.each { |d|
|
|
||||||
hmac = Digest::HMAC.new(h[:key], d)
|
|
||||||
|
|
||||||
hmac.update(h[:data])
|
|
||||||
|
|
||||||
assert_equal(h[:hexdigest], hmac.hexdigest)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
end
|
|
||||||
|
|
||||||
def test_reset
|
|
||||||
cases.each { |h|
|
|
||||||
digesters.each { |d|
|
|
||||||
hmac = Digest::HMAC.new(h[:key], d)
|
|
||||||
hmac.update("test")
|
|
||||||
hmac.reset
|
|
||||||
hmac.update(h[:data])
|
|
||||||
|
|
||||||
assert_equal(h[:hexdigest], hmac.hexdigest)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
class TC_HMAC_MD5 < Test::Unit::TestCase
|
|
||||||
include TM_HMAC
|
|
||||||
|
|
||||||
def digesters
|
|
||||||
[Digest::MD5, Digest::MD5.new]
|
|
||||||
end
|
|
||||||
|
|
||||||
# Taken from RFC 2202: Test Cases for HMAC-MD5 and HMAC-SHA-1
|
|
||||||
def cases
|
|
||||||
[
|
|
||||||
{
|
|
||||||
:key => "\x0b" * 16,
|
|
||||||
:data => "Hi There",
|
|
||||||
:hexdigest => "9294727a3638bb1c13f48ef8158bfc9d",
|
|
||||||
}, {
|
|
||||||
:key => "Jefe",
|
|
||||||
:data => "what do ya want for nothing?",
|
|
||||||
:hexdigest => "750c783e6ab0b503eaa86e310a5db738",
|
|
||||||
}, {
|
|
||||||
:key => "\xaa" * 16,
|
|
||||||
:data => "\xdd" * 50,
|
|
||||||
:hexdigest => "56be34521d144c88dbb8c733f0e8b3f6",
|
|
||||||
}, {
|
|
||||||
:key => "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19",
|
|
||||||
:data => "\xcd" * 50,
|
|
||||||
:hexdigest => "697eaf0aca3a3aea3a75164746ffaa79",
|
|
||||||
}, {
|
|
||||||
:key => "\x0c" * 16,
|
|
||||||
:data => "Test With Truncation",
|
|
||||||
:hexdigest => "56461ef2342edc00f9bab995690efd4c",
|
|
||||||
}, {
|
|
||||||
:key => "\xaa" * 80,
|
|
||||||
:data => "Test Using Larger Than Block-Size Key - Hash Key First",
|
|
||||||
:hexdigest => "6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd",
|
|
||||||
}, {
|
|
||||||
:key => "\xaa" * 80,
|
|
||||||
:data => "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data",
|
|
||||||
:hexdigest => "6f630fad67cda0ee1fb1f562db3aa53e",
|
|
||||||
}
|
|
||||||
]
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
class TC_HMAC_SHA1 < Test::Unit::TestCase
|
|
||||||
include TM_HMAC
|
|
||||||
|
|
||||||
def digesters
|
|
||||||
[Digest::SHA1, Digest::SHA1.new]
|
|
||||||
end
|
|
||||||
|
|
||||||
# Taken from RFC 2202: Test Cases for HMAC-MD5 and HMAC-SHA-1
|
|
||||||
def cases
|
|
||||||
[
|
|
||||||
{
|
|
||||||
:key => "\x0b" * 20,
|
|
||||||
:data => "Hi There",
|
|
||||||
:hexdigest => "b617318655057264e28bc0b6fb378c8ef146be00",
|
|
||||||
}, {
|
|
||||||
:key => "Jefe",
|
|
||||||
:data => "what do ya want for nothing?",
|
|
||||||
:hexdigest => "effcdf6ae5eb2fa2d27416d5f184df9c259a7c79",
|
|
||||||
}, {
|
|
||||||
:key => "\xaa" * 20,
|
|
||||||
:data => "\xdd" * 50,
|
|
||||||
:hexdigest => "125d7342b9ac11cd91a39af48aa17b4f63f175d3",
|
|
||||||
}, {
|
|
||||||
:key => "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19",
|
|
||||||
:data => "\xcd" * 50,
|
|
||||||
:hexdigest => "4c9007f4026250c6bc8414f9bf50c86c2d7235da",
|
|
||||||
}, {
|
|
||||||
:key => "\x0c" * 20,
|
|
||||||
:data => "Test With Truncation",
|
|
||||||
:hexdigest => "4c1a03424b55e07fe7f27be1d58bb9324a9a5a04",
|
|
||||||
}, {
|
|
||||||
:key => "\xaa" * 80,
|
|
||||||
:data => "Test Using Larger Than Block-Size Key - Hash Key First",
|
|
||||||
:hexdigest => "aa4ae5e15272d00e95705637ce8a3b55ed402112",
|
|
||||||
}, {
|
|
||||||
:key => "\xaa" * 80,
|
|
||||||
:data => "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data",
|
|
||||||
:hexdigest => "e8e99d0f45237d786d6bbaa7965c7808bbff1a91",
|
|
||||||
}
|
|
||||||
]
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
class TC_HMAC_RMD160 < Test::Unit::TestCase
|
|
||||||
include TM_HMAC
|
|
||||||
|
|
||||||
def digesters
|
|
||||||
[Digest::RMD160, Digest::RMD160.new]
|
|
||||||
end
|
|
||||||
|
|
||||||
# Taken from RFC 2286: Test Cases for HMAC-RIPEMD160 and HMAC-RIPEMD128
|
|
||||||
def cases
|
|
||||||
[
|
|
||||||
{
|
|
||||||
:key => "\x0b" * 20,
|
|
||||||
:data => "Hi There",
|
|
||||||
:hexdigest => "24cb4bd67d20fc1a5d2ed7732dcc39377f0a5668",
|
|
||||||
}, {
|
|
||||||
:key => "Jefe",
|
|
||||||
:data => "what do ya want for nothing?",
|
|
||||||
:hexdigest => "dda6c0213a485a9e24f4742064a7f033b43c4069",
|
|
||||||
}, {
|
|
||||||
:key => "\xaa" * 20,
|
|
||||||
:data => "\xdd" * 50,
|
|
||||||
:hexdigest => "b0b105360de759960ab4f35298e116e295d8e7c1",
|
|
||||||
}, {
|
|
||||||
:key => "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19",
|
|
||||||
:data => "\xcd" * 50,
|
|
||||||
:hexdigest => "d5ca862f4d21d5e610e18b4cf1beb97a4365ecf4",
|
|
||||||
}, {
|
|
||||||
:key => "\x0c" * 20,
|
|
||||||
:data => "Test With Truncation",
|
|
||||||
:hexdigest => "7619693978f91d90539ae786500ff3d8e0518e39",
|
|
||||||
}, {
|
|
||||||
:key => "\xaa" * 80,
|
|
||||||
:data => "Test Using Larger Than Block-Size Key - Hash Key First",
|
|
||||||
:hexdigest => "6466ca07ac5eac29e1bd523e5ada7605b791fd8b",
|
|
||||||
}, {
|
|
||||||
:key => "\xaa" * 80,
|
|
||||||
:data => "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data",
|
|
||||||
:hexdigest => "69ea60798d71616cce5fd0871e23754cd75d5a0a",
|
|
||||||
}
|
|
||||||
]
|
|
||||||
end
|
|
||||||
end
|
|
||||||
Загрузка…
Ссылка в новой задаче