diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-03-27 15:07:34 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 13:15:58 +0200 |
| commit | 69b4e77751013c0a4d2be25570bf6b0c33cf153d (patch) | |
| tree | 8e11ebf79384b22943cbd85a6e70e9515463c40a | |
| parent | 5657b5c53b7965600a367ffbd1dd3790b4e542c0 (diff) | |
| download | UXP-69b4e77751013c0a4d2be25570bf6b0c33cf153d.tar UXP-69b4e77751013c0a4d2be25570bf6b0c33cf153d.tar.gz UXP-69b4e77751013c0a4d2be25570bf6b0c33cf153d.tar.lz UXP-69b4e77751013c0a4d2be25570bf6b0c33cf153d.tar.xz UXP-69b4e77751013c0a4d2be25570bf6b0c33cf153d.zip | |
Issue #1498 - Part 3: Remove support for storing "knockout" values.
| -rw-r--r-- | security/manager/ssl/nsISiteSecurityService.idl | 5 | ||||
| -rw-r--r-- | security/manager/ssl/nsSiteSecurityService.cpp | 9 |
2 files changed, 4 insertions, 10 deletions
diff --git a/security/manager/ssl/nsISiteSecurityService.idl b/security/manager/ssl/nsISiteSecurityService.idl index b61577152..6b2e47d38 100644 --- a/security/manager/ssl/nsISiteSecurityService.idl +++ b/security/manager/ssl/nsISiteSecurityService.idl @@ -106,13 +106,10 @@ interface nsISiteSecurityService : nsISupports * @param aURI the URI of the target host * @param aFlags options for this request as defined in nsISocketProvider: * NO_PERMANENT_STORAGE - * @param force if set, forces no-HSTS state by writing a knockout value, - * overriding any preload list state */ void removeState(in uint32_t aType, in nsIURI aURI, - in uint32_t aFlags, - [optional] in boolean force); + in uint32_t aFlags); /** * See isSecureURI diff --git a/security/manager/ssl/nsSiteSecurityService.cpp b/security/manager/ssl/nsSiteSecurityService.cpp index 922202527..ab2a3dd0b 100644 --- a/security/manager/ssl/nsSiteSecurityService.cpp +++ b/security/manager/ssl/nsSiteSecurityService.cpp @@ -326,11 +326,9 @@ nsSiteSecurityService::SetHSTSState(uint32_t aType, return NS_OK; } - // If max-age is zero, the host is no longer considered HSTS. If the host was - // preloaded, we store an entry indicating that this host is not HSTS, causing - // the preloaded information to be ignored. + // If max-age is zero, the host is no longer considered HSTS. if (maxage == 0) { - return RemoveState(aType, aSourceURI, flags, true); + return RemoveState(aType, aSourceURI, flags); } MOZ_ASSERT((aHSTSState == SecurityPropertySet || @@ -358,8 +356,7 @@ nsSiteSecurityService::SetHSTSState(uint32_t aType, } NS_IMETHODIMP -nsSiteSecurityService::RemoveState(uint32_t aType, nsIURI* aURI, - uint32_t aFlags, bool force = false) +nsSiteSecurityService::RemoveState(uint32_t aType, nsIURI* aURI, uint32_t aFlags) { // Child processes are not allowed direct access to this. if (!XRE_IsParentProcess()) { |