From fbac3547dfebf146adea3cf76ca0077401a1a9a1 Mon Sep 17 00:00:00 2001
From: Paul van Tilburg <paul.van.tilburg@leftclick.eu>
Date: Wed, 21 Mar 2018 13:18:13 +0100
Subject: [PATCH] Start the nonce count with value 1

The nounce count contains the number of times the client has sent the nonce
value in the request (see Section 3.2.2 of RFC 2617).  This should start
with 1 because the initial request contains the value.

Also, IIS 10.0 seems to ignore requests where nonce count is 0 and resends
a "HTTP 401 Authorization Required" response.
---
 lib/net/http/digest_auth.rb       |  2 +-
 test/test_net_http_digest_auth.rb | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/net/http/digest_auth.rb b/lib/net/http/digest_auth.rb
index 98feecb..945cd35 100644
--- a/lib/net/http/digest_auth.rb
+++ b/lib/net/http/digest_auth.rb
@@ -56,7 +56,7 @@ class Error < RuntimeError; end
 
   def initialize ignored = :ignored
     mon_initialize
-    @nonce_count = -1
+    @nonce_count = 0
   end
 
   ##
diff --git a/test/test_net_http_digest_auth.rb b/test/test_net_http_digest_auth.rb
index 7fe0e61..9ddc3f3 100644
--- a/test/test_net_http_digest_auth.rb
+++ b/test/test_net_http_digest_auth.rb
@@ -23,9 +23,9 @@ def setup
       'qop=auth',
       'uri="/"',
       'nonce="4107baa081a592a6021660200000cd6c5686ff5f579324402b374d83e2c9"',
-      'nc=00000000',
+      'nc=00000001',
       'cnonce="9ea5ff3bd34554a4165bbdc1df91dcff"',
-      'response="67be92a5e7b38d08679957db04f5da04"'
+      'response="1f5f0cd1588690c1303737f081c0b9bb"'
     ]
 
     @da = Net::HTTP::DigestAuth.new
@@ -42,8 +42,8 @@ def expected
   def test_auth_header
     assert_equal expected, @da.auth_header(@uri, @header, 'GET')
 
-    @expected[6] = 'nc=00000001'
-    @expected[8] = 'response="1f5f0cd1588690c1303737f081c0b9bb"'
+    @expected[6] = 'nc=00000002'
+    @expected[8] = 'response="87b2331cd957b9808b7adb3b7e94f1e0"'
 
     assert_equal expected, @da.auth_header(@uri, @header, 'GET')
   end
@@ -60,7 +60,7 @@ def test_auth_header_no_qop
     @expected[8] = 'response="32f6ca1631ccf7c42a8075deff44e470"'
     @expected.delete 'qop=auth'
     @expected.delete 'cnonce="9ea5ff3bd34554a4165bbdc1df91dcff"'
-    @expected.delete 'nc=00000000'
+    @expected.delete 'nc=00000001'
 
     assert_equal expected, @da.auth_header(@uri, @header, 'GET')
   end
@@ -73,7 +73,7 @@ def test_auth_header_opaque
   end
 
   def test_auth_header_post
-    @expected[8] = 'response="d82219e1e5430b136bbae1670fa51d48"'
+    @expected[8] = 'response="ac8b098bbcc6ac9ab5a67f68d4fc63b6"'
 
     assert_equal expected, @da.auth_header(@uri, @header, 'POST')
   end
@@ -82,14 +82,14 @@ def test_auth_header_sess
     @header << ', algorithm=MD5-sess'
 
     @expected[2] = 'algorithm=MD5-sess'
-    @expected[8] = 'response="c22c5bd9112a86ca78ddc1ae772daeeb"'
+    @expected[8] = 'response="00f9b983fa8e9b7bfbec1d8954a1b7ff"'
 
     assert_equal expected, @da.auth_header(@uri, @header, 'GET')
   end
 
   def test_auth_header_sha1
     @expected[2] = 'algorithm=SHA1'
-    @expected[8] = 'response="2cb62fc18f7b0ebdc34543f896bb77686b4115e4"'
+    @expected[8] = 'response="84ce3d3d0093369e99fec4b18727b070c089ab98"'
 
     @header << 'algorithm=SHA1'