diff --git a/Pipfile b/Pipfile index 8f76531..1f2e405 100644 --- a/Pipfile +++ b/Pipfile @@ -6,11 +6,11 @@ name = "pypi" [dev-packages] [packages] -rncryptor = "==3.2.0" -bpylist = "==0.1.4" -click = "==6.7" +rncryptor = "==3.3.0" +bpylist2 = "4.0.1" +click = "==8.1.3" pyqrcode = "==1.2.1" -pycryptodome = "==3.9.1" +pycryptodome = "==3.17.0" [requires] -python_version = "3.7" +python_version = "3.11" diff --git a/Pipfile.lock b/Pipfile.lock index 03b0b09..c63d196 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,11 +1,11 @@ { "_meta": { "hash": { - "sha256": "3a9aa3cf92e33eb33f1ae837e0b466ec0827564e1abc6766112371ee29d937c3" + "sha256": "fd13d63d30f4f2ef0d49921891ca620a43510c16045745b9104d9084dce37906" }, "pipfile-spec": 6, "requires": { - "python_version": "3.7" + "python_version": "3.11" }, "sources": [ { @@ -16,58 +16,60 @@ ] }, "default": { - "bpylist": { + "bpylist2": { "hashes": [ - "sha256:ac065c9f7b804a201999ebbc31b02df18e0fc29e03bcb1eac3e63696599b88ce" + "sha256:92a4fe810f919777e22623d6c90c4ee70cc8cbd156bc8297313221c85bc2f2da", + "sha256:ae36e14f856100a1a2a60ecdbf703fab949932cea6a1ba562299452983906969" ], "index": "pypi", - "version": "==0.1.4" + "version": "==4.0.1" }, "click": { "hashes": [ - "sha256:29f99fc6125fbc931b758dc053b3114e55c77a6e4c6c3a2674a2dc986016381d", - "sha256:f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b" + "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e", + "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48" ], "index": "pypi", - "version": "==6.7" + "version": "==8.1.3" }, "pycryptodome": { "hashes": [ - "sha256:0aa49f3fa110f8dc090bad1671a768cc17d3d3bd01566641ffc0d10d0fec8d49", - "sha256:0fafd3c4fb76c6992f34bf2d074f582f388e3b8062b8ba5d65b020634cc221e6", - "sha256:17eb9bd5d30a71b0c8a832e3e9cd2b7723f99907c38dc5dd23e59e8c368a70e2", - "sha256:2776255d5c748782f095ec422d42da2eadd8392ac9de7da23db4aed4231272bd", - "sha256:3500826dc3b9a8fdb762bebe551106081a6bdecd4181a3d1bd0206e48bba8974", - "sha256:3aa0d30326dcdef24c632d5c03b8e4d379c6ae0645082b27dd69ea816bb97ecb", - "sha256:3c7769bdadcc4809508e71997008912cc6d94fd7b5b1f3ef121683ebcac71d81", - "sha256:3e8c97a38dac6dafd180b4696a522b1581dd1a8e0ea60763458be547bac97361", - "sha256:5aca5125a46e458b308b5571ce8fe36d2229f161aa7db27b3ecacded70c6aa8b", - "sha256:62beb75f0688f406946312bfef8923d8ab23f5b8013acded931413625299d317", - "sha256:7725643de3c884a9945a086670787dce637037f32c5c2df7fd602bd5967f3486", - "sha256:872191a02a0c2a3b98dc75c62b32912b220a8ae5ff6ac9e39868f903f55dd6a4", - "sha256:8c501e80960d12328d49e1d409daf426f29364a37c602f257c99509999654650", - "sha256:9512638bfef8ffc94c62751965a4733c3792104dc84771ba54ce0f80f49134df", - "sha256:962043051afa7a5ab071b0d8996dc00e564327a18566d3e574a39cb6e097b462", - "sha256:9db72b18b30902a83fa57b0d7dae4ce24f85186695e3bea0d423f1ec7c5b3fbe", - "sha256:9ffd4f0bfb5949dfa0e5cedef836364f18da0deb2fba04671607fb3b59b29112", - "sha256:a26819f693cf5fc0a2373a3e4b91c38e359cad9f00020a885b667c77f28738d5", - "sha256:a3efc575a53511c48361d933e12e07c2eb940db1afda0995285176c372ab7352", - "sha256:ababd6685b9d94729a851a0615482156afdacbeaabeea60f67961db0e975b1af", - "sha256:b0e9c8c270cd3f8c73b53139f0708f257189a00bbc898be6d3f03995e5f7edc2", - "sha256:b74173b13c221ee96b608212b9adc2c459a73d3632f04490df42e4f07e7041e6", - "sha256:bed297f75ba19cefe2d10beb4959f4f8cb62c2560a3998ad87479485098ee939", - "sha256:c639f09e8ce8ad5af9884233f952ade4b73a11b7d41d3b9bb7d4e64d9e1df164", - "sha256:c7bc308be67288af1cd44668d59e36356f0ce518337899079ddb0235bd55db79", - "sha256:cca152dcebc318833ba70499190ce17ee81b525404e2a7548c77f52b439306a7", - "sha256:d5261d22bc3a54db26f11dabcda14bbaab72080977e083d795b4b1d1b510c774", - "sha256:d81111e3da7fc9eee825ba7d8a68b3c1464f41110ef98a7280e0c7fb82c91e73", - "sha256:d95fafa899abb9f82e55ff43f423e100784312b43932514f2c05d41cbb20323e", - "sha256:de411a64d4105d4424441833bd25943208e58c846abf981bba5bbeeba88a49c3", - "sha256:e02c7b3d05b88ff1a236e49a252b2bf8444d3a1d04a056784af766c0909eba36", - "sha256:fbafe9b01b717e0bfbc83cd740ff5bf5cdd3f208815be470ea203942b899bbdf" + "sha256:04779cc588ad8f13c80a060b0b1c9d1c203d051d8a43879117fe6b8aaf1cd3fa", + "sha256:121d61663267f73692e8bde5ec0d23c9146465a0d75cad75c34f75c752527b01", + "sha256:1a30f51b990994491cec2d7d237924e5b6bd0d445da9337d77de384ad7f254f9", + "sha256:2c5631204ebcc7ae33d11c43037b2dafe25e2ab9c1de6448eb6502ac69c19a56", + "sha256:333306eaea01fde50a73c4619e25631e56c4c61bd0fb0a2346479e67e3d3a820", + "sha256:38bbd6717eac084408b4094174c0805bdbaba1f57fc250fd0309ae5ec9ed7e09", + "sha256:3a232474cd89d3f51e4295abe248a8b95d0332d153bf46444e415409070aae1e", + "sha256:4992ec965606054e8326e83db1c8654f0549cdb26fce1898dc1a20bc7684ec1c", + "sha256:53068e33c74f3b93a8158dacaa5d0f82d254a81b1002e0cd342be89fcb3433eb", + "sha256:5587803d5b66dfd99e7caa31ed91fba0fdee3661c5d93684028ad6653fce725f", + "sha256:5a790bc045003d89d42e3b9cb3cc938c8561a57a88aaa5691512e8540d1ae79c", + "sha256:74794a2e2896cd0cf56fdc9db61ef755fa812b4a4900fa46c49045663a92b8d0", + "sha256:80ea8333b6a5f2d9e856ff2293dba2e3e661197f90bf0f4d5a82a0a6bc83a626", + "sha256:8198f2b04c39d817b206ebe0db25a6653bb5f463c2319d6f6d9a80d012ac1e37", + "sha256:87e2ca3aa557781447428c4b6c8c937f10ff215202ab40ece5c13a82555c10d6", + "sha256:909e36a43fe4a8a3163e9c7fc103867825d14a2ecb852a63d3905250b308a4e5", + "sha256:9453b4e21e752df8737fdffac619e93c9f0ec55ead9a45df782055eb95ef37d9", + "sha256:9ec565e89a6b400eca814f28d78a9ef3f15aea1df74d95b28b7720739b28f37f", + "sha256:a3228728a3808bc9f18c1797ec1179a0efb5068c817b2ffcf6bcd012494dffb2", + "sha256:a74f45aee8c5cc4d533e585e0e596e9f78521e1543a302870a27b0ae2106381e", + "sha256:afbcdb0eda20a0e1d44e3a1ad6d4ec3c959210f4b48cabc0e387a282f4c7deb8", + "sha256:ba2d4fcb844c6ba5df4bbfee9352ad5352c5ae939ac450e06cdceff653280450", + "sha256:bce2e2d8e82fcf972005652371a3e8731956a0c1fbb719cc897943b3695ad91b", + "sha256:c133f6721fba313722a018392a91e3c69d3706ae723484841752559e71d69dc6", + "sha256:ca1ceb6303be1282148f04ac21cebeebdb4152590842159877778f9cf1634f09", + "sha256:d086d46774e27b280e4cece8ab3d87299cf0d39063f00f1e9290d096adc5662a", + "sha256:dc22cc00f804485a3c2a7e2010d9f14a705555f67020eb083e833cabd5bd82e4", + "sha256:e1819b67bcf6ca48341e9b03c2e45b1c891fa8eb1a8458482d14c2805c9616f2", + "sha256:e7debd9c439e7b84f53be3cf4ba8b75b3d0b6e6015212355d6daf44ac672e210", + "sha256:f44c0d28716d950135ff21505f2c764498eda9d8806b7c78764165848aa419bc", + "sha256:f68d6c8ea2974a571cacb7014dbaada21063a0375318d88ac1f9300bc81e93c3", + "sha256:f812d58c5af06d939b2baccdda614a3ffd80531a26e5faca2c9f8b1770b2b7af", + "sha256:f8e550caf52472ae9126953415e4fc554ab53049a5691c45b8816895c632e4d7" ], "index": "pypi", - "version": "==3.9.1" + "version": "==3.17.0" }, "pyqrcode": { "hashes": [ @@ -79,11 +81,11 @@ }, "rncryptor": { "hashes": [ - "sha256:156253246f3e3521e5080191e9b4ec100e162d07c261a9df86169f8943bcc7a3", - "sha256:a3b521d22953bffc4f125faf53f4c9c2a41c8186e0b0e331314abe455be92c48" + "sha256:ba932299aee25524537a32112cba8787965f8de6e46550684b71a3c1255b0e62", + "sha256:efdd61d56627e645dcbb1b9cfe22806decf676c0089b6f993f280de82d66e70e" ], "index": "pypi", - "version": "==3.2.0" + "version": "==3.3.0" } }, "develop": {} diff --git a/decrypt_otpauth.py b/decrypt_otpauth.py index 24be97c..b78b161 100644 --- a/decrypt_otpauth.py +++ b/decrypt_otpauth.py @@ -8,8 +8,8 @@ import pyqrcode -from bpylist import archiver -from bpylist.archive_types import uid +from bpylist2 import archiver +from plistlib import UID from Crypto.Cipher import AES @@ -179,7 +179,7 @@ def decode_object(self, index): return raw_obj class_uid = raw_obj.get('$class') - if not isinstance(class_uid, uid): + if not isinstance(class_uid, UID): raise archiver.MissingClassUID(raw_obj) klass = self.class_for_uid(class_uid)