2 files changed, 28 insertions, 2 deletions
diff --git a/ext/digest/digest.c b/ext/digest/digest.c
index 4f3b462240..29ac36fc99 100644
--- a/ext/digest/digest.c
+++ b/ext/digest/digest.c
@@ -234,8 +234,8 @@ rb_digest_instance_hexdigest(int argc, VALUE *argv, VALUE self)
  * call-seq:
  *     digest_obj.hexdigest! -> string
  *
- * Returns the resulting hash value and resets the digest to the
- * initial state.
+ * Returns the resulting hash value in a hex-encoded form and resets
+ * the digest to the initial state.
  */
 static VALUE
 rb_digest_instance_hexdigest_bang(VALUE self)
diff --git a/ext/digest/lib/digest.rb b/ext/digest/lib/digest.rb
index e42f984f95..857501722e 100644
--- a/ext/digest/lib/digest.rb
+++ b/ext/digest/lib/digest.rb
@@ -28,6 +28,13 @@ module Digest
     def self.file(name)
       new.file(name)
     end
+
+    # Returns the base64 encoded hash value of a given _string_.  The
+    # return value is properly padded with '=' and contains no line
+    # feeds.
+    def self.base64digest(str, *args)
+      [digest(str, *args)].pack('m0')
+    end
   end
 
   module Instance
@@ -42,6 +49,25 @@ module Digest
       }
       self
     end
+
+    # If none is given, returns the resulting hash value of the digest
+    # in a base64 encoded form, keeping the digest's state.
+    #
+    # If a _string_ is given, returns the hash value for the given
+    # _string_ in a base64 encoded form, resetting the digest to the
+    # initial state before and after the process.
+    #
+    # In either case, the return value is properly padded with '=' and
+    # contains no line feeds.
+    def base64digest(str = nil)
+      [str ? digest(str) : digest].pack('m0')
+    end
+
+    # Returns the resulting hash value and resets the digest to the
+    # initial state.
+    def base64digest!
+      [digest!].pack('m0')
+    end
   end
 end