Changeset 221850 in webkit

Timestamp:

Sep 10, 2017 11:53:41 PM (7 years ago)

Author:

zandobersek@gmail.com

Message:

[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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp

@@ -99 +99 @@
     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();