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

fix upper byte U2F for backwards compatibility

Browse Source
This commit is contained in:
Conor Patrick 2019-02-17 15:33:24 -05:00
parent 596c6c1077
commit 46d7be865d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fido2/u2f.c
View File

@ -224,7 +224,7 @@ static int16_t u2f_authenticate(struct u2f_authenticate_request * req, uint8_t c
} }
count = ctap_atomic_count(0); count = ctap_atomic_count(0);
hash[0] = (count >> 24) & 0xff; hash[0] = 0xff;
hash[1] = (count >> 16) & 0xff; hash[1] = (count >> 16) & 0xff;
hash[2] = (count >> 8) & 0xff; hash[2] = (count >> 8) & 0xff;
hash[3] = (count >> 0) & 0xff; hash[3] = (count >> 0) & 0xff;
@ -241,7 +241,7 @@ static int16_t u2f_authenticate(struct u2f_authenticate_request * req, uint8_t c
crypto_ecc256_sign(hash, 32, sig); crypto_ecc256_sign(hash, 32, sig);
u2f_response_writeback(&up,1); u2f_response_writeback(&up,1);
hash[0] = (count >> 24) & 0xff; hash[0] = 0xff;
hash[1] = (count >> 16) & 0xff; hash[1] = (count >> 16) & 0xff;
hash[2] = (count >> 8) & 0xff; hash[2] = (count >> 8) & 0xff;
hash[3] = (count >> 0) & 0xff; hash[3] = (count >> 0) & 0xff;

6
tools/ctap_test.py
View File

@ -383,12 +383,16 @@ class Tester:
def test_u2f(self,): def test_u2f(self,):
chal = sha256(b"AAA") chal = sha256(b"AAA")
appid = sha256(b"BBB") appid = sha256(b"BBB")
lastc = 0
for i in range(0, 5): for i in range(0, 5):
reg = self.ctap1.register(chal, appid) reg = self.ctap1.register(chal, appid)
reg.verify(appid, chal) reg.verify(appid, chal)
auth = self.ctap1.authenticate(chal, appid, reg.key_handle) auth = self.ctap1.authenticate(chal, appid, reg.key_handle)
# check endianness # check endianness
assert auth.counter < 0x10000 if lastc:
assert (auth.counter - lastc) < 10
lastc = auth.counter
print(hex(lastc))
print("U2F reg + auth pass %d/5" % (i + 1)) print("U2F reg + auth pass %d/5" % (i + 1))
def test_fido2_simple(self, pin_token=None): def test_fido2_simple(self, pin_token=None):