SHA256
1
0
forked from pool/webkit2gtk3

Accepting request 522085 from GNOME:Next

Sub rebased patch...

OBS-URL: https://build.opensuse.org/request/show/522085
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=121
This commit is contained in:
Bjørn Lie 2017-09-07 16:43:11 +00:00 committed by Git OBS Bridge
parent 09336ae8f0
commit d6ba164883

View File

@ -1,6 +1,8 @@
--- a/Source/WebCore/crypto/CryptoKey.cpp
+++ a/Source/WebCore/crypto/CryptoKey.cpp
@@ -67,6 +67,8 @@ auto CryptoKey::algorithm() const -> AlgorithmVariant
Index: webkitgtk-2.17.92/Source/WebCore/crypto/CryptoKey.cpp
===================================================================
--- webkitgtk-2.17.92.orig/Source/WebCore/crypto/CryptoKey.cpp
+++ webkitgtk-2.17.92/Source/WebCore/crypto/CryptoKey.cpp
@@ -67,6 +67,8 @@ auto CryptoKey::algorithm() const -> Alg
case KeyAlgorithmClass::Raw:
return downcast<RawKeyAlgorithm>(*algorithm).dictionary();
}
@ -9,24 +11,3 @@
}
auto CryptoKey::usages() const -> Vector<CryptoKeyUsage>
--- a/Source/WebCore/crypto/SubtleCrypto.cpp
+++ a/Source/WebCore/crypto/SubtleCrypto.cpp
@@ -394,6 +394,8 @@ static CryptoKeyUsageBitmap toCryptoKeyUsageBitmap(CryptoKeyUsage usage)
case CryptoKeyUsage::UnwrapKey:
return CryptoKeyUsageUnwrapKey;
}
+
+ RELEASE_ASSERT_NOT_REACHED();
}
static CryptoKeyUsageBitmap toCryptoKeyUsageBitmap(const Vector<CryptoKeyUsage>& usages)
@@ -476,6 +478,8 @@ static std::optional<KeyData> toKeyData(SubtleCrypto::KeyFormat format, SubtleCr
}
);
}
+
+ RELEASE_ASSERT_NOT_REACHED();
}
static Vector<uint8_t> copyToVector(BufferSource&& data)