Support multiple ADE keys on MacOS

DeDRM_plugin/adobekey.py

@@ -379,40 +379,45 @@ def findActivationDat():
         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)
-
-        exprUUID = '//%s/%s' % (adept('credentials'), adept('user'))
-        keyName = ""
-        try: 
-            keyName = tree.findtext(exprUUID)[9:] + "_"
-        except: 
-            pass
+        userkeyelems = tree.findall(expr)
+
+        userkeys = []
+        keynames = []
+        for userkeyelem in userkeyelems:
+            userkey = userkeyelem.text
+
+            exprUUID = '//%s/%s' % (adept('credentials'), adept('user'))
+            keyName = ""
+            try: 
+                keyName = tree.findtext(exprUUID)[9:] + "_"
+            except: 
+                pass
+
+            try: 
+                exprMail = '//%s/%s' % (adept('credentials'), adept('username'))
+                keyName = keyName + tree.find(exprMail).attrib["method"] + "_"
+                keyName = keyName + tree.findtext(exprMail) + "_"
+            except:
+                pass
 
-        try: 
-            exprMail = '//%s/%s' % (adept('credentials'), adept('username'))
-            keyName = keyName + tree.find(exprMail).attrib["method"] + "_"
-            keyName = keyName + tree.findtext(exprMail) + "_"
-        except:
-            pass
-
-        if keyName == "":
-            keyName = "Unknown"
-        else:
-            keyName = keyName[:-1]
+            if keyName == "":
+                keyName = "Unknown"
+            else:
+                keyName = keyName[:-1]
 
+            userkey = b64decode(userkey)
+            userkey = userkey[26:]
 
+            userkeys.append(userkey)
+            keynames.append(keyName)
 
-        userkey = b64decode(userkey)
-        userkey = userkey[26:]
-        return [userkey], [keyName]
+        return userkeys, keynames
 
 else:
     def adeptkeys():