* ext/digest/lib/digest/hmac.rb: Fix problems with update

  timing. [Reported by: oss-ruby@technorama.net]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11322 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 2 deletions

diff --git a/ext/digest/lib/digest/hmac.rb b/ext/digest/lib/digest/hmac.rb
index 0aeb6a8b4..a0cc948a6 100644
--- a/ext/digest/lib/digest/hmac.rb
+++ b/ext/digest/lib/digest/hmac.rb
@@ -60,6 +60,7 @@ module Digest
       @key = key.freeze
       @ipad = ipad.inject('') { |s, c| s << c.chr }.freeze
       @opad = opad.inject('') { |s, c| s << c.chr }.freeze
+      @md.update(@ipad)
     end
 
     def initialize_copy(other)
@@ -67,17 +68,20 @@ module Digest
     end
 
     def update(text)
-      # @md is reset when digest() returns
-      @md.update(@opad + @md.digest(@ipad + text))
+      @md.update(text)
       self
     end
 
     def reset
       @md.reset
+      @md.update(@ipad)
       self
     end
 
     def finish
+      d = @md.digest!
+      @md.update(@opad)
+      @md.update(d)
       @md.digest!
     end
     private :finish