diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-18 16:54:58 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-18 16:54:58 +0000 |
| commit | 0ad1d2d6eb6f1e4edff72dabb8e2b2f9ba051f88 (patch) | |
| tree | 34d232d10e6415100d5b660317c23a14e157ba83 /net/websockets | |
| parent | dac096590a0f00f124eb71b12ff6a32cee439fca (diff) | |
| download | chromium_src-0ad1d2d6eb6f1e4edff72dabb8e2b2f9ba051f88.zip chromium_src-0ad1d2d6eb6f1e4edff72dabb8e2b2f9ba051f88.tar.gz chromium_src-0ad1d2d6eb6f1e4edff72dabb8e2b2f9ba051f88.tar.bz2 | |
base: Put md5.* into base namespace.
BUG=89274
TEST=None
R=evan@chromium.org
Review URL: http://codereview.chromium.org/7395021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92861 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/websockets')
| -rw-r--r-- | net/websockets/websocket_handshake.cc | 4 | ||||
| -rw-r--r-- | net/websockets/websocket_handshake_handler.cc | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/net/websockets/websocket_handshake.cc b/net/websockets/websocket_handshake.cc index 07c7a85..789c6df 100644 --- a/net/websockets/websocket_handshake.cc +++ b/net/websockets/websocket_handshake.cc @@ -260,8 +260,8 @@ void WebSocketHandshake::Parameter::GetExpectedResponse(uint8 *expected) const { SetChallengeNumber(&challenge[0], number_1_); SetChallengeNumber(&challenge[4], number_2_); memcpy(&challenge[8], key_3_.data(), kKey3Size); - MD5Digest digest; - MD5Sum(challenge, kExpectedResponseSize, &digest); + base::MD5Digest digest; + base::MD5Sum(challenge, kExpectedResponseSize, &digest); memcpy(expected, digest.a, kExpectedResponseSize); } diff --git a/net/websockets/websocket_handshake_handler.cc b/net/websockets/websocket_handshake_handler.cc index 4a424ca..398e084 100644 --- a/net/websockets/websocket_handshake_handler.cc +++ b/net/websockets/websocket_handshake_handler.cc @@ -435,8 +435,8 @@ bool WebSocketHandshakeResponseHandler::ParseResponseInfo( response_message += "\r\n"; if (protocol_version_ < kMinVersionOfHybiNewHandshake) { - MD5Digest digest; - MD5Sum(challenge.data(), challenge.size(), &digest); + base::MD5Digest digest; + base::MD5Sum(challenge.data(), challenge.size(), &digest); const char* digest_data = reinterpret_cast<char*>(digest.a); response_message.append(digest_data, sizeof(digest.a)); @@ -490,8 +490,8 @@ bool WebSocketHandshakeResponseHandler::ParseResponseHeaderBlock( response_message += "\r\n"; if (protocol_version_ < kMinVersionOfHybiNewHandshake) { - MD5Digest digest; - MD5Sum(challenge.data(), challenge.size(), &digest); + base::MD5Digest digest; + base::MD5Sum(challenge.data(), challenge.size(), &digest); const char* digest_data = reinterpret_cast<char*>(digest.a); response_message.append(digest_data, sizeof(digest.a)); |