diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /www/iridium/files/patch-chrome_browser_webauthn_enclave__manager.cc | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'www/iridium/files/patch-chrome_browser_webauthn_enclave__manager.cc')
| -rw-r--r-- | www/iridium/files/patch-chrome_browser_webauthn_enclave__manager.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/www/iridium/files/patch-chrome_browser_webauthn_enclave__manager.cc b/www/iridium/files/patch-chrome_browser_webauthn_enclave__manager.cc index 8e62dbca8994..1110a453a3a2 100644 --- a/www/iridium/files/patch-chrome_browser_webauthn_enclave__manager.cc +++ b/www/iridium/files/patch-chrome_browser_webauthn_enclave__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/webauthn/enclave_manager.cc.orig 2025-09-11 13:19:19 UTC +--- chrome/browser/webauthn/enclave_manager.cc.orig 2025-11-06 10:11:34 UTC +++ chrome/browser/webauthn/enclave_manager.cc -@@ -709,7 +709,7 @@ base::flat_set<GaiaId> GetGaiaIDs( +@@ -779,7 +779,7 @@ base::flat_set<GaiaId> GetGaiaIDs( std::string UserVerifyingLabelToString(crypto::UserVerifyingKeyLabel label) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ return label; #else return std::string("placeholder"); -@@ -719,7 +719,7 @@ std::string UserVerifyingLabelToString(crypto::UserVer +@@ -789,7 +789,7 @@ std::string UserVerifyingLabelToString(crypto::UserVer std::optional<crypto::UserVerifyingKeyLabel> UserVerifyingKeyLabelFromString( std::string saved_label) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ |