Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix doubled sha256 implementations and the resulting compilation error #9

Open
wants to merge 1 commit into
base: 67-1kb_ping_crash
Choose a base branch
from
Open

Fix doubled sha256 implementations and the resulting compilation error #9

wants to merge 1 commit into from

Conversation

adamglozik
Copy link

  • sha256 implementation kept in atecc508a.c, deleted from u2f_atecc.c
  • sha256 functions delcared as extern
  • the above solution solves the SETUP config compilation error originated from line 34 in u2f_atecc.c which messed up the scope of the doubled sha256 implementations

@adamglozik
Fix doubled sha256 implementations and the resulting compilation error
4cdd6a5 
 - sha256 implementation kept in atecc508a.c driver, deleted from u2f_atecc.c
 - sha256 functions delcared as extern.
 - the above solution solves the SETUP config compilation error originated from line 34 in u2f_atecc.c which messed up the scope of the doubled sha256 implementations
szszszsz added a commit that referenced this pull request Jul 18, 2018
@szszszsz
Remove doubled sha256 implementation
767ea15 
Porting Adam's PR #9 to current master. Citing its description:
```
Fix doubled sha256 implementations and the resulting compilation error
 - sha256 implementation kept in atecc508a.c, deleted from u2f_atecc.c
 - sha256 functions delcared as extern
 - the above solution solves the SETUP config compilation error
originated from line 34 in u2f_atecc.c which messed up the scope of the
doubled sha256 implementations
```

Tested with current wkey/rkey setup on UB10 and https://u2f.bin.coffee/

Signed-off-by: Szczepan Zalega <[email protected]>
szszszsz added a commit that referenced this pull request Jul 18, 2018
@szszszsz
Merge branch 'doubled_sha256_implementations_2'
279b21d 
Ports PR #9 to current master.
Removes doubled sha256 implementation. Affected symbols:

SHA_FLAGS
SHA_HMAC_KEY
res_digest
u2f_sha256_start
u2f_sha256_update
u2f_sha256_finish
compute_key_hash
@szszszsz
Copy link
Member

Hi @adamglozik !
I have ported this PR to current master. I could not merge this directly (the changes have mixed for some reason with button fixes).
Could you check please, have I not missed anything? The merge commit is: 279b21d

@szszszsz
Copy link
Member

This PR could be moved to u2f-zero, as it is based on its code (67-1kb_ping_crash is to be exact).

@adamglozik
Copy link
Author

The port is equal with the PR, tested at the mentioned commit with U2F register/sign and configuring sessions, everything seem ok.

@szszszsz
Copy link
Member

Thank you for checking!

@szszszsz
Copy link
Member

szszszsz commented Aug 1, 2018

Maintenance note: this PR is against original source code - U2F-Zero - to move to upstream.
Similar solution should be already merged to master to this project.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
invalid move to upstream
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@adamglozik @szszszsz