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 /devel/electron35/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 'devel/electron35/files/patch-chrome_browser_webauthn_enclave__manager.cc')
| -rw-r--r-- | devel/electron35/files/patch-chrome_browser_webauthn_enclave__manager.cc | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/devel/electron35/files/patch-chrome_browser_webauthn_enclave__manager.cc b/devel/electron35/files/patch-chrome_browser_webauthn_enclave__manager.cc deleted file mode 100644 index 9d9ffbe93bcb..000000000000 --- a/devel/electron35/files/patch-chrome_browser_webauthn_enclave__manager.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/webauthn/enclave_manager.cc.orig 2025-03-24 20:50:14 UTC -+++ chrome/browser/webauthn/enclave_manager.cc -@@ -710,7 +710,7 @@ std::string UserVerifyingLabelToString(crypto::UserVer - - std::string UserVerifyingLabelToString(crypto::UserVerifyingKeyLabel label) { - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - return label; - #else - return std::string("placeholder"); -@@ -720,7 +720,7 @@ std::optional<crypto::UserVerifyingKeyLabel> UserVerif - std::optional<crypto::UserVerifyingKeyLabel> UserVerifyingKeyLabelFromString( - std::string saved_label) { - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) - return saved_label; - #else - return std::nullopt; |