MAC Cookies (patch 4 of N)

net/http/http_mac_signature_unittest.cc

Index: net/http/http_mac_signature_unittest.cc
===================================================================
--- net/http/http_mac_signature_unittest.cc	(revision 85283)
+++ net/http/http_mac_signature_unittest.cc	(working copy)
@@ -11,23 +11,15 @@
   HttpMacSignature signature;
   EXPECT_FALSE(signature.AddStateInfo("exciting-id",
                                       "the-mac-key",
-                                      "bogus-hmac-algorithm",
-                                      "the-issuer"));
+                                      "bogus-hmac-algorithm"));
   EXPECT_FALSE(signature.AddStateInfo("",
                                       "the-mac-key",
-                                      "hmac-sha-1",
-                                      "the-issuer"));
+                                      "hmac-sha-1"));
   EXPECT_FALSE(signature.AddStateInfo("exciting-id",
                                       "",
-                                      "hmac-sha-1",
-                                      "the-issuer"));
+                                      "hmac-sha-1"));
   EXPECT_FALSE(signature.AddStateInfo("exciting-id",
                                       "the-mac-key",
-                                      "",
-                                      "the-issuer"));
-  EXPECT_FALSE(signature.AddStateInfo("exciting-id",
-                                      "the-mac-key",
-                                      "hmac-sha-1",
                                       ""));
 }
 
@@ -45,8 +37,7 @@
   HttpMacSignature signature;
   EXPECT_TRUE(signature.AddStateInfo("dfoi30j0qnf",
                                      "adiMf03j0f3nOenc003r",
-                                     "hmac-sha-1",
-                                     "login.eXampLe.com:443"));
+                                     "hmac-sha-1"));
   EXPECT_TRUE(signature.AddHttpInfo("GeT",
                                     "/pAth?to=%22enlightenment%22&dest=magic",
                                     "eXaMple.com",
@@ -56,10 +47,8 @@
   std::string nonce = "mn4302j0n+32r2/f3r=";
 
   EXPECT_EQ("MAC id=\"dfoi30j0qnf\", "
-            "issuer=\"login.eXampLe.com:443\", "
-            "timestamp=\"239034\", "
-            "nonce=\"mn4302j0n+32r2/f3r=\", "
-            "mac=\"zQWLNI5eHOfY5/wCJ6yzZ8bXDw==\"",
+            "nonce=\"239034:mn4302j0n+32r2/f3r=\", "
+            "mac=\"GrkHtPKzB1m1dCHfa7OCWOw6EQ==\"",
             signature.GenerateHeaderString(timestamp, nonce));
 }
 
@@ -68,8 +57,7 @@
   HttpMacSignature signature;
   EXPECT_TRUE(signature.AddStateInfo("dfoi30j0qnf",
                                      "adiMf03j0f3nOenc003r",
-                                     "hmac-sha-1",
-                                     "login.eXampLe.com:443"));
+                                     "hmac-sha-1"));
   EXPECT_TRUE(signature.AddHttpInfo("GeT",
                                     "/pAth?to=%22enlightenment%22&dest=magic",
                                     "eXaMple.com",
@@ -78,14 +66,13 @@
   std::string timestamp = "239034";
   std::string nonce = "mn4302j0n+32r2/f3r=";
 
-  EXPECT_EQ("dfoi30j0qnf\n"
-            "login.eXampLe.com:443\n"
-            "239034\n"
-            "mn4302j0n+32r2/f3r=\n"
+  EXPECT_EQ("239034:mn4302j0n+32r2/f3r=\n"
             "GET\n"
             "/pAth?to=%22enlightenment%22&dest=magic\n"
             "example.com\n"
-            "80\n",
+            "80\n"
+            "\n"
+            "\n",
             signature.GenerateNormalizedRequest(timestamp, nonce));
 }
 
@@ -93,8 +80,7 @@
   HttpMacSignature signature;
   EXPECT_TRUE(signature.AddStateInfo("dfoi30j0qnf",
                                      "adiMf03j0f3nOenc003r",
-                                     "hmac-sha-1",
-                                     "login.eXampLe.com:443"));
+                                     "hmac-sha-1"));
   EXPECT_TRUE(signature.AddHttpInfo("GeT",
                                      "/pAth?to=%22enlightenment%22&dest=magic",
                                      "eXaMple.com",
@@ -103,7 +89,7 @@
   std::string timestamp = "239034";
   std::string nonce = "mn4302j0n+32r2/f3r=";
 
-  EXPECT_EQ("zQWLNI5eHOfY5/wCJ6yzZ8bXDw==",
+  EXPECT_EQ("GrkHtPKzB1m1dCHfa7OCWOw6EQ==",
             signature.GenerateMAC(timestamp, nonce));
 }
 }