diff options
| author | nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-12-18 06:17:33 +0000 |
|---|---|---|
| committer | nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-12-18 06:17:33 +0000 |
| commit | b1dd44e2f34ca7316a14004b362b5c5eb243d599 (patch) | |
| tree | f423dc05f876a735610f4780a87ff97f96b2f081 /lib/webrick/httpauth | |
| parent | 125514995cb83f18464f4b17a7272fe19099e939 (diff) | |
* lib/webrick/httpauth.rb,
lib/webrick/httpauth/{basicauth.rb,digestauth.rb}: use
pack/unpack-template char "m" instead of lib/base64.rb to do base64
encoding/decoding.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7593 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/webrick/httpauth')
| -rw-r--r-- | lib/webrick/httpauth/basicauth.rb | 1 | ||||
| -rw-r--r-- | lib/webrick/httpauth/digestauth.rb | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/webrick/httpauth/basicauth.rb b/lib/webrick/httpauth/basicauth.rb index 926a6b8289..ca5b0e9da3 100644 --- a/lib/webrick/httpauth/basicauth.rb +++ b/lib/webrick/httpauth/basicauth.rb @@ -10,7 +10,6 @@ require 'webrick/config' require 'webrick/httpstatus' require 'webrick/httpauth/authenticator' -require 'base64' module WEBrick module HTTPAuth diff --git a/lib/webrick/httpauth/digestauth.rb b/lib/webrick/httpauth/digestauth.rb index 05a6f192c3..34c43df571 100644 --- a/lib/webrick/httpauth/digestauth.rb +++ b/lib/webrick/httpauth/digestauth.rb @@ -16,7 +16,6 @@ require 'webrick/httpstatus' require 'webrick/httpauth/authenticator' require 'digest/md5' require 'digest/sha1' -require 'base64' module WEBrick module HTTPAuth @@ -254,7 +253,7 @@ module WEBrick def generate_next_nonce(req) now = "%012d" % req.request_time.to_i pk = hexdigest(now, @instance_key)[0,32] - nonce = Base64.encode64(now + ":" + pk).chop # it has 60 length of chars. + nonce = [now + ":" + pk].pack("m*").chop # it has 60 length of chars.?? nonce end @@ -262,7 +261,7 @@ module WEBrick username = auth_req['username'] nonce = auth_req['nonce'] - pub_time, pk = Base64.decode64(nonce).split(":", 2) + pub_time, pk = nonce.unpack("m*")[0].split(":", 2) if (!pub_time || !pk) error("%s: empty nonce is given", username) return false |