diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure index dae88c42d0..d9e872d716 100644 --- a/build/moz.configure/old.configure +++ b/build/moz.configure/old.configure @@ -161,6 +161,8 @@ def old_configure_options(*options): '--enable-b2g-camera', '--enable-b2g-ril', '--enable-bundled-fonts', + '--enable-chrome-compression', + '--enable-chrome-format', '--enable-clang-plugin', '--enable-content-sandbox', '--enable-cookies', @@ -263,6 +265,7 @@ def old_configure_options(*options): '--with-app-name', '--with-arch', '--with-branding', + '--with-chrome-name', '--with-crashreporter-enable-percent', '--with-cross-lib', '--with-debug-label', diff --git a/config/config.mk b/config/config.mk index 5a352e5296..6208d124e1 100644 --- a/config/config.mk +++ b/config/config.mk @@ -216,7 +216,7 @@ endif # NO_PROFILE_GUIDED_OPTIMIZE MAKE_JARS_FLAGS = \ -t $(topsrcdir) \ - -f $(MOZ_JAR_MAKER_FILE_FORMAT) \ + -f $(MOZ_CHROME_FILE_FORMAT) \ $(NULL) ifdef USE_EXTENSION_MANIFEST diff --git a/config/tests/src-simple/Makefile.in b/config/tests/src-simple/Makefile.in index 55fdfd8677..96f9a41540 100644 --- a/config/tests/src-simple/Makefile.in +++ b/config/tests/src-simple/Makefile.in @@ -22,7 +22,7 @@ REF_MANIFEST = $(if $(USE_EXTENSION_MANIFEST),chrome.manifest,test.manifest) check-%:: if test -d $(FINAL_TARGET); then rm -rf $(FINAL_TARGET); fi; - $(MAKE) realchrome MOZ_JAR_MAKER_FILE_FORMAT=$* + $(MAKE) realchrome MOZ_CHROME_FILE_FORMAT=$* @echo 'Comparing manifests...' @if ! sort $(MY_MANIFEST) | diff --text -U 0 $(srcdir)/../$(REF_MANIFEST).$* - ; then \ echo 'TEST-UNEXPECTED-FAIL | config/tests/$(REF_MANIFEST).$* | differing content in manifest!' ; \ diff --git a/gfx/2d/DrawTargetSkia.cpp b/gfx/2d/DrawTargetSkia.cpp index 9eaac56748..7e71e54ccf 100644 --- a/gfx/2d/DrawTargetSkia.cpp +++ b/gfx/2d/DrawTargetSkia.cpp @@ -212,7 +212,7 @@ VerifyRGBXCorners(uint8_t* aData, const IntSize &aSize, const int32_t aStride, S #endif static sk_sp -GetSkImageForSurface(SourceSurface* aSurface) +GetSkImageForSurface(SourceSurface* aSurface, Maybe* aLock) { if (!aSurface) { gfxDebug() << "Creating null Skia image from null SourceSurface"; @@ -220,7 +220,7 @@ GetSkImageForSurface(SourceSurface* aSurface) } if (aSurface->GetType() == SurfaceType::SKIA) { - return static_cast(aSurface)->GetImage(); + return static_cast(aSurface)->GetImage(aLock); } DataSourceSurface* surf = aSurface->GetDataSurface().take(); @@ -390,9 +390,9 @@ ExtractAlphaBitmap(sk_sp aImage, SkBitmap* aResultBitmap) } static sk_sp -ExtractAlphaForSurface(SourceSurface* aSurface) +ExtractAlphaForSurface(SourceSurface* aSurface, Maybe& aLock) { - sk_sp image = GetSkImageForSurface(aSurface); + sk_sp image = GetSkImageForSurface(aSurface, &aLock); if (!image) { return nullptr; } @@ -411,7 +411,11 @@ ExtractAlphaForSurface(SourceSurface* aSurface) } static void -SetPaintPattern(SkPaint& aPaint, const Pattern& aPattern, Float aAlpha = 1.0, Point aOffset = Point(0, 0)) +SetPaintPattern(SkPaint& aPaint, + const Pattern& aPattern, + Maybe& aLock, + Float aAlpha = 1.0, + Point aOffset = Point(0, 0)) { switch (aPattern.GetType()) { case PatternType::COLOR: { @@ -473,7 +477,7 @@ SetPaintPattern(SkPaint& aPaint, const Pattern& aPattern, Float aAlpha = 1.0, Po } case PatternType::SURFACE: { const SurfacePattern& pat = static_cast(aPattern); - sk_sp image = GetSkImageForSurface(pat.mSurface); + sk_sp image = GetSkImageForSurface(pat.mSurface, &aLock); if (!image) { aPaint.setColor(SK_ColorTRANSPARENT); break; @@ -525,7 +529,7 @@ struct AutoPaintSetup { : mNeedsRestore(false), mAlpha(1.0) { Init(aCanvas, aOptions, aMaskBounds, false); - SetPaintPattern(mPaint, aPattern, mAlpha, aOffset); + SetPaintPattern(mPaint, aPattern, mLock, mAlpha, aOffset); } AutoPaintSetup(SkCanvas *aCanvas, const DrawOptions& aOptions, const Rect* aMaskBounds = nullptr, bool aForceGroup = false) @@ -579,6 +583,7 @@ struct AutoPaintSetup { SkPaint mPaint; bool mNeedsRestore; SkCanvas* mCanvas; + Maybe mLock; Float mAlpha; }; @@ -601,7 +606,8 @@ DrawTargetSkia::DrawSurface(SourceSurface *aSurface, MarkChanged(); - sk_sp image = GetSkImageForSurface(aSurface); + Maybe lock; + sk_sp image = GetSkImageForSurface(aSurface, &lock); if (!image) { return; } @@ -654,7 +660,8 @@ DrawTargetSkia::DrawSurfaceWithShadow(SourceSurface *aSurface, MarkChanged(); - sk_sp image = GetSkImageForSurface(aSurface); + Maybe lock; + sk_sp image = GetSkImageForSurface(aSurface, &lock); if (!image) { return; } @@ -1407,8 +1414,9 @@ DrawTargetSkia::Mask(const Pattern &aSource, MarkChanged(); AutoPaintSetup paint(mCanvas.get(), aOptions, aSource); + Maybe lock; SkPaint maskPaint; - SetPaintPattern(maskPaint, aMask); + SetPaintPattern(maskPaint, aMask, lock); SkLayerRasterizer::Builder builder; builder.addLayer(maskPaint); @@ -1427,7 +1435,8 @@ DrawTargetSkia::MaskSurface(const Pattern &aSource, MarkChanged(); AutoPaintSetup paint(mCanvas.get(), aOptions, aSource, nullptr, -aOffset); - sk_sp alphaMask = ExtractAlphaForSurface(aMask); + Maybe lock; + sk_sp alphaMask = ExtractAlphaForSurface(aMask, lock); if (!alphaMask) { gfxDebug() << *this << ": MaskSurface() failed to extract alpha for mask"; return; @@ -1456,7 +1465,8 @@ DrawTarget::Draw3DTransformedSurface(SourceSurface* aSurface, const Matrix4x4& a fullMat.PostTranslate(-xformBounds.x, -xformBounds.y, 0); // Read in the source data. - sk_sp srcImage = GetSkImageForSurface(aSurface); + Maybe lock; + sk_sp srcImage = GetSkImageForSurface(aSurface, &lock); if (!srcImage) { return true; } @@ -1515,7 +1525,8 @@ DrawTargetSkia::Draw3DTransformedSurface(SourceSurface* aSurface, const Matrix4x MarkChanged(); - sk_sp image = GetSkImageForSurface(aSurface); + Maybe lock; + sk_sp image = GetSkImageForSurface(aSurface, &lock); if (!image) { return true; } @@ -1599,7 +1610,8 @@ already_AddRefed DrawTargetSkia::OptimizeGPUSourceSurface(SourceSurface *aSurface) const { // Check if the underlying SkImage already has an associated GrTexture. - sk_sp image = GetSkImageForSurface(aSurface); + Maybe lock; + sk_sp image = GetSkImageForSurface(aSurface, &lock); if (!image || image->isTextureBacked()) { RefPtr surface(aSurface); return surface.forget(); @@ -1716,7 +1728,8 @@ DrawTargetSkia::CopySurface(SourceSurface *aSurface, { MarkChanged(); - sk_sp image = GetSkImageForSurface(aSurface); + Maybe lock; + sk_sp image = GetSkImageForSurface(aSurface, &lock); if (!image) { return; } @@ -2061,7 +2074,8 @@ DrawTargetSkia::PopLayer() paint.setColor(SK_ColorTRANSPARENT); } - sk_sp alphaMask = ExtractAlphaForSurface(layer.mMask); + Maybe lock; + sk_sp alphaMask = ExtractAlphaForSurface(layer.mMask, lock); if (!alphaMask) { gfxDebug() << *this << ": PopLayer() failed to extract alpha for mask"; } else { diff --git a/gfx/2d/SourceSurfaceSkia.cpp b/gfx/2d/SourceSurfaceSkia.cpp index 14cbf6a84a..0738f3d391 100644 --- a/gfx/2d/SourceSurfaceSkia.cpp +++ b/gfx/2d/SourceSurfaceSkia.cpp @@ -40,6 +40,25 @@ SourceSurfaceSkia::GetFormat() const return mFormat; } +sk_sp +SourceSurfaceSkia::GetImage(Maybe* aLock) { + // If we were provided a lock object, we can let the caller access + // a shared SkImage and we know it won't go away while the lock is held. + if (aLock) { + // We are locked, so now we can check mDrawTarget. + // If it's null, then we're not shared and we can unlock eagerly. + if (!mDrawTarget) { + aLock->reset(); + } + } else { + // Otherwise we need to call DrawTargetWillChange to ensure we have our + // own copy of the SkImage. + DrawTargetWillChange(); + } + sk_sp image = mImage; + return image; +} + static sk_sp MakeSkData(unsigned char* aData, const IntSize& aSize, int32_t aStride) { diff --git a/gfx/2d/SourceSurfaceSkia.h b/gfx/2d/SourceSurfaceSkia.h index a91ae93edb..ffb8e47bf6 100644 --- a/gfx/2d/SourceSurfaceSkia.h +++ b/gfx/2d/SourceSurfaceSkia.h @@ -10,6 +10,10 @@ #include #include "skia/include/core/SkCanvas.h" #include "skia/include/core/SkImage.h" +#include "mozilla/Maybe.h" +#include "mozilla/Mutex.h" + +typedef mozilla::MutexAutoLock MutexAutoLock; namespace mozilla { @@ -28,7 +32,7 @@ public: virtual IntSize GetSize() const; virtual SurfaceFormat GetFormat() const; - sk_sp& GetImage() { return mImage; } + sk_sp GetImage(Maybe* aLock); bool InitFromData(unsigned char* aData, const IntSize &aSize, diff --git a/old-configure.in b/old-configure.in index d84a75b25c..2fbda54b19 100644 --- a/old-configure.in +++ b/old-configure.in @@ -4413,6 +4413,85 @@ dnl = dnl ======================================================== MOZ_ARG_HEADER(Misc. Options) +dnl ========================================================= +dnl = Chrome format +dnl ========================================================= +MOZ_ARG_ENABLE_STRING([chrome-format], +[ --enable-chrome-format=jar|flat|omni + Select FORMAT of chrome files during packaging], + MOZ_CHROME_FILE_FORMAT=`echo $enableval | tr A-Z a-z`) + +if test -z "$MOZ_CHROME_FILE_FORMAT"; then + MOZ_CHROME_FILE_FORMAT=omni +fi + +if test "$MOZ_CHROME_FILE_FORMAT" = "symlink"; then + AC_MSG_ERROR([--enable-chrome-format=symlink has been deprecated. It is now used by default in $DIST/bin on platforms that support it]) +fi + +if test "$MOZ_CHROME_FILE_FORMAT" != "jar" && + test "$MOZ_CHROME_FILE_FORMAT" != "flat" && + test "$MOZ_CHROME_FILE_FORMAT" != "omni"; then + AC_MSG_ERROR([--enable-chrome-format must be set to either jar, flat, or omni]) +fi + +dnl ========================================================= +dnl = Chrome compression +dnl ========================================================= +MOZ_ARG_ENABLE_STRING([chrome-compression], +[ --enable-chrome-compression=none|deflate|brotli + Select COMPRESSION type of chrome files during packaging], + JAR_COMPRESSION=`echo $enableval | tr A-Z a-z`) + +if test -z "$JAR_COMPRESSION"; then + JAR_COMPRESSION=deflate +fi + +if test "$JAR_COMPRESSION" != "none" && + test "$JAR_COMPRESSION" != "deflate" && + test "$JAR_COMPRESSION" != "brotli"; then + AC_MSG_ERROR([--enable-chrome-compression must be set to either none, deflate, or brotli]) +fi + +dnl ========================================================= +dnl Omnijar packaging (bug 552121) +dnl ========================================================= +dnl Omnijar packaging is compatible with flat packaging. +dnl In unpackaged builds, omnijar looks for files as if +dnl things were flat packaged. After packaging, all files +dnl are loaded from a single jar. MOZ_CHROME_FILE_FORMAT +dnl is set to flat since putting files into jars is only +dnl done during packaging with omnijar. +if test "$MOZ_CHROME_FILE_FORMAT" = "omni"; then + MOZ_OMNIJAR=1 + AC_DEFINE(MOZ_OMNIJAR) +fi + +# Allow someone to change OMNIJAR_NAME in mozconfig +MOZ_ARG_WITH_STRING(chrome-name, +[ --with-chrome-name=CHROMENAME + Set chrome jar name (default=omni.ja)], +[ val=`echo $withval` + OMNIJAR_NAME="$val"]) + +# Default Omni Jar Name +if test -z "$OMNIJAR_NAME" ; then + OMNIJAR_NAME=omni.ja +fi + +MOZ_PACKAGER_FORMAT="$MOZ_CHROME_FILE_FORMAT" +if test "$OS_ARCH" = "WINNT"; then + MOZ_CHROME_FILE_FORMAT=flat +else + MOZ_CHROME_FILE_FORMAT=symlink +fi + +AC_SUBST(JAR_COMPRESSION) +AC_SUBST(OMNIJAR_NAME) +AC_SUBST(MOZ_OMNIJAR) +AC_SUBST(MOZ_PACKAGER_FORMAT) +AC_SUBST(MOZ_CHROME_FILE_FORMAT) + dnl ======================================================== dnl = Disable Jetpack dnl ======================================================== diff --git a/parser/html/nsHtml5OwningUTF16Buffer.h b/parser/html/nsHtml5OwningUTF16Buffer.h index d7e3200ea3..0d8777464e 100644 --- a/parser/html/nsHtml5OwningUTF16Buffer.h +++ b/parser/html/nsHtml5OwningUTF16Buffer.h @@ -52,7 +52,7 @@ public: nsrefcnt AddRef(); nsrefcnt Release(); private: - nsAutoRefCnt mRefCnt; + mozilla::ThreadSafeAutoRefCnt mRefCnt; }; #endif // nsHtml5OwningUTF16Buffer_h diff --git a/python/mozbuild/mozbuild/test/backend/test_build.py b/python/mozbuild/mozbuild/test/backend/test_build.py index d3f5fb6a9d..d6111d85f7 100644 --- a/python/mozbuild/mozbuild/test/backend/test_build.py +++ b/python/mozbuild/mozbuild/test/backend/test_build.py @@ -84,7 +84,7 @@ class TestBuild(unittest.TestCase): config.topobjdir) overrides = [ 'install_manifest_depends=', - 'MOZ_JAR_MAKER_FILE_FORMAT=flat', + 'MOZ_CHROME_FILE_FORMAT=flat', 'TEST_MOZBUILD=1', ] with self.line_handler() as handle_make_line: @@ -108,7 +108,7 @@ class TestBuild(unittest.TestCase): config.topobjdir) overrides = [ 'install_manifest_depends=', - 'MOZ_JAR_MAKER_FILE_FORMAT=flat', + 'MOZ_CHROME_FILE_FORMAT=flat', 'TEST_MOZBUILD=1', ] with self.line_handler() as handle_make_line: diff --git a/security/certverifier/CertVerifier.cpp b/security/certverifier/CertVerifier.cpp index bcb24fe395..2e6086b2d5 100644 --- a/security/certverifier/CertVerifier.cpp +++ b/security/certverifier/CertVerifier.cpp @@ -41,7 +41,6 @@ CertVerifier::CertVerifier(OcspDownloadConfig odc, OcspStrictConfig osc, OcspGetConfig ogc, uint32_t certShortLifetimeInDays, - PinningMode pinningMode, SHA1Mode sha1Mode, BRNameMatchingPolicy::Mode nameMatchingMode, NetscapeStepUpPolicy netscapeStepUpPolicy, @@ -50,7 +49,6 @@ CertVerifier::CertVerifier(OcspDownloadConfig odc, , mOCSPStrict(osc == ocspStrict) , mOCSPGETEnabled(ogc == ocspGetEnabled) , mCertShortLifetimeInDays(certShortLifetimeInDays) - , mPinningMode(pinningMode) , mSHA1Mode(sha1Mode) , mNameMatchingMode(nameMatchingMode) , mNetscapeStepUpPolicy(netscapeStepUpPolicy) @@ -416,7 +414,7 @@ CertVerifier::VerifyCert(CERTCertificate* cert, SECCertificateUsage usage, NSSCertDBTrustDomain trustDomain(trustEmail, defaultOCSPFetching, mOCSPCache, pinArg, ocspGETConfig, mCertShortLifetimeInDays, - pinningDisabled, MIN_RSA_BITS_WEAK, + MIN_RSA_BITS_WEAK, ValidityCheckingMode::CheckingOff, SHA1Mode::Allowed, NetscapeStepUpPolicy::NeverMatch, @@ -485,7 +483,7 @@ CertVerifier::VerifyCert(CERTCertificate* cert, SECCertificateUsage usage, NSSCertDBTrustDomain trustDomain(trustSSL, evOCSPFetching, mOCSPCache, pinArg, ocspGETConfig, - mCertShortLifetimeInDays, mPinningMode, MIN_RSA_BITS, + mCertShortLifetimeInDays, MIN_RSA_BITS, ValidityCheckingMode::CheckForEV, sha1ModeConfigurations[i], mNetscapeStepUpPolicy, originAttributes, builtChain); @@ -566,7 +564,7 @@ CertVerifier::VerifyCert(CERTCertificate* cert, SECCertificateUsage usage, NSSCertDBTrustDomain trustDomain(trustSSL, defaultOCSPFetching, mOCSPCache, pinArg, ocspGETConfig, mCertShortLifetimeInDays, - mPinningMode, keySizeOptions[i], + keySizeOptions[i], ValidityCheckingMode::CheckingOff, sha1ModeConfigurations[j], mNetscapeStepUpPolicy, @@ -629,7 +627,7 @@ CertVerifier::VerifyCert(CERTCertificate* cert, SECCertificateUsage usage, NSSCertDBTrustDomain trustDomain(trustSSL, defaultOCSPFetching, mOCSPCache, pinArg, ocspGETConfig, mCertShortLifetimeInDays, - pinningDisabled, MIN_RSA_BITS_WEAK, + MIN_RSA_BITS_WEAK, ValidityCheckingMode::CheckingOff, SHA1Mode::Allowed, mNetscapeStepUpPolicy, originAttributes, builtChain); @@ -644,7 +642,7 @@ CertVerifier::VerifyCert(CERTCertificate* cert, SECCertificateUsage usage, NSSCertDBTrustDomain trustDomain(trustEmail, defaultOCSPFetching, mOCSPCache, pinArg, ocspGETConfig, mCertShortLifetimeInDays, - pinningDisabled, MIN_RSA_BITS_WEAK, + MIN_RSA_BITS_WEAK, ValidityCheckingMode::CheckingOff, SHA1Mode::Allowed, NetscapeStepUpPolicy::NeverMatch, @@ -671,7 +669,7 @@ CertVerifier::VerifyCert(CERTCertificate* cert, SECCertificateUsage usage, NSSCertDBTrustDomain trustDomain(trustEmail, defaultOCSPFetching, mOCSPCache, pinArg, ocspGETConfig, mCertShortLifetimeInDays, - pinningDisabled, MIN_RSA_BITS_WEAK, + MIN_RSA_BITS_WEAK, ValidityCheckingMode::CheckingOff, SHA1Mode::Allowed, NetscapeStepUpPolicy::NeverMatch, @@ -695,7 +693,7 @@ CertVerifier::VerifyCert(CERTCertificate* cert, SECCertificateUsage usage, NSSCertDBTrustDomain trustDomain(trustObjectSigning, defaultOCSPFetching, mOCSPCache, pinArg, ocspGETConfig, mCertShortLifetimeInDays, - pinningDisabled, MIN_RSA_BITS_WEAK, + MIN_RSA_BITS_WEAK, ValidityCheckingMode::CheckingOff, SHA1Mode::Allowed, NetscapeStepUpPolicy::NeverMatch, @@ -728,7 +726,7 @@ CertVerifier::VerifyCert(CERTCertificate* cert, SECCertificateUsage usage, NSSCertDBTrustDomain sslTrust(trustSSL, defaultOCSPFetching, mOCSPCache, pinArg, ocspGETConfig, mCertShortLifetimeInDays, - pinningDisabled, MIN_RSA_BITS_WEAK, + MIN_RSA_BITS_WEAK, ValidityCheckingMode::CheckingOff, SHA1Mode::Allowed, NetscapeStepUpPolicy::NeverMatch, @@ -740,7 +738,7 @@ CertVerifier::VerifyCert(CERTCertificate* cert, SECCertificateUsage usage, NSSCertDBTrustDomain emailTrust(trustEmail, defaultOCSPFetching, mOCSPCache, pinArg, ocspGETConfig, mCertShortLifetimeInDays, - pinningDisabled, MIN_RSA_BITS_WEAK, + MIN_RSA_BITS_WEAK, ValidityCheckingMode::CheckingOff, SHA1Mode::Allowed, NetscapeStepUpPolicy::NeverMatch, @@ -753,7 +751,6 @@ CertVerifier::VerifyCert(CERTCertificate* cert, SECCertificateUsage usage, defaultOCSPFetching, mOCSPCache, pinArg, ocspGETConfig, mCertShortLifetimeInDays, - pinningDisabled, MIN_RSA_BITS_WEAK, ValidityCheckingMode::CheckingOff, SHA1Mode::Allowed, diff --git a/security/certverifier/CertVerifier.h b/security/certverifier/CertVerifier.h index 6bae219ce7..54568c0878 100644 --- a/security/certverifier/CertVerifier.h +++ b/security/certverifier/CertVerifier.h @@ -139,13 +139,6 @@ public: /*optional out*/ SHA1ModeResult* sha1ModeResult = nullptr, /*optional out*/ CertificateTransparencyInfo* ctInfo = nullptr); - enum PinningMode { - pinningDisabled = 0, - pinningAllowUserCAMITM = 1, - pinningStrict = 2, - pinningEnforceTestMode = 3 - }; - enum class SHA1Mode { Allowed = 0, Forbidden = 1, @@ -172,7 +165,7 @@ public: CertVerifier(OcspDownloadConfig odc, OcspStrictConfig osc, OcspGetConfig ogc, uint32_t certShortLifetimeInDays, - PinningMode pinningMode, SHA1Mode sha1Mode, + SHA1Mode sha1Mode, BRNameMatchingPolicy::Mode nameMatchingMode, NetscapeStepUpPolicy netscapeStepUpPolicy, CertificateTransparencyMode ctMode); @@ -184,7 +177,6 @@ public: const bool mOCSPStrict; const bool mOCSPGETEnabled; const uint32_t mCertShortLifetimeInDays; - const PinningMode mPinningMode; const SHA1Mode mSHA1Mode; const BRNameMatchingPolicy::Mode mNameMatchingMode; const NetscapeStepUpPolicy mNetscapeStepUpPolicy; @@ -214,8 +206,7 @@ private: mozilla::pkix::Result IsCertBuiltInRoot(CERTCertificate* cert, bool& result); mozilla::pkix::Result CertListContainsExpectedKeys( - const CERTCertList* certList, const char* hostname, mozilla::pkix::Time time, - CertVerifier::PinningMode pinningMode); + const CERTCertList* certList, const char* hostname, mozilla::pkix::Time time); } } // namespace mozilla::psm diff --git a/security/certverifier/NSSCertDBTrustDomain.cpp b/security/certverifier/NSSCertDBTrustDomain.cpp index bc68c446a5..c0311d4af7 100644 --- a/security/certverifier/NSSCertDBTrustDomain.cpp +++ b/security/certverifier/NSSCertDBTrustDomain.cpp @@ -51,7 +51,6 @@ NSSCertDBTrustDomain::NSSCertDBTrustDomain(SECTrustType certDBTrustType, /*optional but shouldn't be*/ void* pinArg, CertVerifier::OcspGetConfig ocspGETConfig, uint32_t certShortLifetimeInDays, - CertVerifier::PinningMode pinningMode, unsigned int minRSABits, ValidityCheckingMode validityCheckingMode, CertVerifier::SHA1Mode sha1Mode, @@ -64,7 +63,6 @@ NSSCertDBTrustDomain::NSSCertDBTrustDomain(SECTrustType certDBTrustType, , mPinArg(pinArg) , mOCSPGetConfig(ocspGETConfig) , mCertShortLifetimeInDays(certShortLifetimeInDays) - , mPinningMode(pinningMode) , mMinRSABits(minRSABits) , mValidityCheckingMode(validityCheckingMode) , mSHA1Mode(sha1Mode) diff --git a/security/certverifier/NSSCertDBTrustDomain.h b/security/certverifier/NSSCertDBTrustDomain.h index 24c4f16e63..585a41b175 100644 --- a/security/certverifier/NSSCertDBTrustDomain.h +++ b/security/certverifier/NSSCertDBTrustDomain.h @@ -76,7 +76,6 @@ public: OCSPCache& ocspCache, void* pinArg, CertVerifier::OcspGetConfig ocspGETConfig, uint32_t certShortLifetimeInDays, - CertVerifier::PinningMode pinningMode, unsigned int minRSABits, ValidityCheckingMode validityCheckingMode, CertVerifier::SHA1Mode sha1Mode, @@ -178,7 +177,6 @@ private: void* mPinArg; // non-owning! const CertVerifier::OcspGetConfig mOCSPGetConfig; const uint32_t mCertShortLifetimeInDays; - CertVerifier::PinningMode mPinningMode; const unsigned int mMinRSABits; ValidityCheckingMode mValidityCheckingMode; CertVerifier::SHA1Mode mSHA1Mode; diff --git a/security/manager/ssl/SharedCertVerifier.h b/security/manager/ssl/SharedCertVerifier.h index 03619573af..135c8ae514 100644 --- a/security/manager/ssl/SharedCertVerifier.h +++ b/security/manager/ssl/SharedCertVerifier.h @@ -20,12 +20,12 @@ public: SharedCertVerifier(OcspDownloadConfig odc, OcspStrictConfig osc, OcspGetConfig ogc, uint32_t certShortLifetimeInDays, - PinningMode pinningMode, SHA1Mode sha1Mode, + SHA1Mode sha1Mode, BRNameMatchingPolicy::Mode nameMatchingMode, NetscapeStepUpPolicy netscapeStepUpPolicy, CertificateTransparencyMode ctMode) : mozilla::psm::CertVerifier(odc, osc, ogc, certShortLifetimeInDays, - pinningMode, sha1Mode, nameMatchingMode, + sha1Mode, nameMatchingMode, netscapeStepUpPolicy, ctMode) { } diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp index 897b5743ce..6e6d614410 100644 --- a/security/manager/ssl/nsNSSComponent.cpp +++ b/security/manager/ssl/nsNSSComponent.cpp @@ -1579,14 +1579,6 @@ void nsNSSComponent::setValidationOptions(bool isInitialSetting, PublicSSLState()->SetSignedCertTimestampsEnabled(sctsEnabled); PrivateSSLState()->SetSignedCertTimestampsEnabled(sctsEnabled); - CertVerifier::PinningMode pinningMode = - static_cast - (Preferences::GetInt("security.cert_pinning.enforcement_level", - CertVerifier::pinningDisabled)); - if (pinningMode > CertVerifier::pinningEnforceTestMode) { - pinningMode = CertVerifier::pinningDisabled; - } - CertVerifier::SHA1Mode sha1Mode = static_cast (Preferences::GetInt("security.pki.sha1_enforcement_level", static_cast(CertVerifier::SHA1Mode::Allowed))); @@ -1646,7 +1638,7 @@ void nsNSSComponent::setValidationOptions(bool isInitialSetting, lock); mDefaultCertVerifier = new SharedCertVerifier(odc, osc, ogc, certShortLifetimeInDays, - pinningMode, sha1Mode, + sha1Mode, nameMatchingMode, netscapeStepUpPolicy, ctMode); diff --git a/security/manager/ssl/nsSiteSecurityService.cpp b/security/manager/ssl/nsSiteSecurityService.cpp index fa2619414d..5a6ff3d46c 100644 --- a/security/manager/ssl/nsSiteSecurityService.cpp +++ b/security/manager/ssl/nsSiteSecurityService.cpp @@ -87,8 +87,6 @@ SiteHSTSState::ToString(nsCString& aString) //////////////////////////////////////////////////////////////////////////////// -const uint64_t kSixtyDaysInSeconds = 60 * 24 * 60 * 60; - static bool HostIsIPAddress(const char *hostname) { @@ -398,8 +396,6 @@ ParseSSSHeaders(uint32_t aType, // Unrecognized directives (that are otherwise syntactically valid) are // ignored, and the rest of the header is parsed as normal. - bool foundReportURI = false; - NS_NAMED_LITERAL_CSTRING(max_age_var, "max-age"); NS_NAMED_LITERAL_CSTRING(include_subd_var, "includesubdomains"); diff --git a/toolkit/moz.configure b/toolkit/moz.configure index deb7129d87..fbd728fdc8 100644 --- a/toolkit/moz.configure +++ b/toolkit/moz.configure @@ -344,36 +344,6 @@ set_config('MOZ_FMP4', fmp4) set_define('MOZ_FMP4', fmp4) add_old_configure_assignment('MOZ_FMP4', fmp4) -# Miscellaneous -# ============================================================== -option(name='--enable-chrome-format', - help='Select FORMAT of chrome files during packaging.', - nargs=1, - choices=('omni', 'jar', 'flat'), - default='omni') - -@depends('--enable-chrome-format') -def packager_format(value): - return value[0] - -set_config('MOZ_PACKAGER_FORMAT', packager_format) - -@depends(host, build_project) -def jar_maker_format(host, build_project): - # Multilocales for mobile/android use the same mergedirs for all locales, - # so we can't use symlinks for those builds. - if host.os == 'WINNT': - return 'flat' - return 'symlink' - -set_config('MOZ_JAR_MAKER_FILE_FORMAT', jar_maker_format) - -@depends(toolkit) -def omnijar_name(toolkit): - return 'omni.ja' - -set_config('OMNIJAR_NAME', omnijar_name) - # Permissions system # ============================================================== option(name='--disable-permissions', diff --git a/xpcom/io/SpecialSystemDirectory.cpp b/xpcom/io/SpecialSystemDirectory.cpp index ccded584a0..67e7f0059d 100644 --- a/xpcom/io/SpecialSystemDirectory.cpp +++ b/xpcom/io/SpecialSystemDirectory.cpp @@ -102,9 +102,9 @@ GetWindowsFolder(int aFolder, nsIFile** aFile) { WCHAR path_orig[MAX_PATH + 3]; WCHAR* path = path_orig + 1; - HRESULT result = SHGetSpecialFolderPathW(nullptr, path, aFolder, true); + BOOL result = SHGetSpecialFolderPathW(nullptr, path, aFolder, true); - if (!SUCCEEDED(result)) { + if (!result) { return NS_ERROR_FAILURE; }