4 files changed, 13 insertions, 17 deletions
diff --git a/lib/openssl/cipher.rb b/lib/openssl/cipher.rb
index a69d5ac8..92e5e9f8 100644
--- a/lib/openssl/cipher.rb
+++ b/lib/openssl/cipher.rb
@@ -51,9 +51,11 @@ module OpenSSL
       return str
     end
 
-    # This class is only provided for backwards compatibility.  Use OpenSSL::Cipher in the future.
-    class Cipher < Cipher
-      # add warning
-    end
+    # Deprecated.
+    #
+    # This class is only provided for backwards compatibility.
+    # Use OpenSSL::Cipher.
+    class Cipher < Cipher; end
+    deprecate_constant :Cipher
   end # Cipher
 end # OpenSSL
diff --git a/lib/openssl/digest.rb b/lib/openssl/digest.rb
index 1a236cc7..97ccbc95 100644
--- a/lib/openssl/digest.rb
+++ b/lib/openssl/digest.rb
@@ -53,15 +53,9 @@ module OpenSSL
     # Deprecated.
     #
     # This class is only provided for backwards compatibility.
-    class Digest < Digest # :nodoc:
-      # Deprecated.
-      #
-      # See OpenSSL::Digest.new
-      def initialize(*args)
-        warn('Digest::Digest is deprecated; use Digest')
-        super(*args)
-      end
-    end
+    # Use OpenSSL::Digest instead.
+    class Digest < Digest; end # :nodoc:
+    deprecate_constant :Digest
 
   end # Digest
 
diff --git a/sample/cipher.rb b/sample/cipher.rb
index 58b10d60..a33dc3e9 100644
--- a/sample/cipher.rb
+++ b/sample/cipher.rb
@@ -10,7 +10,7 @@ def crypt_by_password(alg, pass, salt, text)
   puts
 
   puts "--Encrypting--"
-  enc = OpenSSL::Cipher::Cipher.new(alg)
+  enc = OpenSSL::Cipher.new(alg)
   enc.encrypt
   enc.pkcs5_keyivgen(pass, salt)
   cipher =  enc.update(text)
@@ -19,7 +19,7 @@ def crypt_by_password(alg, pass, salt, text)
   puts
 
   puts "--Decrypting--"
-  dec = OpenSSL::Cipher::Cipher.new(alg)
+  dec = OpenSSL::Cipher.new(alg)
   dec.decrypt
   dec.pkcs5_keyivgen(pass, salt)
   plain =  dec.update(cipher)
diff --git a/test/test_cipher.rb b/test/test_cipher.rb
index ec14f467..81b4c45d 100644
--- a/test/test_cipher.rb
+++ b/test/test_cipher.rb
@@ -24,7 +24,7 @@ class OpenSSL::TestCipher < OpenSSL::TestCase
   end
 
   def setup
-    @c1 = OpenSSL::Cipher::Cipher.new("DES-EDE3-CBC")
+    @c1 = OpenSSL::Cipher.new("DES-EDE3-CBC")
     @c2 = OpenSSL::Cipher::DES.new(:EDE3, "CBC")
     @key = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
     @iv = "\0\0\0\0\0\0\0\0"
@@ -118,7 +118,7 @@ class OpenSSL::TestCipher < OpenSSL::TestCase
     OpenSSL::Cipher.ciphers.each{|name|
       next if /netbsd/ =~ RUBY_PLATFORM && /idea|rc5/i =~ name
       begin
-        assert_kind_of(OpenSSL::Cipher::Cipher, OpenSSL::Cipher::Cipher.new(name))
+        assert_kind_of(OpenSSL::Cipher, OpenSSL::Cipher.new(name))
       rescue OpenSSL::Cipher::CipherError => e
         next if /wrap/ =~ name and e.message == 'wrap mode not allowed'
         raise