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/trunk@1868 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
3dfb98cea2
commit
31e15f7606
5 changed files with 14 additions and 21 deletions
|
@ -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($$))
|
||||
|
|
|
@ -2499,8 +2499,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)
|
||||
|
@ -2510,15 +2509,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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
# end
|
||||
|
||||
require "ftools"
|
||||
require "md5"
|
||||
require "digest/md5"
|
||||
|
||||
class PStore
|
||||
class Error < StandardError
|
||||
|
@ -99,7 +99,7 @@ class PStore
|
|||
content = file.read
|
||||
@table = Marshal::load(content)
|
||||
size = content.size
|
||||
md5 = MD5.new(content).digest
|
||||
md5 = Digest::MD5.digest(content)
|
||||
content = nil # unreference huge data
|
||||
else
|
||||
@table = {}
|
||||
|
@ -115,7 +115,7 @@ class PStore
|
|||
if !read_only && !@abort
|
||||
file.rewind
|
||||
content = Marshal::dump(@table)
|
||||
if !md5 || size != content.size || md5 != MD5.new(content).digest
|
||||
if !md5 || size != content.size || md5 != Digest::MD5.digest(content)
|
||||
File::copy @filename, backup
|
||||
begin
|
||||
file.write(content)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue