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

Side by Side Diff: trunk/src/remoting/protocol/auth_util.cc

Issue 101113004: Revert 239759 "The comment in base64.h implies that base::Base64..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years 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 | Annotate | Revision Log
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 "remoting/protocol/auth_util.h" 5 #include "remoting/protocol/auth_util.h"
6 6
7 #include "base/base64.h" 7 #include "base/base64.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "crypto/hmac.h" 10 #include "crypto/hmac.h"
11 #include "crypto/sha2.h" 11 #include "crypto/sha2.h"
12 #include "net/base/net_errors.h" 12 #include "net/base/net_errors.h"
13 #include "net/socket/ssl_socket.h" 13 #include "net/socket/ssl_socket.h"
14 14
15 namespace remoting { 15 namespace remoting {
16 namespace protocol { 16 namespace protocol {
17 17
18 const char kClientAuthSslExporterLabel[] = 18 const char kClientAuthSslExporterLabel[] =
19 "EXPORTER-remoting-channel-auth-client"; 19 "EXPORTER-remoting-channel-auth-client";
20 const char kHostAuthSslExporterLabel[] = 20 const char kHostAuthSslExporterLabel[] =
21 "EXPORTER-remoting-channel-auth-host"; 21 "EXPORTER-remoting-channel-auth-host";
22 22
23 const char kSslFakeHostName[] = "chromoting"; 23 const char kSslFakeHostName[] = "chromoting";
24 24
25 std::string GenerateSupportAuthToken(const std::string& jid, 25 std::string GenerateSupportAuthToken(const std::string& jid,
26 const std::string& access_code) { 26 const std::string& access_code) {
27 std::string sha256 = crypto::SHA256HashString(jid + " " + access_code); 27 std::string sha256 = crypto::SHA256HashString(jid + " " + access_code);
28 std::string sha256_base64; 28 std::string sha256_base64;
29 base::Base64Encode(sha256, &sha256_base64); 29 if (!base::Base64Encode(sha256, &sha256_base64)) {
30 LOG(FATAL) << "Failed to encode auth token";
31 }
30 return sha256_base64; 32 return sha256_base64;
31 } 33 }
32 34
33 bool VerifySupportAuthToken(const std::string& jid, 35 bool VerifySupportAuthToken(const std::string& jid,
34 const std::string& access_code, 36 const std::string& access_code,
35 const std::string& auth_token) { 37 const std::string& auth_token) {
36 std::string expected_token = 38 std::string expected_token =
37 GenerateSupportAuthToken(jid, access_code); 39 GenerateSupportAuthToken(jid, access_code);
38 return expected_token == auth_token; 40 return expected_token == auth_token;
39 } 41 }
(...skipping 21 matching lines...) Expand all
61 if (!response.Sign(shared_secret, out_bytes, kAuthDigestLength)) { 63 if (!response.Sign(shared_secret, out_bytes, kAuthDigestLength)) {
62 NOTREACHED() << "HMAC::Sign failed"; 64 NOTREACHED() << "HMAC::Sign failed";
63 return std::string(); 65 return std::string();
64 } 66 }
65 67
66 return std::string(out_bytes, out_bytes + kAuthDigestLength); 68 return std::string(out_bytes, out_bytes + kAuthDigestLength);
67 } 69 }
68 70
69 } // namespace protocol 71 } // namespace protocol
70 } // namespace remoting 72 } // namespace remoting
OLDNEW
« no previous file with comments | « trunk/src/remoting/host/token_validator_factory_impl.cc ('k') | trunk/src/remoting/protocol/authenticator_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698