From 670887f5f697c57a61fa837d4cf505d3d18a0bc6 Mon Sep 17 00:00:00 2001
From: knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 20 Oct 2006 13:01:55 +0000
Subject: * ext/digest/lib/digest/hmac.rb: Complete half-boiled updates.

* ext/digest/sha2/lib/digest/sha2.rb: Fix #initialize_clone().


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11198 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/digest/lib/digest/hmac.rb      | 17 +++++++++--------
 ext/digest/sha2/lib/digest/sha2.rb |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'ext')

diff --git a/ext/digest/lib/digest/hmac.rb b/ext/digest/lib/digest/hmac.rb
index b542a23577..1177884184 100644
--- a/ext/digest/lib/digest/hmac.rb
+++ b/ext/digest/lib/digest/hmac.rb
@@ -63,22 +63,23 @@ module Digest
     end
 
     def initialize_copy(other)
-      @md = @md.new
+      @md = other.instance_eval { @md.clone }
     end
 
     def update(text)
       @md.reset.update(@opad + @md.digest(@ipad + text))
-
       self
     end
 
     def reset
       @md.reset
+      self
     end
 
-    def digest
-      @md.digest
+    def finish
+      @md.digest!
     end
+    private :finish
 
     def digest_length
       @md.digest_length
@@ -89,7 +90,7 @@ module Digest
     end
 
     def inspect
-      sprintf('#<%s: key=%s, digest=%s: %s>', self.class.name, @key.inspect, @tmp_md.reset.inspect, hexdigest());
+      sprintf('#<%s: key=%s, digest=%s>', self.class.name, @key.inspect, @md.inspect.sub(/^\#<(.*)>$/) { $1 });
     end
   end
 end
@@ -105,7 +106,7 @@ require 'test/unit'
 module TM_HMAC
   def test_s_hexdigest
     cases.each { |h|
-      digesters { |d|
+      digesters.each { |d|
         assert_equal(h[:hexdigest], Digest::HMAC.hexdigest(h[:data], h[:key], d))
       }
     }
@@ -113,7 +114,7 @@ module TM_HMAC
 
   def test_hexdigest
     cases.each { |h|
-      digesters { |d|
+      digesters.each { |d|
         hmac = Digest::HMAC.new(h[:key], d)
 
         hmac.update(h[:data])
@@ -125,7 +126,7 @@ module TM_HMAC
 
   def test_reset
     cases.each { |h|
-      digesters { |d|
+      digesters.each { |d|
         hmac = Digest::HMAC.new(h[:key], d)
         hmac.update("test")
         hmac.reset
diff --git a/ext/digest/sha2/lib/digest/sha2.rb b/ext/digest/sha2/lib/digest/sha2.rb
index 683b9904a3..52dd639f9b 100644
--- a/ext/digest/sha2/lib/digest/sha2.rb
+++ b/ext/digest/sha2/lib/digest/sha2.rb
@@ -62,7 +62,7 @@ module Digest
 
     # :nodoc:
     def initialize_copy(other)
-      @sha2 = @sha2.clone
+      @sha2 = other.instance_eval { @sha2.clone }
     end
 
     # :nodoc:
-- 
cgit v1.2.3