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

Unified Diff: extensions/browser/api/cast_channel/cast_auth_util.cc

Issue 687733004: Implement crypto signature verification routines using OpenSSL. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix const truncation warning (raised by Win builds.) 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 side-by-side diff with in-line comments
Download patch
Index: extensions/browser/api/cast_channel/cast_auth_util.cc
diff --git a/extensions/browser/api/cast_channel/cast_auth_util.cc b/extensions/browser/api/cast_channel/cast_auth_util.cc
index a9dabded6c50453c5ded8db2d29b583573f1603a..68cb9f321fccacae26cb9724966405155d1c8735 100644
--- a/extensions/browser/api/cast_channel/cast_auth_util.cc
+++ b/extensions/browser/api/cast_channel/cast_auth_util.cc
@@ -17,6 +17,41 @@ namespace {
const char* const kParseErrorPrefix = "Failed to parse auth message: ";
+// Extracts an embedded DeviceAuthMessage payload from an auth challenge reply
+// message.
+AuthResult ParseAuthMessage(const CastMessage& challenge_reply,
+ DeviceAuthMessage* auth_message) {
+ if (challenge_reply.payload_type() != CastMessage_PayloadType_BINARY) {
+ return AuthResult::CreateWithParseError(
+ "Wrong payload type in challenge reply",
+ AuthResult::ERROR_WRONG_PAYLOAD_TYPE);
+ }
+ if (!challenge_reply.has_payload_binary()) {
+ return AuthResult::CreateWithParseError(
+ "Payload type is binary but payload_binary field not set",
+ AuthResult::ERROR_NO_PAYLOAD);
+ }
+ if (!auth_message->ParseFromString(challenge_reply.payload_binary())) {
+ return AuthResult::CreateWithParseError(
+ "Cannot parse binary payload into DeviceAuthMessage",
+ AuthResult::ERROR_PAYLOAD_PARSING_FAILED);
+ }
+
+ VLOG(1) << "Auth message: " << AuthMessageToString(*auth_message);
+
+ if (auth_message->has_error()) {
+ return AuthResult::CreateWithParseError(
+ "Auth message error: " +
+ base::IntToString(auth_message->error().error_type()),
+ AuthResult::ERROR_MESSAGE_ERROR);
+ }
+ if (!auth_message->has_response()) {
+ return AuthResult::CreateWithParseError(
+ "Auth message has no response field", AuthResult::ERROR_NO_RESPONSE);
+ }
+ return AuthResult();
+}
+
} // namespace
AuthResult::AuthResult() : error_type(ERROR_NONE), nss_error_code(0) {
@@ -46,36 +81,26 @@ AuthResult::AuthResult(const std::string& error_message,
nss_error_code(nss_error_code) {
}
-AuthResult ParseAuthMessage(const CastMessage& challenge_reply,
- DeviceAuthMessage* auth_message) {
- if (challenge_reply.payload_type() != CastMessage_PayloadType_BINARY) {
- return AuthResult::CreateWithParseError(
- "Wrong payload type in challenge reply",
- AuthResult::ERROR_WRONG_PAYLOAD_TYPE);
- }
- if (!challenge_reply.has_payload_binary()) {
- return AuthResult::CreateWithParseError(
- "Payload type is binary but payload_binary field not set",
- AuthResult::ERROR_NO_PAYLOAD);
- }
- if (!auth_message->ParseFromString(challenge_reply.payload_binary())) {
- return AuthResult::CreateWithParseError(
- "Cannot parse binary payload into DeviceAuthMessage",
- AuthResult::ERROR_PAYLOAD_PARSING_FAILED);
+AuthResult AuthenticateChallengeReply(const CastMessage& challenge_reply,
+ const std::string& peer_cert) {
+ if (peer_cert.empty()) {
+ AuthResult result = AuthResult::CreateWithParseError(
+ "Peer cert was empty.", AuthResult::ERROR_PEER_CERT_EMPTY);
+ return result;
}
- VLOG(1) << "Auth message: " << AuthMessageToString(*auth_message);
-
- if (auth_message->has_error()) {
- return AuthResult::CreateWithParseError(
- "Auth message error: " +
- base::IntToString(auth_message->error().error_type()),
- AuthResult::ERROR_MESSAGE_ERROR);
+ DeviceAuthMessage auth_message;
+ AuthResult result = ParseAuthMessage(challenge_reply, &auth_message);
+ if (!result.success()) {
+ return result;
}
- if (!auth_message->has_response()) {
- return AuthResult::CreateWithParseError(
- "Auth message has no response field", AuthResult::ERROR_NO_RESPONSE);
+
+ const AuthResponse& response = auth_message.response();
+ result = VerifyCredentials(response, peer_cert);
+ if (!result.success()) {
+ return result;
}
+
return AuthResult();
}
« no previous file with comments | « extensions/browser/api/cast_channel/cast_auth_util.h ('k') | extensions/browser/api/cast_channel/cast_auth_util_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698