rubysl-digest 2.0.3 → 2.0.7

data/ext/rubysl/digest/digest.h

@@ -2,24 +2,25 @@
 
   digest.h - header file for ruby digest modules
 
-  $Author: shyouhei $
+  $Author$
   created at: Fri May 25 08:54:56 JST 2001
 
 
   Copyright (C) 2001-2006 Akinori MUSHA
 
   $RoughId: digest.h,v 1.3 2001/07/13 15:38:27 knu Exp $
-  $Id: digest.h 11708 2007-02-12 23:01:19Z shyouhei $
+  $Id$
 
 ************************************************/
 
 #include "ruby.h"
+#include "ruby/encoding.h"
 
-#define RUBY_DIGEST_API_VERSION	2
+#define RUBY_DIGEST_API_VERSION	3
 
-typedef void (*rb_digest_hash_init_func_t)(void *);
+typedef int (*rb_digest_hash_init_func_t)(void *);
 typedef void (*rb_digest_hash_update_func_t)(void *, unsigned char *, size_t);
-typedef void (*rb_digest_hash_finish_func_t)(void *, unsigned char *);
+typedef int (*rb_digest_hash_finish_func_t)(void *, unsigned char *);
 
 typedef struct {
     int api_version;
@@ -30,3 +31,22 @@ typedef struct {
     rb_digest_hash_update_func_t update_func;
     rb_digest_hash_finish_func_t finish_func;
 } rb_digest_metadata_t;
+
+#define DEFINE_UPDATE_FUNC_FOR_UINT(name) \
+void \
+rb_digest_##name##_update(void *ctx, unsigned char *ptr, size_t size) \
+{ \
+    const unsigned int stride = 16384; \
+ \
+    for (; size > stride; size -= stride, ptr += stride) { \
+	name##_Update(ctx, ptr, stride); \
+    } \
+    if (size > 0) name##_Update(ctx, ptr, size); \
+}
+
+#define DEFINE_FINISH_FUNC_FROM_FINAL(name) \
+int \
+rb_digest_##name##_finish(void *ctx, unsigned char *ptr) \
+{ \
+    return name##_Final(ptr, ctx); \
+}

data/ext/rubysl/digest/digest_conf.rb

@@ -0,0 +1,28 @@
+def digest_conf(name, hdr = name, funcs = nil)
+  unless with_config("bundled-#{name}")
+    cc = with_config("common-digest")
+    if cc == true or /\b#{name}\b/ =~ cc
+      if File.exist?("#$srcdir/#{name}cc.h") and
+        have_header("CommonCrypto/CommonDigest.h")
+        $defs << "-D#{name.upcase}_USE_COMMONDIGEST"
+        return :commondigest
+      end
+    end
+
+    dir_config("openssl")
+    pkg_config("openssl")
+    require File.expand_path('../../openssl/deprecation', __FILE__)
+    if have_library("crypto")
+      funcs ||= name.upcase
+      funcs = Array(funcs)
+      hdr = "openssl/#{hdr}.h"
+      if funcs.all? {|func| OpenSSL.check_func("#{func}_Transform", hdr)} &&
+         funcs.all? {|func| have_type("#{func}_CTX", hdr)}
+        $defs << "-D#{name.upcase}_USE_OPENSSL"
+        return :ossl
+      end
+    end
+  end
+  $objs << "#{name}.#{$OBJEXT}"
+  return
+end

data/ext/rubysl/digest/extconf.rb

@@ -4,7 +4,7 @@
 require "mkmf"
 
 $INSTALLFILES = {
-  "digest.h" => "$(RUBYARCHDIR)"
+  "digest.h" => "$(HDRDIR)"
 }
 
 create_makefile("digest/digest")

data/ext/rubysl/digest/md5/extconf.rb

@@ -1,29 +1,19 @@
+# -*- coding: us-ascii -*-
 # $RoughId: extconf.rb,v 1.3 2001/08/14 19:54:51 knu Exp $
 # $Id$
 
 require "mkmf"
+require File.expand_path("../../digest_conf", __FILE__)
 
 $defs << "-DHAVE_CONFIG_H"
 $INCFLAGS << " -I$(srcdir)/.."
 
 $objs = [ "md5init.#{$OBJEXT}" ]
 
-dir_config("openssl")
-
-if !with_config("bundled-md5") &&
-    have_library("crypto") && have_header("openssl/md5.h")
-  $objs << "md5ossl.#{$OBJEXT}"
-
-else
-  $objs << "md5.#{$OBJEXT}"
-end
+digest_conf("md5")
 
 have_header("sys/cdefs.h")
 
-have_header("inttypes.h")
-
-have_header("unistd.h")
-
 $preload = %w[digest]
 
 create_makefile("digest/md5/md5")

data/ext/rubysl/digest/md5/md5.c

@@ -49,10 +49,9 @@
 
 /*$OrigId: md5c.c,v 1.2 2001/03/26 08:57:14 matz Exp $ */
 /*$RoughId: md5.c,v 1.2 2001/07/13 19:48:41 knu Exp $ */
-/*$Id: md5.c 18459 2008-08-09 23:15:08Z nobu $ */
+/*$Id$ */
 
 #include "md5.h"
-#include <string.h>
 
 #ifdef TEST
 /*
@@ -60,8 +59,9 @@
  * The test program should print out the same values as given in section
  * A.5 of RFC 1321, reproduced below.
  */
+#include <string.h>
 int
-main()
+main(void)
 {
     static const char *const test[7*2] = {
 	"", "d41d8cd98f00b204e9800998ecf8427e",
@@ -102,7 +102,7 @@ main()
 #ifdef COMPUTE_T_VALUES
 #include <math.h>
 int
-main()
+main(void)
 {
     int i;
     for (i = 1; i <= 64; ++i) {
@@ -350,7 +350,7 @@ md5_process(MD5_CTX *pms, const uint8_t *data /*[64]*/)
     pms->state[3] += d;
 }
 
-void
+int
 MD5_Init(MD5_CTX *pms)
 {
     pms->count[0] = pms->count[1] = 0;
@@ -358,6 +358,7 @@ MD5_Init(MD5_CTX *pms)
     pms->state[1] = /*0xefcdab89*/ T_MASK ^ 0x10325476;
     pms->state[2] = /*0x98badcfe*/ T_MASK ^ 0x67452301;
     pms->state[3] = 0x10325476;
+    return 1;
 }
 
 void
@@ -368,7 +369,7 @@ MD5_Update(MD5_CTX *pms, const uint8_t *data, size_t nbytes)
     size_t offset = (pms->count[0] >> 3) & 63;
     uint32_t nbits = (uint32_t)(nbytes << 3);
 
-    if (nbytes <= 0)
+    if (nbytes == 0)
 	return;
 
     /* Update the message length. */
@@ -398,7 +399,7 @@ MD5_Update(MD5_CTX *pms, const uint8_t *data, size_t nbytes)
 	memcpy(pms->buffer, p, left);
 }
 
-void
+int
 MD5_Finish(MD5_CTX *pms, uint8_t *digest)
 {
     static const uint8_t pad[64] = {
@@ -419,4 +420,5 @@ MD5_Finish(MD5_CTX *pms, uint8_t *digest)
     MD5_Update(pms, data, 8);
     for (i = 0; i < 16; ++i)
 	digest[i] = (uint8_t)(pms->state[i >> 2] >> ((i & 3) << 3));
+    return 1;
 }

data/ext/rubysl/digest/md5/md5.h

@@ -41,7 +41,7 @@
 
 /* $OrigId: md5.h,v 1.2 2001/03/26 08:57:14 matz Exp $ */
 /* $RoughId: md5.h,v 1.3 2002/02/24 08:14:31 knu Exp $ */
-/* $Id: md5.h 11708 2007-02-12 23:01:19Z shyouhei $ */
+/* $Id$ */
 
 #ifndef MD5_INCLUDED
 #  define MD5_INCLUDED
@@ -69,9 +69,9 @@ typedef struct md5_state_s {
 #define MD5_Finish	rb_Digest_MD5_Finish
 #endif
 
-void	MD5_Init _((MD5_CTX *pms));
+int	MD5_Init _((MD5_CTX *pms));
 void	MD5_Update _((MD5_CTX *pms, const uint8_t *data, size_t nbytes));
-void	MD5_Finish _((MD5_CTX *pms, uint8_t *digest));
+int	MD5_Finish _((MD5_CTX *pms, uint8_t *digest));
 
 #define MD5_BLOCK_LENGTH		64
 #define MD5_DIGEST_LENGTH		16

data/ext/rubysl/digest/md5/md5cc.h

@@ -0,0 +1,12 @@
+#define COMMON_DIGEST_FOR_OPENSSL 1
+#include <CommonCrypto/CommonDigest.h>
+
+#define MD5_BLOCK_LENGTH	CC_MD5_BLOCK_BYTES
+
+static DEFINE_UPDATE_FUNC_FOR_UINT(MD5);
+static DEFINE_FINISH_FUNC_FROM_FINAL(MD5);
+
+#undef MD5_Update
+#undef MD5_Finish
+#define MD5_Update rb_digest_MD5_update
+#define MD5_Finish rb_digest_MD5_finish

data/ext/rubysl/digest/md5/md5init.c

@@ -1,9 +1,11 @@
 /* $RoughId: md5init.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */
-/* $Id: md5init.c 19020 2008-09-01 07:48:53Z nobu $ */
+/* $Id$ */
 
 #include "digest.h"
-#if defined(HAVE_OPENSSL_MD5_H)
+#if defined(MD5_USE_OPENSSL)
 #include "md5ossl.h"
+#elif defined(MD5_USE_COMMONDIGEST)
+#include "md5cc.h"
 #else
 #include "md5.h"
 #endif
@@ -24,15 +26,20 @@ static const rb_digest_metadata_t md5 = {
  * RFC1321.
  */
 void
-Init_md5()
+Init_md5(void)
 {
     VALUE mDigest, cDigest_Base, cDigest_MD5;
 
+#if 0
+    mDigest = rb_define_module("Digest"); /* let rdoc know */
+#endif
     mDigest = rb_path2class("Digest");
     cDigest_Base = rb_path2class("Digest::Base");
 
     cDigest_MD5 = rb_define_class_under(mDigest, "MD5", cDigest_Base);
 
-    rb_ivar_set(cDigest_MD5, rb_intern("metadata"),
-      Data_Wrap_Struct(rb_cObject, 0, 0, (void *)&md5));
+#undef RUBY_UNTYPED_DATA_WARNING
+#define RUBY_UNTYPED_DATA_WARNING 0
+    rb_iv_set(cDigest_MD5, "metadata",
+	      Data_Wrap_Struct(0, 0, 0, (void *)&md5));
 }

data/ext/rubysl/digest/md5/md5ossl.h

@@ -1,4 +1,4 @@
-/* $Id: md5ossl.h 11708 2007-02-12 23:01:19Z shyouhei $ */
+/* $Id$ */
 
 #ifndef MD5OSSL_H_INCLUDED
 #define MD5OSSL_H_INCLUDED
@@ -8,6 +8,8 @@
 
 #define MD5_BLOCK_LENGTH	MD5_CBLOCK
 
-void MD5_Finish(MD5_CTX *pctx, unsigned char *digest);
+static DEFINE_FINISH_FUNC_FROM_FINAL(MD5);
+#undef MD5_Finish
+#define MD5_Finish rb_digest_MD5_finish
 
 #endif

data/ext/rubysl/digest/rmd160/extconf.rb

@@ -1,28 +1,19 @@
+# -*- coding: us-ascii -*-
 # $RoughId: extconf.rb,v 1.3 2001/08/14 19:54:51 knu Exp $
 # $Id$
 
 require "mkmf"
+require File.expand_path("../../digest_conf", __FILE__)
 
 $defs << "-DNDEBUG" << "-DHAVE_CONFIG_H"
 $INCFLAGS << " -I$(srcdir)/.."
 
 $objs = [ "rmd160init.#{$OBJEXT}" ]
 
-dir_config("openssl")
-
-if !with_config("bundled-rmd160") &&
-    have_library("crypto") && have_header("openssl/ripemd.h")
-  $objs << "rmd160ossl.#{$OBJEXT}"
-else
-  $objs << "rmd160.#{$OBJEXT}"
-end
+digest_conf("rmd160", "ripemd", "RIPEMD160")
 
 have_header("sys/cdefs.h")
 
-have_header("inttypes.h")
-
-have_header("unistd.h")
-
 $preload = %w[digest]
 
 create_makefile("digest/rmd160/rmd160")

data/ext/rubysl/digest/rmd160/rmd160.c

@@ -1,6 +1,6 @@
 /*	$NetBSD: rmd160.c,v 1.1.1.1 2001/03/06 11:21:05 agc Exp $	*/
 /*	$RoughId: rmd160.c,v 1.2 2001/07/13 19:49:10 knu Exp $	*/
-/*	$Id: rmd160.c 11708 2007-02-12 23:01:19Z shyouhei $	*/
+/*	$Id$	*/
 
 /********************************************************************\
  *
@@ -124,7 +124,7 @@
 
 /********************************************************************/
 
-void
+int
 RMD160_Init(RMD160_CTX *context)
 {
 
@@ -138,6 +138,7 @@ RMD160_Init(RMD160_CTX *context)
 	context->state[4] = 0xc3d2e1f0U;
 	context->length[0] = context->length[1] = 0;
 	context->buflen = 0;
+	return 1;
 }
 
 /********************************************************************/
@@ -362,16 +363,20 @@ RMD160_Update(RMD160_CTX *context, const uint8_t *data, size_t nbytes)
 	_DIAGASSERT(data != NULL);
 
 	/* update length[] */
+#if SIZEOF_SIZE_T * CHAR_BIT > 32
+	context->length[1] += (uint32_t)((context->length[0] + nbytes) >> 32);
+#else
 	if (context->length[0] + nbytes < context->length[0])
 		context->length[1]++;		/* overflow to msb of length */
-	context->length[0] += nbytes;
+#endif
+	context->length[0] += (uint32_t)nbytes;
 
 	(void)memset(X, 0, sizeof(X));
 
         if ( context->buflen + nbytes < 64 )
         {
                 (void)memcpy(context->bbuffer + context->buflen, data, nbytes);
-                context->buflen += nbytes;
+                context->buflen += (uint32_t)nbytes;
         }
         else
         {
@@ -401,14 +406,14 @@ RMD160_Update(RMD160_CTX *context, const uint8_t *data, size_t nbytes)
                 /*
                  * Put last bytes from data into context's buffer
                  */
-                context->buflen = nbytes & 63;
+                context->buflen = (uint32_t)nbytes & 63;
                 memcpy(context->bbuffer, data + (64 * i) + ofs, context->buflen);
         }
 }
 
 /********************************************************************/
 
-void
+int
 RMD160_Finish(RMD160_CTX *context, uint8_t digest[20])
 {
 	uint32_t i;
@@ -452,6 +457,7 @@ RMD160_Finish(RMD160_CTX *context, uint8_t digest[20])
 			digest[i + 3] = (context->state[i>>2] >> 24);
 		}
 	}
+	return 1;
 }
 
 /************************ end of file rmd160.c **********************/

data/ext/rubysl/digest/rmd160/rmd160.h

@@ -1,6 +1,6 @@
 /*	$NetBSD: rmd160.h,v 1.2 2000/07/07 10:47:06 ad Exp $	*/
 /*	$RoughId: rmd160.h,v 1.3 2002/02/24 08:14:31 knu Exp $	*/
-/*	$Id: rmd160.h 11708 2007-02-12 23:01:19Z shyouhei $	*/
+/*	$Id$	*/
 
 /********************************************************************\
  *
@@ -43,10 +43,10 @@ typedef struct {
 #endif
 
 __BEGIN_DECLS
-void	RMD160_Init _((RMD160_CTX *));
+int	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_Finish _((RMD160_CTX *, uint8_t[20]));
 __END_DECLS
 
 #define RMD160_BLOCK_LENGTH             64

data/ext/rubysl/digest/rmd160/rmd160init.c

@@ -1,8 +1,8 @@
 /* $RoughId: rmd160init.c,v 1.3 2001/07/13 20:00:43 knu Exp $ */
-/* $Id: rmd160init.c 19020 2008-09-01 07:48:53Z nobu $ */
+/* $Id$ */
 
 #include "digest.h"
-#if defined(HAVE_OPENSSL_RIPEMD_H)
+#if defined(RMD160_USE_OPENSSL)
 #include "rmd160ossl.h"
 #else
 #include "rmd160.h"
@@ -24,15 +24,20 @@ static const rb_digest_metadata_t rmd160 = {
  * Bosselaers, and Bart Preneel.
  */
 void
-Init_rmd160()
+Init_rmd160(void)
 {
     VALUE mDigest, cDigest_Base, cDigest_RMD160;
 
+#if 0
+    mDigest = rb_define_module("Digest"); /* let rdoc know */
+#endif
     mDigest = rb_path2class("Digest");
     cDigest_Base = rb_path2class("Digest::Base");
 
     cDigest_RMD160 = rb_define_class_under(mDigest, "RMD160", cDigest_Base);
 
-    rb_ivar_set(cDigest_RMD160, rb_intern("metadata"),
-      Data_Wrap_Struct(rb_cObject, 0, 0, (void *)&rmd160));
+#undef RUBY_UNTYPED_DATA_WARNING
+#define RUBY_UNTYPED_DATA_WARNING 0
+    rb_iv_set(cDigest_RMD160, "metadata",
+	      Data_Wrap_Struct(0, 0, 0, (void *)&rmd160));
 }