* ext/digest/digest.c (rb_digest_base_alloc,

  rb_digest_base_equal): Simplify the equality check and just
  compare resulted digests since state-level equality should
  not be significant.

* ext/digest/digest.h: Ditto.

* ext/digest/*/*.[ch]: Ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11131 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

5 files changed, 0 insertions, 25 deletions

diff --git a/ext/digest/rmd160/rmd160.c b/ext/digest/rmd160/rmd160.c
index 64ec0fb427..88918728cd 100644
--- a/ext/digest/rmd160/rmd160.c
+++ b/ext/digest/rmd160/rmd160.c
@@ -454,11 +454,4 @@ RMD160_Finish(RMD160_CTX *context, uint8_t digest[20])
 	}
 }
 
-int RMD160_Equal(RMD160_CTX* pctx1, RMD160_CTX* pctx2) {
-	return pctx1->buflen == pctx2->buflen
-		&& memcmp(pctx1->length, pctx2->length, sizeof(pctx1->length)) == 0
-		&& memcmp(pctx1->state, pctx2->state, sizeof(pctx1->state)) == 0
-		&& memcmp(pctx1->bbuffer, pctx2->bbuffer, sizeof(pctx1->bbuffer)) == 0;
-}
-
 /************************ end of file rmd160.c **********************/
diff --git a/ext/digest/rmd160/rmd160.h b/ext/digest/rmd160/rmd160.h
index ac52fb0ec3..54d1ca9140 100644
--- a/ext/digest/rmd160/rmd160.h
+++ b/ext/digest/rmd160/rmd160.h
@@ -40,7 +40,6 @@ typedef struct {
 #define RMD160_Transform	rb_Digest_RMD160_Transform
 #define RMD160_Update	rb_Digest_RMD160_Update
 #define RMD160_Finish	rb_Digest_RMD160_Finish
-#define RMD160_Equal	rb_Digest_RMD160_Equal
 #endif
 
 __BEGIN_DECLS
@@ -48,7 +47,6 @@ void	RMD160_Init _((RMD160_CTX *));
 void	RMD160_Transform _((uint32_t[5], const uint32_t[16]));
 void	RMD160_Update _((RMD160_CTX *, const uint8_t *, size_t));
 void	RMD160_Finish _((RMD160_CTX *, uint8_t[20]));
-int	RMD160_Equal _((RMD160_CTX *, RMD160_CTX *));
 __END_DECLS
 
 #define RMD160_BLOCK_LENGTH             64
diff --git a/ext/digest/rmd160/rmd160init.c b/ext/digest/rmd160/rmd160init.c
index 08f3f1fd72..896756723b 100644
--- a/ext/digest/rmd160/rmd160init.c
+++ b/ext/digest/rmd160/rmd160init.c
@@ -14,7 +14,6 @@ static algo_t rmd160 = {
     (hash_init_func_t)RMD160_Init,
     (hash_update_func_t)RMD160_Update,
     (hash_finish_func_t)RMD160_Finish,
-    (hash_equal_func_t)RMD160_Equal,
 };
 
 void
diff --git a/ext/digest/rmd160/rmd160ossl.c b/ext/digest/rmd160/rmd160ossl.c
index 247fd04afd..5d8c5ba470 100644
--- a/ext/digest/rmd160/rmd160ossl.c
+++ b/ext/digest/rmd160/rmd160ossl.c
@@ -2,21 +2,7 @@
 
 #include "defs.h"
 #include "rmd160ossl.h"
-#include <assert.h>
-#include <stdlib.h>
 
 void RMD160_Finish(RMD160_CTX *ctx, char *buf) {
 	RIPEMD160_Final(buf, ctx);
 }
-
-int RMD160_Equal(RMD160_CTX* pctx1, RMD160_CTX* pctx2) {
-	return pctx1->num == pctx2->num
-	  && pctx1->A == pctx2->A
-	  && pctx1->B == pctx2->B
-	  && pctx1->C == pctx2->C
-	  && pctx1->D == pctx2->D
-	  && pctx1->E == pctx2->E
-	  && pctx1->Nl == pctx2->Nl
-	  && pctx1->Nh == pctx2->Nh
-	  && memcmp(pctx1->data, pctx2->data, sizeof(pctx1->data)) == 0;
-}
diff --git a/ext/digest/rmd160/rmd160ossl.h b/ext/digest/rmd160/rmd160ossl.h
index ea6bd57cc6..3df38a01c0 100644
--- a/ext/digest/rmd160/rmd160ossl.h
+++ b/ext/digest/rmd160/rmd160ossl.h
@@ -15,6 +15,5 @@
 #define RMD160_DIGEST_LENGTH		RIPEMD160_DIGEST_LENGTH
 
 void RMD160_Finish(RMD160_CTX *ctx, char *buf);
-int RMD160_Equal(RMD160_CTX *pctx1, RMD160_CTX *pctx2);
 
 #endif