rename sosemanuk_state *ss > sosemanuk_state *st #427
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
|
Larry, did you used the latest develop as the base for this PR?
|
Contributor
Author
|
yes and I noticed someone had already performed the name change on sober128_state. Thank you!
|
Member
|
rebase please, not merging back :) |
Contributor
Author
|
I thought I only committed a resolved conflict. ...a merge? ???
|
Member
|
w/o merge there's normally no conflict :) |
Member
|
IMO it looks more or less good, just squash it into one commit |
karel-m
reviewed
Jul 6, 2018
src/stream/sosemanuk/sosemanuk.c
Outdated
| if (rlen > inlen) { | ||
| rlen = inlen; | ||
| } | ||
| ) |
…com/libtom/libtomcrypt into streams-make_state_names_consistent
rename sosemanuk_state *ss > sosemanuk_state *st update doc for sosemanuk_state *ss > sosemanuk_state *st change update doc for sosemanuk_state *ss > sosemanuk_state *st change update doc for sosemanuk_state *ss > sosemanuk_state *st change resolve conflict
Member
|
Another approach how to make it just a single commit: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
for consistency across all stream ciphers, rename sosemanuk_state *ss to sosemanuk_state *st for the yet unreleased Sosemanuk
Checklist