Replace all use of the VERIFY macro.

webrtc/base/httpcommon.cc

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 661 matching lines @@
   pos = static_cast<size_t>(temp_pos);
   while ((pos < len) && isspace(static_cast<unsigned char>(line[pos]))) ++pos;
   message.assign(line + pos, len - pos);
   return HE_NONE;
 }
 
 //////////////////////////////////////////////////////////////////////
 // Http Authentication
 //////////////////////////////////////////////////////////////////////
 
-#define TEST_DIGEST 0
-#if TEST_DIGEST
-/*
-const char * const DIGEST_CHALLENGE =
-  "Digest realm=\"testrealm@host.com\","
-  " qop=\"auth,auth-int\","
-  " nonce=\"dcd98b7102dd2f0e8b11d0f600bfb0c093\","
-  " opaque=\"5ccc069c403ebaf9f0171e9517f40e41\"";
-const char * const DIGEST_METHOD = "GET";
-const char * const DIGEST_URI =
-  "/dir/index.html";;
-const char * const DIGEST_CNONCE =
-  "0a4f113b";
-const char * const DIGEST_RESPONSE =
-  "6629fae49393a05397450978507c4ef1";
-//user_ = "Mufasa";
-//pass_ = "Circle Of Life";
-*/
-const char * const DIGEST_CHALLENGE =
-  "Digest realm=\"Squid proxy-caching web server\","
-  " nonce=\"Nny4QuC5PwiSDixJ\","
-  " qop=\"auth\","
-  " stale=false";
-const char * const DIGEST_URI =
-  "/";
-const char * const DIGEST_CNONCE =
-  "6501d58e9a21cee1e7b5fec894ded024";
-const char * const DIGEST_RESPONSE =
-  "edffcb0829e755838b073a4a42de06bc";
-#endif
-
 std::string quote(const std::string& str) {
   std::string result;
   result.push_back('"');
   for (size_t i=0; i<str.size(); ++i) {
     if ((str[i] == '"') || (str[i] == '\\'))
       result.push_back('\\');
     result.push_back(str[i]);
   }
   result.push_back('"');
   return result;
@@ skipping 18 matching lines @@
 };
 #endif // WEBRTC_WIN
 
 HttpAuthResult HttpAuthenticate(
   const char * challenge, size_t len,
   const SocketAddress& server,
   const std::string& method, const std::string& uri,
   const std::string& username, const CryptString& password,
   HttpAuthContext *& context, std::string& response, std::string& auth_method)
 {
-#if TEST_DIGEST
-  challenge = DIGEST_CHALLENGE;
-  len = strlen(challenge);
-#endif
-
   HttpAttributeList args;
   HttpParseAttributes(challenge, len, args);
   HttpHasNthAttribute(args, 0, &auth_method, NULL);
 
   if (context && (context->auth_method != auth_method))
     return HAR_IGNORE;
 
   // BASIC
   if (_stricmp(auth_method.c_str(), "basic") == 0) {
     if (context)
@@ skipping 23 matching lines @@
   // DIGEST
   if (_stricmp(auth_method.c_str(), "digest") == 0) {
     if (context)
       return HAR_CREDENTIALS; // Bad credentials
     if (username.empty())
       return HAR_CREDENTIALS; // Missing credentials
 
     context = new HttpAuthContext(auth_method);
 
     std::string cnonce, ncount;
-#if TEST_DIGEST
-    method = DIGEST_METHOD;
-    uri    = DIGEST_URI;
-    cnonce = DIGEST_CNONCE;
-#else
     char buffer[256];
     sprintf(buffer, "%d", static_cast<int>(time(0)));
     cnonce = MD5(buffer);
-#endif
     ncount = "00000001";
 
     std::string realm, nonce, qop, opaque;
     HttpHasAttribute(args, "realm", &realm);
     HttpHasAttribute(args, "nonce", &nonce);
     bool has_qop = HttpHasAttribute(args, "qop", &qop);
     bool has_opaque = HttpHasAttribute(args, "opaque", &opaque);
 
     // TODO: convert sensitive to be secure buffer
     //std::string A1 = username + ":" + realm + ":" + password;
@@ skipping 12 matching lines @@
       middle = nonce + ":" + ncount + ":" + cnonce + ":" + qop;
     } else {
       middle = nonce;
     }
     std::string HA1 = MD5(sensitive);
     memset(sensitive, 0, len);
     delete [] sensitive;
     std::string HA2 = MD5(A2);
     std::string dig_response = MD5(HA1 + ":" + middle + ":" + HA2);
 
-#if TEST_DIGEST
-    RTC_DCHECK(strcmp(dig_response.c_str(), DIGEST_RESPONSE) == 0);
-#endif
-
     std::stringstream ss;
     ss << auth_method;
     ss << " username=" << quote(username);
     ss << ", realm=" << quote(realm);
     ss << ", nonce=" << quote(nonce);
     ss << ", uri=" << quote(uri);
     if (has_qop) {
       ss << ", qop=" << qop;
       ss << ", nc="  << ncount;
       ss << ", cnonce=" << quote(cnonce);
@@ skipping 192 matching lines @@
   }
 #endif
 #endif // WEBRTC_WIN
 
   return HAR_IGNORE;
 }
 
 //////////////////////////////////////////////////////////////////////
 
 } // namespace rtc