Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix 3642: Add support for touchID webauthn #5539

Merged
merged 1 commit into from
May 15, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// Copyright (c) 2020 The Brave Authors. All rights reserved.
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this file,
// you can obtain one at http://mozilla.org/MPL/2.0/.

#include "chrome/browser/webauthn/chrome_authenticator_request_delegate.h"

#if defined(OS_MACOSX)
#include "base/mac/foundation_util.h"

#define BRAVE_WEBAUTHN_KEYCHAIN_ACCESS_GROUP \
const std::vector<std::string>& kBraveKeyChainAccessParts = { \
"KL8N8XSYF4", base::mac::BaseBundleID(), "webauthn"}; \
return TouchIdAuthenticatorConfig{ \
base::JoinString(kBraveKeyChainAccessParts, "."), \
TouchIdMetadataSecret(profile)};
#else
#define BRAVE_WEBAUTHN_KEYCHAIN_ACCESS_GROUP void(0)
#endif

#include "../../../../../chrome/browser/webauthn/chrome_authenticator_request_delegate.cc"
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc b/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc
index d5697d1cdace1539f34d4398588a17416ade9957..e012c34f16d7eb27452aac291025eacd0cbd134e 100644
--- a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc
+++ b/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc
@@ -376,6 +376,7 @@ std::string TouchIdMetadataSecret(Profile* profile) {
ChromeAuthenticatorRequestDelegate::TouchIdAuthenticatorConfig
ChromeAuthenticatorRequestDelegate::TouchIdAuthenticatorConfigForProfile(
Profile* profile) {
+ BRAVE_WEBAUTHN_KEYCHAIN_ACCESS_GROUP
return TouchIdAuthenticatorConfig{kTouchIdKeychainAccessGroup,
TouchIdMetadataSecret(profile)};
}