From ed8cd81f7961f326d36e907d2fa29b2c2fac1fa1 Mon Sep 17 00:00:00 2001
From: knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 1 Dec 2001 14:07:01 +0000
Subject: [PATCH] Reflect the update of the MD5 module which is now
 Digest::MD5.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@1868 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/cgi/session.rb |  4 ++--
 lib/net/imap.rb    | 15 ++++-----------
 lib/net/pop.rb     |  4 ++--
 lib/net/smtp.rb    |  8 ++++----
 4 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/lib/cgi/session.rb b/lib/cgi/session.rb
index 9187dbf82d..6173d51558 100644
--- a/lib/cgi/session.rb
+++ b/lib/cgi/session.rb
@@ -17,8 +17,8 @@ class CGI
     end
 
     def Session::create_new_id
-      require 'md5'
-      md5 = MD5::new
+      require 'digest/md5'
+      md5 = Digest::MD5::new
       md5.update(String(Time::now))
       md5.update(String(rand(0)))
       md5.update(String($$))
diff --git a/lib/net/imap.rb b/lib/net/imap.rb
index ea064d2552..1a84d20cd3 100644
--- a/lib/net/imap.rb
+++ b/lib/net/imap.rb
@@ -656,7 +656,7 @@ Struct
 =end
 
 require "socket"
-require "md5"
+require "digest/md5"
 
 module Net
   class IMAP
@@ -2323,8 +2323,7 @@ module Net
 
       def hmac_md5(text, key)
 	if key.length > 64
-	  md5 = MD5.new(key)
-	  key = md5.digest
+	  key = Digest::MD5.digest(key)
 	end
 
 	k_ipad = key + "\0" * (64 - key.length)
@@ -2334,15 +2333,9 @@ module Net
 	  k_opad[i] ^= 0x5c
 	end
 
-	md5 = MD5.new
-	md5.update(k_ipad)
-	md5.update(text)
-	digest = md5.digest
+	digest = Digest::MD5.digest(k_ipad + text)
 
-	md5 = MD5.new
-	md5.update(k_opad)
-	md5.update(digest)
-	return md5.hexdigest
+	return Digest::MD5.hexdigest(k_opad + digest)
       end
     end
     add_authenticator "CRAM-MD5", CramMD5Authenticator
diff --git a/lib/net/pop.rb b/lib/net/pop.rb
index 32394acf00..78a0b47222 100644
--- a/lib/net/pop.rb
+++ b/lib/net/pop.rb
@@ -288,7 +288,7 @@ A class of mail which exists on POP server.
 =end
 
 require 'net/protocol'
-require 'md5'
+require 'digest/md5'
 
 
 module Net
@@ -572,7 +572,7 @@ module Net
       critical {
         @socket.writeline sprintf( 'APOP %s %s',
                                    account,
-                                   MD5.new(@stamp + pass).hexdigest )
+                                   Digest::MD5.hexdigest(@stamp + pass) )
         check_reply_auth
       }
     end
diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb
index f60cc6edb7..dfd7f33d8e 100644
--- a/lib/net/smtp.rb
+++ b/lib/net/smtp.rb
@@ -192,7 +192,7 @@ SMTP objects raise these exceptions:
 =end
 
 require 'net/protocol'
-require 'md5'
+require 'digest/md5'
 
 
 module Net
@@ -318,7 +318,7 @@ module Net
       critical {
         rep = getok( 'AUTH CRAM-MD5', ContinueCode )
         challenge = rep.msg.split(' ')[1].unpack('m')[0]
-        secret = MD5.new( secret ).digest if secret.size > 64
+        secret = Digest::MD5.digest( secret ) if secret.size > 64
 
         isecret = secret + "\0" * (64 - secret.size)
         osecret = isecret.dup
@@ -326,8 +326,8 @@ module Net
           isecret[i] ^= 0x36
           osecret[i] ^= 0x5c
         end
-        tmp = MD5.new( isecret + challenge ).digest
-        tmp = MD5.new( osecret + tmp ).hexdigest
+        tmp = Digest::MD5.digest( isecret + challenge )
+        tmp = Digest::MD5.hexdigest( osecret + tmp )
 
         getok [user + ' ' + tmp].pack('m').chomp
       }