Fix DRM detection in WMA files

diff --git a/taglib/asf/asffile.cpp b/taglib/asf/asffile.cpp
index ff7591c28f7ec7256c34c4352a9472d4e1998ac8..734898d44d150420a75d7438cb74247a29807e15 100644 (file)
--- a/taglib/asf/asffile.cpp
+++ b/taglib/asf/asffile.cpp
@@ -69,8 +69,9 @@ static ByteVector extendedContentDescriptionGuid("\x40\xA4\xD0\xD2\x07\xE3\xD2\x
 static ByteVector headerExtensionGuid("\xb5\x03\xbf_.\xa9\xcf\x11\x8e\xe3\x00\xc0\x0c Se", 16);
 static ByteVector metadataGuid("\xEA\xCB\xF8\xC5\xAF[wH\204g\xAA\214D\xFAL\xCA", 16);
 static ByteVector metadataLibraryGuid("\224\034#D\230\224\321I\241A\x1d\x13NEpT", 16);
-static ByteVector contentEncryptionGuid("\x22\x11\xB3\xFB\xBD\x23\x11\xD2\xB4\xB7\x00\xA0\xC9\x55\xFC\x6E");
-static ByteVector extendedContentEncryptionGuid("\x29\x8A\xE6\x14\x26\x22\x4C\x17\xB9\x35\xDA\xE0\x7E\xE9\x28\x9C");
+static ByteVector contentEncryptionGuid("\xFB\xB3\x11\x22\x23\xBD\xD2\x11\xB4\xB7\x00\xA0\xC9\x55\xFC\x6E", 16);
+static ByteVector extendedContentEncryptionGuid("\x14\xE6\x8A\x29\x22\x26 \x17\x4C\xB9\x35\xDA\xE0\x7E\xE9\x28\x9C", 16);
+static ByteVector advancedContentEncryptionGuid("\xB6\x9B\x07\x7A\xA4\xDA\x12\x4E\xA5\xCA\x91\xD3\x8D\xC1\x1A\x8D", 16);
 
 class ASF::File::BaseObject
 {
@@ -339,9 +340,6 @@ void ASF::File::HeaderExtensionObject::parse(ASF::File *file, uint /*size*/)
       obj = new MetadataLibraryObject();
     }
     else {
-      if(guid == contentEncryptionGuid || guid == extendedContentEncryptionGuid) {
-        file->d->properties->setEncrypted(true);
-      }
       obj = new UnknownObject(guid);
     }
     obj->parse(file, size);
@@ -451,6 +449,11 @@ void ASF::File::read(bool /*readProperties*/, Properties::ReadStyle /*properties
       obj = new HeaderExtensionObject();
     }
     else {
+      if(guid == contentEncryptionGuid ||
+         guid == extendedContentEncryptionGuid ||
+         guid == advancedContentEncryptionGuid) {
+        d->properties->setEncrypted(true);
+      }
       obj = new UnknownObject(guid);
     }
     obj->parse(this, size);