mirrors/acsm-calibre-plugin
mirrors
/
acsm-calibre-plugin
mirror of https://github.com/Leseratte10/acsm-calibre-plugin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix standalone scripts

This commit is contained in:
Florian Bach 2023-05-14 15:02:11 +02:00
parent 53c1d76224
commit d767857f16
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calibre-plugin/libadobe.py
View File

@ -217,8 +217,8 @@ def makeSerial(random):
sha_out = hashlib.sha1(dataToHash.encode('latin-1')).hexdigest().lower() sha_out = hashlib.sha1(dataToHash.encode('latin-1')).hexdigest().lower()
else: else:
import binascii # SHA1 of a bunch of random bytes
sha_out = binascii.hexlify(Random.get_random_bytes(20)).lower() sha_out = hashlib.sha1(Random.get_random_bytes(256)).hexdigest().lower()
return sha_out return sha_out

4
tests/main.py
View File

@ -77,6 +77,10 @@ class TestAdobe(unittest.TestCase):
self.assertEqual((len(libadobe.makeSerial(False))), 40, "SHA1 hash for device serial invalid (device-based)") self.assertEqual((len(libadobe.makeSerial(False))), 40, "SHA1 hash for device serial invalid (device-based)")
self.assertEqual((len(libadobe.makeSerial(True))), 40, "SHA1 hash for device serial invalid (random)") self.assertEqual((len(libadobe.makeSerial(True))), 40, "SHA1 hash for device serial invalid (random)")
self.assertEqual(libadobe.makeSerial(False), libadobe.makeSerial(False), "Two non-random serials not identical") self.assertEqual(libadobe.makeSerial(False), libadobe.makeSerial(False), "Two non-random serials not identical")
self.assertNotEqual(libadobe.makeSerial(True), libadobe.makeSerial(True), "Two random serials are identical ...")
self.assertIsInstance(libadobe.makeSerial(True), str, "Serial must be a string, not bytes!")
self.assertIsInstance(libadobe.makeSerial(False), str, "Serial must be a string, not bytes!")
def test_fingerprintGeneration(self): def test_fingerprintGeneration(self):
'''Check if fingerprint generation works''' '''Check if fingerprint generation works'''