Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(608)

Side by Side Diff: net/websockets/websocket_handshake_challenge.cc

Issue 683033003: Rename websocket_handshake_handler.* to websocket_handshake_challenge.* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change calling convention of ComputeSecWebSocketAccept Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/websockets/websocket_handshake_handler.h" 5 #include "net/websockets/websocket_handshake_challenge.h"
6 6
7 #include "base/base64.h" 7 #include "base/base64.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
wtc 2014/11/12 20:11:55 Nit: "base/logging.h" can be omitted.
Adam Rice 2014/11/13 15:24:38 Thanks. Done.
9 #include "base/sha1.h" 9 #include "base/sha1.h"
10 #include "net/websockets/websocket_handshake_constants.h" 10 #include "net/websockets/websocket_handshake_constants.h"
11 11
12 namespace net { 12 namespace net {
13 13
14 void ComputeSecWebSocketAccept(const std::string& key, 14 std::string ComputeSecWebSocketAccept(const std::string& key) {
15 std::string* accept) { 15 std::string accept;
16 DCHECK(accept); 16 std::string hash = base::SHA1HashString(key + websockets::kWebSocketGuid);
17 17 base::Base64Encode(hash, &accept);
18 std::string hash = 18 return accept;
19 base::SHA1HashString(key + websockets::kWebSocketGuid);
20 base::Base64Encode(hash, accept);
21 } 19 }
22 20
23 } // namespace net 21 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698