shimun/solo
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

cbor.loads changed to cbor.decode_from

Browse Source
This commit is contained in:
merlokk 2019-07-03 00:43:51 +03:00
parent 795cf5c4a1
commit 91c77da179
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/testing/tests/fido2.py
View File

@ -78,7 +78,7 @@ def TestCborKeysSorted(cbor_obj):
# https://fidoalliance.org/specs/fido-v2.0-ps-20190130/fido-client-to-authenticator-protocol-v2.0-ps-20190130.html#ctap2-canonical-cbor-encoding-form # https://fidoalliance.org/specs/fido-v2.0-ps-20190130/fido-client-to-authenticator-protocol-v2.0-ps-20190130.html#ctap2-canonical-cbor-encoding-form
if isinstance(cbor_obj, bytes): if isinstance(cbor_obj, bytes):
cbor_obj = cbor.loads(cbor_obj)[0] cbor_obj = cbor.decode_from(cbor_obj)[0]
if isinstance(cbor_obj, dict): if isinstance(cbor_obj, dict):
l = [x for x in cbor_obj] l = [x for x in cbor_obj]
@ -341,8 +341,8 @@ class FIDO2Tests(Tester):
def test_get_info(self,): def test_get_info(self,):
with Test("Get info"): with Test("Get info"):
info = self.ctap.get_info() info = self.ctap.get_info()
print(bytes(info)) print("data:", bytes(info))
print(cbor.loads(bytes(info))) print("decoded:", cbor.decode_from(bytes(info)))
with Test("Check FIDO2 string is in VERSIONS field"): with Test("Check FIDO2 string is in VERSIONS field"):
assert "FIDO_2_0" in info.versions assert "FIDO_2_0" in info.versions