mirrors/acsm-calibre-plugin
mirrors/acsm-calibre-plugin
1
0
Fork 0
mirror of https://github.com/Leseratte10/acsm-calibre-plugin.git synced 2024-12-22 17:29:56 +06:00
Code Issues Projects Releases Wiki Activity

Fix nonce calculation bug (fixes #5)

Browse Source
This commit is contained in:
Florian Bach 2021-10-23 21:36:47 +02:00
parent 8e8ca43c7e
commit 89dcaf75c1
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
calibre-plugin/config.py
View File

@ -215,6 +215,8 @@ class ConfigWidget(QWidget):
self.button_export_key.setEnabled(activated) self.button_export_key.setEnabled(activated)
self.button_export_activation.setEnabled(activated) self.button_export_activation.setEnabled(activated)
self.resize(self.sizeHint())
info_dialog(None, "Done", "Successfully imported authorization for " + ade_mail, show=True, show_copy_button=False) info_dialog(None, "Done", "Successfully imported authorization for " + ade_mail, show=True, show_copy_button=False)
@ -270,6 +272,8 @@ class ConfigWidget(QWidget):
self.button_export_key.setEnabled(True) self.button_export_key.setEnabled(True)
self.button_export_activation.setEnabled(True) self.button_export_activation.setEnabled(True)
self.resize(self.sizeHint())
info_dialog(None, "Done", "Authorized to account " + mail, show=True, show_copy_button=False) info_dialog(None, "Done", "Authorized to account " + mail, show=True, show_copy_button=False)
@ -293,7 +297,8 @@ class ConfigWidget(QWidget):
filters = [("DER Files", ["der"])] filters = [("DER Files", ["der"])]
filename = choose_save_file(self, "Export ADE keys", _("Export ADE keys"), filters, all_files=False) filename = choose_save_file(self, "Export ADE keys", _("Export ADE keys"), filters,
all_files=False, initial_filename="adobe_encryption_key.der")
if (filename is None): if (filename is None):
return return

14
calibre-plugin/libadobe.py
View File

@ -212,7 +212,7 @@ def sendPOSTHTTPRequest(URL: str, document: bytes, type: str, returnRC = False):
if returnRC: if returnRC:
return ret_code, content return ret_code, content
return content return content
@ -274,15 +274,13 @@ def addNonce():
usec = dt.microsecond usec = dt.microsecond
sec = (dt - datetime(1970,1,1)).total_seconds() sec = (dt - datetime(1970,1,1)).total_seconds()
nonce320 = int(0x6f046000)
nonce321 = int(0x388a)
bigtime = int(sec * 1000)
nonce320 += int((bigtime & 0xFFFFFFFF) + usec/1000) Ntime = int(int(sec * 1000) + usec/1000)
nonce321 += int(((bigtime >> 32) & 0xFFFFFFFF))
final = bytearray(nonce320.to_bytes(4, 'little')) # Unixtime to gregorian timestamp
final.extend(nonce321.to_bytes(4, 'little')) Ntime += 62167219200000
final = bytearray(Ntime.to_bytes(8, 'little'))
tmp = 0 tmp = 0
final.extend(tmp.to_bytes(4, 'little')) final.extend(tmp.to_bytes(4, 'little'))

2
calibre-plugin/libadobeFulfill.py
View File

@ -547,7 +547,7 @@ def performFulfillmentNotification(fulfillmentResultToken, forceOptional = False
critical = True critical = True
if element.get("critical", "yes") == "no": if element.get("critical", "yes") == "no":
critial = False critical = False
print("Notifying optional server %s" % (url)) print("Notifying optional server %s" % (url))
else: else:
print("Notifying server %s" % (url)) print("Notifying server %s" % (url))