nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1551342 - Fix conflicts w/ Android FIDO2 and Rust u2f-hid-rs r=keeler

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D31366

--HG--
extra : moz-landing-system : lando
This commit is contained in:
J.C. Jones 2019-05-16 07:54:44 +00:00
parent 00a73f5055
commit 89a4b84031
1 changed files with 12 additions and 3 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

15
security/manager/ssl/security-prefs.js
View file

@ -121,15 +121,24 @@ pref("security.pki.certificate_transparency.mode", 0);
// Hardware Origin-bound Second Factor Support
pref("security.webauth.u2f", true);
pref("security.webauth.webauthn", true);
// Only one of ["enable_softtoken", "enable_usbtoken",
// "webauthn_enable_android_fido2"] should be true at a time, as the
// softtoken will override the other two.
pref("security.webauth.webauthn_enable_softtoken", false);
#ifdef FENNEC_NIGHTLY
pref("security.webauth.webauthn_enable_android_fido2", true);
#else
pref("security.webauth.webauthn_enable_android_fido2", false);
#endif
// Only one of "enable_softtoken" and "enable_usbtoken" can be true
// at a time.
pref("security.webauth.webauthn_enable_softtoken", false);
#ifdef MOZ_WIDGET_ANDROID
// the Rust usbtoken support does not function on Android
pref("security.webauth.webauthn_enable_usbtoken", false);
#else
pref("security.webauth.webauthn_enable_usbtoken", true);
#endif
pref("security.ssl.errorReporting.enabled", true);
pref("security.ssl.errorReporting.url", "https://incoming.telemetry.mozilla.org/submit/sslreports/");