1 files changed, 43 insertions, 17 deletions
diff --git a/ext/digest/md5/md5init.c b/ext/digest/md5/md5init.c
index 2acca16a46..c919060587 100644
--- a/ext/digest/md5/md5init.c
+++ b/ext/digest/md5/md5init.c
@@ -1,35 +1,61 @@
 /* $RoughId: md5init.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */
 /* $Id$ */
 
-#include "digest.h"
-#if defined(HAVE_OPENSSL_MD5_H)
-#include "md5ossl.h"
+#include <ruby/ruby.h>
+#include "../digest.h"
+#include "../defs.h"
+#if defined(MD5_USE_COMMONDIGEST)
+#include "md5cc.h"
 #else
 #include "md5.h"
 #endif
 
-static algo_t md5 = {
+static const rb_digest_metadata_t md5 = {
+    RUBY_DIGEST_API_VERSION,
     MD5_DIGEST_LENGTH,
+    MD5_BLOCK_LENGTH,
     sizeof(MD5_CTX),
-    (hash_init_func_t)MD5_Init,
-    (hash_update_func_t)MD5_Update,
-    (hash_end_func_t)MD5_End,
-    (hash_final_func_t)MD5_Final,
-    (hash_equal_func_t)MD5_Equal,
+    (rb_digest_hash_init_func_t)MD5_Init,
+    (rb_digest_hash_update_func_t)MD5_Update,
+    (rb_digest_hash_finish_func_t)MD5_Finish,
 };
 
+/*
+ * Document-class: Digest::MD5 < Digest::Base
+ * A class for calculating message digests using the MD5
+ * Message-Digest Algorithm by RSA Data Security, Inc., described in
+ * RFC1321.
+ *
+ * MD5 calculates a digest of 128 bits (16 bytes).
+ *
+ * == Examples
+ *  require 'digest'
+ *
+ *  # Compute a complete digest
+ *  Digest::MD5.hexdigest 'abc'      #=> "90015098..."
+ *
+ *  # Compute digest by chunks
+ *  md5 = Digest::MD5.new               # =>#<Digest::MD5>
+ *  md5.update "ab"
+ *  md5 << "c"                           # alias for #update
+ *  md5.hexdigest                        # => "90015098..."
+ *
+ *  # Use the same object to compute another digest
+ *  md5.reset
+ *  md5 << "message"
+ *  md5.hexdigest                        # => "78e73102..."
+ */
 void
-Init_md5()
+Init_md5(void)
 {
     VALUE mDigest, cDigest_Base, cDigest_MD5;
 
-    rb_require("digest.so");
-
-    mDigest = rb_path2class("Digest");
-    cDigest_Base = rb_path2class("Digest::Base");
+#if 0
+    mDigest = rb_define_module("Digest"); /* let rdoc know */
+#endif
+    mDigest = rb_digest_namespace();
+    cDigest_Base = rb_const_get(mDigest, rb_intern_const("Base"));
 
     cDigest_MD5 = rb_define_class_under(mDigest, "MD5", cDigest_Base);
-
-    rb_cvar_set(cDigest_MD5, rb_intern("metadata"),
-		Data_Wrap_Struct(rb_cObject, 0, 0, &md5), Qtrue);
+    rb_iv_set(cDigest_MD5, "metadata", rb_digest_make_metadata(&md5));
 }