Skip to content
Permalink
Browse files
[GStreamer] Drop libgcrypt initialization in webkit_media_clear_key_d…
…ecrypt_init()

https://bugs.webkit.org/show_bug.cgi?id=176656

Reviewed by Michael Catanzaro.

* platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp:
(webkit_media_clear_key_decrypt_init): Don't re-initialize libgcrypt here
since that's already done in the WebProcess main(), and the calls here
only result in libgcrypt writing out 'Oops' warnings on stderr.


Canonical link: https://commits.webkit.org/193197@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@221850 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
zdobersek committed Sep 11, 2017
1 parent 44d57c9 commit 50f381cc25f98aff73a8e94d2db6e11c7eadebd4
Showing with 12 additions and 9 deletions.
  1. +12 −0 Source/WebCore/ChangeLog
  2. +0 −9 Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp
@@ -1,3 +1,15 @@
2017-09-10 Zan Dobersek <zdobersek@igalia.com>

[GStreamer] Drop libgcrypt initialization in webkit_media_clear_key_decrypt_init()
https://bugs.webkit.org/show_bug.cgi?id=176656

Reviewed by Michael Catanzaro.

* platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp:
(webkit_media_clear_key_decrypt_init): Don't re-initialize libgcrypt here
since that's already done in the WebProcess main(), and the calls here
only result in libgcrypt writing out 'Oops' warnings on stderr.

2017-09-10 Mark Lam <mark.lam@apple.com>

Fix all ExceptionScope verification failures in JavaScriptCore.
@@ -98,15 +98,6 @@ static void webkit_media_clear_key_decrypt_init(WebKitMediaClearKeyDecrypt* self
{
WebKitMediaClearKeyDecryptPrivate* priv = WEBKIT_MEDIA_CK_DECRYPT_GET_PRIVATE(self);

if (!gcry_check_version(GCRYPT_VERSION))
GST_ERROR_OBJECT(self, "Libgcrypt failed to initialize");

// Allocate a pool of 16k secure memory. This make the secure memory
// available and also drops privileges where needed.
gcry_control(GCRYCTL_INIT_SECMEM, 16384, 0);

gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);

self->priv = priv;
new (priv) WebKitMediaClearKeyDecryptPrivate();
}

0 comments on commit 50f381c

Please sign in to comment.