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.

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

Add SM4 block cipher [reboot] #657

Merged
merged 1 commit into from
Aug 31, 2024
Merged

Conversation

levitte
Copy link
Collaborator

@levitte levitte commented Aug 20, 2024

SM4 (formerly SMS4)[1] is a block cipher used in the Chinese
National Standard for Wireless LAN WAPI (Wired Authentication
and Privacy Infrastructure).
--from wikipedia

Checklist

  • documentation is added or updated
  • tests are added or updated

This is a reboot of #457, which seems to have been abandoned by its author

@levitte levitte marked this pull request as draft August 20, 2024 06:40
@levitte levitte force-pushed the ChaoWeiAtGit/develop branch 2 times, most recently from ba77a47 to 6368281 Compare August 20, 2024 09:12
@levitte levitte marked this pull request as ready for review August 20, 2024 09:12
@levitte
Copy link
Collaborator Author

levitte commented Aug 20, 2024

I believe this is ready for review

@levitte levitte force-pushed the ChaoWeiAtGit/develop branch from 6368281 to b45ecee Compare August 20, 2024 09:14
@levitte
Copy link
Collaborator Author

levitte commented Aug 20, 2024

All fixups squashed too

@levitte levitte mentioned this pull request Aug 20, 2024
2 tasks
@levitte levitte force-pushed the ChaoWeiAtGit/develop branch from b45ecee to 4e198ef Compare August 20, 2024 12:44
@levitte
Copy link
Collaborator Author

levitte commented Aug 20, 2024

Hmmmm, coveralls says that only 1 line in the new code is covered... huh???

@sjaeckel
Copy link
Member

Hmmmm, coveralls says that only 1 line in the new code is covered... huh???

oopsie :D race condition on the cipher ID with the addition of DES-X via #587 😬

@levitte levitte force-pushed the ChaoWeiAtGit/develop branch from 4e198ef to 0de6216 Compare August 22, 2024 07:39
@levitte levitte force-pushed the ChaoWeiAtGit/develop branch from 0de6216 to 0db8b7a Compare August 27, 2024 06:50
@sjaeckel
Copy link
Member

sjaeckel commented Aug 29, 2024

What do you think of those two three commits? Nonsense or useful? Please rebase&squash the useful ones on top of develop, then I'll merge.

@sjaeckel sjaeckel force-pushed the ChaoWeiAtGit/develop branch from 7518c4c to 8312ed1 Compare August 29, 2024 21:04
@levitte levitte force-pushed the ChaoWeiAtGit/develop branch from 8312ed1 to 7b26360 Compare August 30, 2024 03:29
@levitte
Copy link
Collaborator Author

levitte commented Aug 30, 2024

They are all fine, so I adopted (squashed) them all

SM4 (formerly SMS4)[1] is a block cipher used in the Chinese
National Standard for Wireless LAN WAPI (Wired Authentication
and Privacy Infrastructure).
--from wikipedia
@levitte levitte force-pushed the ChaoWeiAtGit/develop branch from 7b26360 to 6f15a45 Compare August 30, 2024 03:30
@levitte
Copy link
Collaborator Author

levitte commented Aug 30, 2024

Now also rebased on a fresher develop

@sjaeckel sjaeckel merged commit ab16280 into libtom:develop Aug 31, 2024
75 checks passed
@levitte levitte deleted the ChaoWeiAtGit/develop branch September 1, 2024 06:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants