summaryrefslogtreecommitdiff
path: root/lib/webrick/httpauth
diff options
context:
space:
mode:
Diffstat (limited to 'lib/webrick/httpauth')
-rw-r--r--lib/webrick/httpauth/basicauth.rb1
-rw-r--r--lib/webrick/httpauth/digestauth.rb5
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