Bug 1548365 - enable intermediate preloading on early beta or earlier r=froydnj,jcj

This also enables using cert_storage for OneCRL, since it and intermediate
preloading both use the same backend.

Differential Revision: https://phabricator.services.mozilla.com/D31345

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Dana Keeler 2019-05-16 00:03:09 +00:00
parent 54ee3bfef9
commit 69828aa2fe
3 changed files with 10 additions and 15 deletions

View File

@ -1691,6 +1691,13 @@ elif test "$EARLY_BETA_OR_EARLIER"; then
fi
AC_SUBST(EARLY_BETA_OR_EARLIER)
if test "$EARLY_BETA_OR_EARLIER"; then
MOZ_NEW_CERT_STORAGE=1
AC_DEFINE(MOZ_NEW_CERT_STORAGE)
fi
AC_SUBST(MOZ_NEW_CERT_STORAGE)
# Allow someone to change MOZ_APP_NAME and MOZ_APP_BASENAME in mozconfig
MOZ_ARG_WITH_STRING(app-name,
[--with-app-name=APPNAME sets MOZ_APP_NAME to APPNAME],

View File

@ -164,10 +164,10 @@ pref("security.pki.mitm_canary_issuer.enabled", true);
pref("security.pki.mitm_detected", false);
// Intermediate CA Preloading settings
#if defined(RELEASE_OR_BETA) || defined(MOZ_WIDGET_ANDROID)
pref("security.remote_settings.intermediates.enabled", false);
#else
#if defined(MOZ_NEW_CERT_STORAGE) && !defined(MOZ_WIDGET_ANDROID)
pref("security.remote_settings.intermediates.enabled", true);
#else
pref("security.remote_settings.intermediates.enabled", false);
#endif
pref("security.remote_settings.intermediates.bucket", "security-state");
pref("security.remote_settings.intermediates.collection", "intermediates");

View File

@ -1775,15 +1775,3 @@ def new_notification_store(milestone):
set_config('MOZ_NEW_NOTIFICATION_STORE', True, when=new_notification_store)
set_define('MOZ_NEW_NOTIFICATION_STORE', True, when=new_notification_store)
# new Cert Storage implementation
# ==============================================================
@depends(milestone)
def new_cert_storage(milestone):
if milestone.is_nightly:
return True
set_config('MOZ_NEW_CERT_STORAGE', True, when=new_cert_storage)
set_define('MOZ_NEW_CERT_STORAGE', True, when=new_cert_storage)