diff options
author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-11-01 05:01:43 +0000 |
---|---|---|
committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-11-01 05:01:43 +0000 |
commit | d26d61815947639d5a9f26cd495f135877e00750 (patch) | |
tree | 0f726e99112b363a7e9720fa50b339d7c72c1fc6 /ext | |
parent | 8c61368971e229740b6773b91a48932842e7a39d (diff) |
* ext/digest/lib/digest/hmac.rb (Digest::HMAC::update): Minor
optimization.
* ext/digest/digest.c (rb_digest_instance_equal): Allow comparing
a digest instance with another of a different class.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@11254 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/digest/digest.c | 8 | ||||
-rw-r--r-- | ext/digest/lib/digest/hmac.rb | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ext/digest/digest.c b/ext/digest/digest.c index 5d58149b50..c4a58cf3f6 100644 --- a/ext/digest/digest.c +++ b/ext/digest/digest.c @@ -286,16 +286,16 @@ rb_digest_instance_inspect(VALUE self) * digest_obj == string -> boolean * * If a string is given, checks whether it is equal to the hex-encoded - * hash value of the digest object. If another instance of the same - * digest class is given, checks whether they have the same hash - * value. Otherwise returns false. + * hash value of the digest object. If another digest instance is + * given, checks whether they have the same hash value. Otherwise + * returns false. */ static VALUE rb_digest_instance_equal(VALUE self, VALUE other) { VALUE str1, str2; - if (rb_obj_class(self) == rb_obj_class(other)) { + if (rb_obj_is_kind_of(other, rb_mDigest_Instance) == Qtrue) { str1 = rb_digest_instance_digest(0, 0, self); str2 = rb_digest_instance_digest(0, 0, other); } else { diff --git a/ext/digest/lib/digest/hmac.rb b/ext/digest/lib/digest/hmac.rb index a6415a156a..b42fef98d6 100644 --- a/ext/digest/lib/digest/hmac.rb +++ b/ext/digest/lib/digest/hmac.rb @@ -69,7 +69,8 @@ module Digest end def update(text) - @md.reset.update(@opad + @md.digest(@ipad + text)) + # @md is reset when digest() returns + @md.update(@opad + @md.digest(@ipad + text)) self end |