Bug 1096125 - Whitelist BCrypt.dll and Crypt32.dll for loading inside GMPs. r=bobowen
authorChris Pearce <cpearce@mozilla.com>
Sun, 09 Nov 2014 18:17:00 +0000
changeset 226184 c129289d32d617cb8fa4f188215a414029fb7f9b
parent 226183 223e9af774c6e30a9a9b6e53ea3402a49406a599
child 226185 b6740ca3d2092ffe6baca07ef366a6446b588679
push id36
push userdburns@mozilla.com
push dateMon, 10 Nov 2014 15:14:02 +0000
reviewersbobowen
bugs1096125
milestone36.0a1
Bug 1096125 - Whitelist BCrypt.dll and Crypt32.dll for loading inside GMPs. r=bobowen
dom/media/gmp/GMPChild.cpp
--- a/dom/media/gmp/GMPChild.cpp
+++ b/dom/media/gmp/GMPChild.cpp
@@ -336,21 +336,23 @@ GMPChild::RecvStartPlugin()
 // Pre-load DLLs that need to be used by the EME plugin but that can't be
 // loaded after the sandbox has started
 bool
 GMPChild::PreLoadLibraries(const std::string& aPluginPath)
 {
   // This must be in sorted order and lowercase!
   static const char* whitelist[] =
     {
+       "bcrypt.dll", // Used for OutputProtectionManager handshake
+       "crypt32.dll", // Used for OutputProtectionManager handshake
        "d3d9.dll", // Create an `IDirect3D9` to get adapter information
        "dxva2.dll", // Get monitor information
-       "msauddecmft.dll", // H.264 decoder
+       "msauddecmft.dll", // AAC decoder (on Windows 8)
        "msmpeg2adec.dll", // AAC decoder (on Windows 7)
-       "msmpeg2vdec.dll", // AAC decoder (on Windows 8)
+       "msmpeg2vdec.dll", // H.264 decoder
     };
   static const int whitelistLen = sizeof(whitelist) / sizeof(whitelist[0]);
 
   nsCOMPtr<nsIFile> infoFile;
   GetInfoFile(aPluginPath, infoFile);
 
   nsString path;
   infoFile->GetPath(path);