Merge 7673503228 into 65646f4493

DeDRM_plugin/adobekey.py

@@ -379,15 +379,18 @@ elif isosx:
         return None
 
     def adeptkeys():
-        # TODO: All the code to support extracting multiple activation keys
-        # TODO: seems to be Windows-only currently, still needs to be added for Mac.
         actpath = findActivationDat()
         if actpath is None:
             raise ADEPTError("Could not find ADE activation.dat file.")
         tree = etree.parse(actpath)
         adept = lambda tag: '{%s}%s' % (NSMAP['adept'], tag)
         expr = '//%s/%s' % (adept('credentials'), adept('privateLicenseKey'))
-        userkey = tree.findtext(expr)
+        userkeyelems = tree.findall(expr)
+
+        userkeys = []
+        keynames = []
+        for userkeyelem in userkeyelems:
+            userkey = userkeyelem.text
 
             exprUUID = '//%s/%s' % (adept('credentials'), adept('user'))
             keyName = ""
@@ -408,11 +411,13 @@ elif isosx:
             else:
                 keyName = keyName[:-1]
 
-
-
             userkey = b64decode(userkey)
             userkey = userkey[26:]
-        return [userkey], [keyName]
+
+            userkeys.append(userkey)
+            keynames.append(keyName)
+
+        return userkeys, keynames
 
 else:
     def adeptkeys():