Commit Graph

144 Commits

Author SHA1 Message Date
Florian Bach
0dcc2a93b6 Fix small bug with eReader authorizations 2022-07-31 10:56:01 +02:00
Florian Bach
55bea99913 Fix eReader auth in Calibre 6 2022-07-31 10:50:50 +02:00
Florian Bach
bf4b6367bf Remove test for Wine registry code 2022-07-31 10:28:05 +02:00
melvyn2
8e53929d94 Fix buffer allocation/zeroing bugs, use clearer variable names 2022-07-31 10:25:07 +02:00
melvyn2
2b989f21e9 Read wide-string username before decoding to ascii string for entropy 2022-07-31 10:25:07 +02:00
melvyn2
2894faac2a Read regkey username before using GetUserName fallback
If the user has changed their username after the authorization key has been created, then GetUserName will return the new username which can't decrypt the key. The username at the time of authorization should be stored at `HKEY_CURRENT_USER\Software\\Adobe\\Adept\\Device`, which we first attempt to read before falling back if it doesn't exist.
2022-07-31 10:25:07 +02:00
melvyn2
0cb13b9d38 Move all win32 logic to wine executable
Actions like reading the registry and serial number were being done in python even though the final decryption was done in wine. This commit moves all windows logic except architecture detection into the exe ran under wine to simplify the architecture.
2022-07-31 10:25:07 +02:00
melvyn2
61a03fe988 Fix Wine extraction script for python 2/3 2022-07-31 10:25:07 +02:00
Florian Bach
53cbe88c8b Update some error messages 2022-07-31 10:20:16 +02:00
Florian Bach
76f67a2048 Temporarily switch to oscrypto fork for OpenSSL 3 support.
The latest version of oscrypto does not yet support
OpenSSL 3, which is used in Ubuntu 22.04, Fedora 36
and a bunch of other newer Linux distributions.

When https://github.com/wbond/oscrypto/pull/61 is
merged and included in a new release, this change
will be reverted.
2022-07-28 18:07:52 +02:00
Florian Bach
03d4d3e099 Fix millisecond part in nonce calculation (fixes #27) 2022-07-11 18:16:36 +02:00
Florian Bach
b5978dc7c4 Fix AV false-positives by packing executables 2022-06-15 19:32:23 +02:00
Florian Bach
1271d099e7 Switch compiling CI 2022-05-19 18:39:04 +02:00
Florian Bach
d5028c3cc8 Additional pkcs12 test code 2022-05-16 08:32:36 +02:00
Florian Bach
c485f4ed50 Update CI for new oscrypto version
This forces the CI on Ubuntu 22.04 to use oscrypto newer than 1.3.0.
Such a version does not yet exist so the CI will still fail, but once
that update is released, the CI will immediately start working again
without manual intervention.
2022-05-16 07:13:49 +02:00
Florian Bach
d66913c1ae Hacky fix for OpenSSL 3 2022-05-14 19:26:46 +02:00
Florian Bach
03d8221cdc Fix username code for Windows python 2 2022-05-14 14:59:14 +02:00
Florian Bach
d88f0fc9a4 Add Windows & Mac CI testing 2022-05-14 11:28:08 +02:00
Florian Bach
052cb41691 Add CI for Ubuntu 22.04
Tests currently fail on Ubuntu 22.04 because oscrypto doesn't properly
support OpenSSL 3. Will hopefully be fixed soon.
2022-05-14 10:49:16 +02:00
Florian Bach
6769bf3d54 Update .gitignore 2022-05-14 10:37:06 +02:00
Florian Bach
53e106fa73 Display error message if pkcs12 can't be decrypted 2022-05-14 10:26:11 +02:00
Florian Bach
dd104665bb Actually fix loans without deviceID 2022-05-13 18:46:04 +02:00
Florian Bach
2779334e4a Fix misidentification as passHash book 2022-05-13 16:38:23 +02:00
Florian Bach
9346b888d3 Fix loans without deviceID 2022-05-13 16:23:14 +02:00
Florian Bach
137fc82fa8 Use HTTP if no protocol is included in URL (fixes #22) 2022-05-11 06:47:09 +02:00
Florian Bach
b2b88abd06 Cleanup 2022-05-11 06:46:35 +02:00
Florian Bach
b9f6672a4c Update oscrypto for OpenSSL3 support 2022-05-01 16:11:30 +02:00
Florian Bach
fa6ad1da5d Make fulfill.py accept file names 2022-04-28 16:50:55 +02:00
Florian Bach
222dc1fe35 Fix error when fulfillment server hostname doesn't resolve 2022-04-28 16:32:43 +02:00
Florian Bach
5fe4dbb75a More Python2 fixes 2022-04-28 16:31:14 +02:00
Florian Bach
171c6f36ba More Python2 cleanup 2022-01-16 19:30:53 +01:00
Florian Bach
3a460ae1fd Fix Wine import for Python2 2022-01-16 19:00:29 +01:00
Florian Bach
05a302424c Update PDF code for Python2 2022-01-16 18:34:52 +01:00
Florian Bach
6d72506fad Begin work on Python2 support 2022-01-16 18:11:35 +01:00
Florian Bach
cec56cb9a2 Make Github recognize LICENSE 2022-01-16 10:12:55 +01:00
Florian Bach
3daed133e0 Don't fail if optional notification server is unavailable 2022-01-08 11:50:55 +01:00
Florian Bach
964d4c06eb Try to reduce AV false-positives 2022-01-05 21:44:15 +01:00
Florian Bach
4dfa2194b8 Small ADE version differences 2022-01-05 21:39:29 +01:00
Florian Bach
79543e1f48 Add note about DRM to the README 2021-12-29 18:24:10 +01:00
Florian Bach
b6368af7b3 More to-dos in readme, test updates 2021-12-20 11:20:22 +01:00
Florian Bach
619b7bab22 Improve tests some more 2021-12-19 22:22:56 +01:00
Florian Bach
2fae9b83a2 Update signing / encryption code 2021-12-19 11:24:48 +01:00
Florian Bach
218d7e6e52 Add signing test 2021-12-19 11:23:27 +01:00
Florian Bach
fc5015474f Add a couple tests 2021-12-19 00:00:13 +01:00
Florian Bach
01d34288c4 Experimental eReader authorization support 2021-12-18 11:50:30 +01:00
Florian Bach
7373a33709 Begin work on authorizing eReaders 2021-12-16 22:26:44 +01:00
Florian Bach
5451766f0a Ignore HTTP500 in optional notifications 2021-12-16 14:43:44 +01:00
Florian Bach
1fa8e28c53 Prepare v0.0.15 2021-12-15 13:48:34 +01:00
Florian Bach
21644b25b2 Update some dependencies 2021-12-15 10:13:39 +01:00
Florian Bach
2380177448 Improve error messages for linking an anonymous auth 2021-12-14 20:05:00 +01:00