mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
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
This commit is contained in:
parent
a6f026ab78
commit
ed8cd81f79
4 changed files with 12 additions and 19 deletions
|
@ -17,8 +17,8 @@ class CGI
|
||||||
end
|
end
|
||||||
|
|
||||||
def Session::create_new_id
|
def Session::create_new_id
|
||||||
require 'md5'
|
require 'digest/md5'
|
||||||
md5 = MD5::new
|
md5 = Digest::MD5::new
|
||||||
md5.update(String(Time::now))
|
md5.update(String(Time::now))
|
||||||
md5.update(String(rand(0)))
|
md5.update(String(rand(0)))
|
||||||
md5.update(String($$))
|
md5.update(String($$))
|
||||||
|
|
|
@ -656,7 +656,7 @@ Struct
|
||||||
=end
|
=end
|
||||||
|
|
||||||
require "socket"
|
require "socket"
|
||||||
require "md5"
|
require "digest/md5"
|
||||||
|
|
||||||
module Net
|
module Net
|
||||||
class IMAP
|
class IMAP
|
||||||
|
@ -2323,8 +2323,7 @@ module Net
|
||||||
|
|
||||||
def hmac_md5(text, key)
|
def hmac_md5(text, key)
|
||||||
if key.length > 64
|
if key.length > 64
|
||||||
md5 = MD5.new(key)
|
key = Digest::MD5.digest(key)
|
||||||
key = md5.digest
|
|
||||||
end
|
end
|
||||||
|
|
||||||
k_ipad = key + "\0" * (64 - key.length)
|
k_ipad = key + "\0" * (64 - key.length)
|
||||||
|
@ -2334,15 +2333,9 @@ module Net
|
||||||
k_opad[i] ^= 0x5c
|
k_opad[i] ^= 0x5c
|
||||||
end
|
end
|
||||||
|
|
||||||
md5 = MD5.new
|
digest = Digest::MD5.digest(k_ipad + text)
|
||||||
md5.update(k_ipad)
|
|
||||||
md5.update(text)
|
|
||||||
digest = md5.digest
|
|
||||||
|
|
||||||
md5 = MD5.new
|
return Digest::MD5.hexdigest(k_opad + digest)
|
||||||
md5.update(k_opad)
|
|
||||||
md5.update(digest)
|
|
||||||
return md5.hexdigest
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
add_authenticator "CRAM-MD5", CramMD5Authenticator
|
add_authenticator "CRAM-MD5", CramMD5Authenticator
|
||||||
|
|
|
@ -288,7 +288,7 @@ A class of mail which exists on POP server.
|
||||||
=end
|
=end
|
||||||
|
|
||||||
require 'net/protocol'
|
require 'net/protocol'
|
||||||
require 'md5'
|
require 'digest/md5'
|
||||||
|
|
||||||
|
|
||||||
module Net
|
module Net
|
||||||
|
@ -572,7 +572,7 @@ module Net
|
||||||
critical {
|
critical {
|
||||||
@socket.writeline sprintf( 'APOP %s %s',
|
@socket.writeline sprintf( 'APOP %s %s',
|
||||||
account,
|
account,
|
||||||
MD5.new(@stamp + pass).hexdigest )
|
Digest::MD5.hexdigest(@stamp + pass) )
|
||||||
check_reply_auth
|
check_reply_auth
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
|
@ -192,7 +192,7 @@ SMTP objects raise these exceptions:
|
||||||
=end
|
=end
|
||||||
|
|
||||||
require 'net/protocol'
|
require 'net/protocol'
|
||||||
require 'md5'
|
require 'digest/md5'
|
||||||
|
|
||||||
|
|
||||||
module Net
|
module Net
|
||||||
|
@ -318,7 +318,7 @@ module Net
|
||||||
critical {
|
critical {
|
||||||
rep = getok( 'AUTH CRAM-MD5', ContinueCode )
|
rep = getok( 'AUTH CRAM-MD5', ContinueCode )
|
||||||
challenge = rep.msg.split(' ')[1].unpack('m')[0]
|
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)
|
isecret = secret + "\0" * (64 - secret.size)
|
||||||
osecret = isecret.dup
|
osecret = isecret.dup
|
||||||
|
@ -326,8 +326,8 @@ module Net
|
||||||
isecret[i] ^= 0x36
|
isecret[i] ^= 0x36
|
||||||
osecret[i] ^= 0x5c
|
osecret[i] ^= 0x5c
|
||||||
end
|
end
|
||||||
tmp = MD5.new( isecret + challenge ).digest
|
tmp = Digest::MD5.digest( isecret + challenge )
|
||||||
tmp = MD5.new( osecret + tmp ).hexdigest
|
tmp = Digest::MD5.hexdigest( osecret + tmp )
|
||||||
|
|
||||||
getok [user + ' ' + tmp].pack('m').chomp
|
getok [user + ' ' + tmp].pack('m').chomp
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue