From 33b2ccf041cd584230c48e59218d44b45bd95dc3 Mon Sep 17 00:00:00 2001
From: knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 11 Dec 2006 02:59:43 +0000
Subject: * ext/digest/sha2/lib/sha2.rb: Moved one level up from under   the
 superfluous subdirectory digest/.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11377 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                          |  5 +++
 ext/digest/sha2/lib/digest/sha2.rb | 73 --------------------------------------
 ext/digest/sha2/lib/sha2.rb        | 73 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 78 insertions(+), 73 deletions(-)
 delete mode 100644 ext/digest/sha2/lib/digest/sha2.rb
 create mode 100644 ext/digest/sha2/lib/sha2.rb

diff --git a/ChangeLog b/ChangeLog
index 4f614d6dba..f10efa34a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 11 11:51:10 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/sha2/lib/sha2.rb: Moved one level up from under
+	  the superfluous subdirectory digest/.
+
 Mon Dec 11 11:46:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* variable.c (rb_define_const): typo fixed.
diff --git a/ext/digest/sha2/lib/digest/sha2.rb b/ext/digest/sha2/lib/digest/sha2.rb
deleted file mode 100644
index 52dd639f9b..0000000000
--- a/ext/digest/sha2/lib/digest/sha2.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-#--
-# sha2.rb - defines Digest::SHA2 class which wraps up the SHA256,
-#           SHA384, and SHA512 classes.
-#++
-# Copyright (c) 2006 Akinori MUSHA <knu@iDaemons.org>
-#
-# All rights reserved.  You can redistribute and/or modify it under the same
-# terms as Ruby.
-#
-#   $Id$
-
-require 'digest'
-
-module Digest
-  #
-  # A meta digest provider class for SHA256, SHA384 and SHA512.
-  #
-  class SHA2 < Digest::Class
-    # call-seq:
-    #     Digest::SHA2.new(bitlen = 256) -> digest_obj
-    #
-    # Creates a new SHA2 hash object with a given bit length.
-    def initialize(bitlen = 256)
-      case bitlen
-      when 256
-        @sha2 = Digest::SHA256.new
-      when 384
-        @sha2 = Digest::SHA384.new
-      when 512
-        @sha2 = Digest::SHA512.new
-      else
-        raise ArgumentError, "unsupported bit length: %s" % bitlen.inspect
-      end
-      @bitlen = bitlen
-    end
-
-    # :nodoc:
-    def reset
-      @sha2.reset
-      self
-    end
-
-    # :nodoc:
-    def update(str)
-      @sha2.update(str)
-      self
-    end
-    alias << update
-
-    def finish
-      @sha2.digest!
-    end
-    private :finish
-
-    def block_length
-      @sha2.block_length
-    end
-
-    def digest_length
-      @sha2.digest_length
-    end
-
-    # :nodoc:
-    def initialize_copy(other)
-      @sha2 = other.instance_eval { @sha2.clone }
-    end
-
-    # :nodoc:
-    def inspect
-      "#<%s:%d %s>" % [self.class.name, @bitlen, hexdigest]
-    end
-  end
-end
diff --git a/ext/digest/sha2/lib/sha2.rb b/ext/digest/sha2/lib/sha2.rb
new file mode 100644
index 0000000000..52dd639f9b
--- /dev/null
+++ b/ext/digest/sha2/lib/sha2.rb
@@ -0,0 +1,73 @@
+#--
+# sha2.rb - defines Digest::SHA2 class which wraps up the SHA256,
+#           SHA384, and SHA512 classes.
+#++
+# Copyright (c) 2006 Akinori MUSHA <knu@iDaemons.org>
+#
+# All rights reserved.  You can redistribute and/or modify it under the same
+# terms as Ruby.
+#
+#   $Id$
+
+require 'digest'
+
+module Digest
+  #
+  # A meta digest provider class for SHA256, SHA384 and SHA512.
+  #
+  class SHA2 < Digest::Class
+    # call-seq:
+    #     Digest::SHA2.new(bitlen = 256) -> digest_obj
+    #
+    # Creates a new SHA2 hash object with a given bit length.
+    def initialize(bitlen = 256)
+      case bitlen
+      when 256
+        @sha2 = Digest::SHA256.new
+      when 384
+        @sha2 = Digest::SHA384.new
+      when 512
+        @sha2 = Digest::SHA512.new
+      else
+        raise ArgumentError, "unsupported bit length: %s" % bitlen.inspect
+      end
+      @bitlen = bitlen
+    end
+
+    # :nodoc:
+    def reset
+      @sha2.reset
+      self
+    end
+
+    # :nodoc:
+    def update(str)
+      @sha2.update(str)
+      self
+    end
+    alias << update
+
+    def finish
+      @sha2.digest!
+    end
+    private :finish
+
+    def block_length
+      @sha2.block_length
+    end
+
+    def digest_length
+      @sha2.digest_length
+    end
+
+    # :nodoc:
+    def initialize_copy(other)
+      @sha2 = other.instance_eval { @sha2.clone }
+    end
+
+    # :nodoc:
+    def inspect
+      "#<%s:%d %s>" % [self.class.name, @bitlen, hexdigest]
+    end
+  end
+end
-- 
cgit v1.2.3