diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-29 10:46:47 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-02 12:02:10 +0000 |
| commit | 99677208ff3b216fdfec551fbe548da5520cd6fb (patch) | |
| tree | 476a4865c10320249360e859d8fdd3e01833b03a /chromium/device/fido/fido_device_authenticator.h | |
| parent | c30a6232df03e1efbd9f3b226777b07e087a1122 (diff) | |
| download | qtwebengine-chromium-99677208ff3b216fdfec551fbe548da5520cd6fb.tar.gz | |
BASELINE: Update Chromium to 86.0.4240.124
Change-Id: Ide0ff151e94cd665ae6521a446995d34a9d1d644
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/device/fido/fido_device_authenticator.h')
| -rw-r--r-- | chromium/device/fido/fido_device_authenticator.h | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/chromium/device/fido/fido_device_authenticator.h b/chromium/device/fido/fido_device_authenticator.h index f1fb3a075fc..771df599a00 100644 --- a/chromium/device/fido/fido_device_authenticator.h +++ b/chromium/device/fido/fido_device_authenticator.h @@ -22,6 +22,7 @@ namespace device { struct CtapGetAssertionRequest; +struct CtapGetAssertionOptions; struct CtapMakeCredentialRequest; struct EnumerateRPsResponse; class FidoDevice; @@ -41,6 +42,7 @@ class COMPONENT_EXPORT(DEVICE_FIDO) FidoDeviceAuthenticator void MakeCredential(CtapMakeCredentialRequest request, MakeCredentialCallback callback) override; void GetAssertion(CtapGetAssertionRequest request, + CtapGetAssertionOptions options, GetAssertionCallback callback) override; void GetNextAssertion(GetAssertionCallback callback) override; void GetTouch(base::OnceCallback<void()> callback) override; @@ -99,6 +101,7 @@ class COMPONENT_EXPORT(DEVICE_FIDO) FidoDeviceAuthenticator base::string16 GetDisplayName() const override; ProtocolVersion SupportedProtocol() const override; bool SupportsHMACSecretExtension() const override; + bool SupportsEnterpriseAttestation() const override; const base::Optional<AuthenticatorSupportedOptions>& Options() const override; base::Optional<FidoTransportProtocol> AuthenticatorTransport() const override; bool IsInPairingMode() const override; @@ -107,9 +110,12 @@ class COMPONENT_EXPORT(DEVICE_FIDO) FidoDeviceAuthenticator #if defined(OS_WIN) bool IsWinNativeApiAuthenticator() const override; #endif // defined(OS_WIN) -#if defined(OS_MACOSX) +#if defined(OS_MAC) bool IsTouchIdAuthenticator() const override; -#endif // defined(OS_MACOSX) +#endif // defined(OS_MAC) +#if defined(OS_CHROMEOS) + bool IsChromeOSAuthenticator() const override; +#endif // defined(OS_CHROMEOS) base::WeakPtr<FidoAuthenticator> GetWeakPtr() override; FidoDevice* device() { return device_.get(); } @@ -129,9 +135,15 @@ class COMPONENT_EXPORT(DEVICE_FIDO) FidoDeviceAuthenticator base::Optional<pin::KeyAgreementResponse>)>; void InitializeAuthenticatorDone(base::OnceClosure callback); void GetEphemeralKey(GetEphemeralKeyCallback callback); - void OnHaveEphemeralKey(GetEphemeralKeyCallback callback, - CtapDeviceResponseCode status, - base::Optional<pin::KeyAgreementResponse> key); + void DoGetAssertion(CtapGetAssertionRequest request, + CtapGetAssertionOptions options, + GetAssertionCallback callback); + void OnHaveEphemeralKeyForGetAssertion( + CtapGetAssertionRequest request, + CtapGetAssertionOptions options, + GetAssertionCallback callback, + CtapDeviceResponseCode status, + base::Optional<pin::KeyAgreementResponse> key); void OnHaveEphemeralKeyForGetPINToken( std::string pin, uint8_t permissions, @@ -187,7 +199,6 @@ class COMPONENT_EXPORT(DEVICE_FIDO) FidoDeviceAuthenticator base::Optional<AuthenticatorSupportedOptions> options_; std::unique_ptr<FidoTask> task_; std::unique_ptr<GenericDeviceOperation> operation_; - base::Optional<pin::KeyAgreementResponse> cached_ephemeral_key_; base::WeakPtrFactory<FidoDeviceAuthenticator> weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(FidoDeviceAuthenticator); |