qt5-webkit
This commit is contained in:
@@ -12,6 +12,7 @@ from pisi.actionsapi import qt5
|
|||||||
from pisi.actionsapi import get
|
from pisi.actionsapi import get
|
||||||
|
|
||||||
def setup():
|
def setup():
|
||||||
|
shelltools.system("sed -i '16i#include <cstdint>' Source/ThirdParty/woff2/include/woff2/output.h")
|
||||||
shelltools.makedirs("build")
|
shelltools.makedirs("build")
|
||||||
shelltools.cd("build")
|
shelltools.cd("build")
|
||||||
cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr \
|
cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr \
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
diff --git a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp
|
||||||
|
index 9e726d5..4876f0f 100644
|
||||||
|
--- a/Source/WebCore/page/csp/ContentSecurityPolicy.cpp
|
||||||
|
+++ b/Source/WebCore/page/csp/ContentSecurityPolicy.cpp
|
||||||
|
@@ -231,8 +231,9 @@ bool isAllowedByAllWithHashFromContent(const CSPDirectiveListVector& policies, c
|
||||||
|
auto cryptoDigest = CryptoDigest::create(toCryptoDigestAlgorithm(algorithm));
|
||||||
|
cryptoDigest->addBytes(contentCString.data(), contentCString.length());
|
||||||
|
Vector<uint8_t> digest = cryptoDigest->computeHash();
|
||||||
|
+ ContentSecurityPolicyHash hash = std::make_pair(algorithm, digest);
|
||||||
|
for (auto& policy : policies) {
|
||||||
|
- if ((policy.get()->*allowed)(std::make_pair(algorithm, digest)))
|
||||||
|
+ if ((policy.get()->*allowed)(hash))
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -66,6 +66,7 @@
|
|||||||
<!-- <Patch level="1">webkit-offlineasm-warnings-ruby27.patch</Patch> -->
|
<!-- <Patch level="1">webkit-offlineasm-warnings-ruby27.patch</Patch> -->
|
||||||
<Patch level="1">qtwebkit-cstdint.patch</Patch>
|
<Patch level="1">qtwebkit-cstdint.patch</Patch>
|
||||||
<Patch level="1">qt5-webkit-icu75.patch</Patch>
|
<Patch level="1">qt5-webkit-icu75.patch</Patch>
|
||||||
|
<Patch level="1">qt5-webkit-icu75.patch</Patch>
|
||||||
</Patches>
|
</Patches>
|
||||||
</Source>
|
</Source>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user