rfbEncryptAndStorePasswd: fail if encryption fails #611
Conversation
This file contains 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
bk138
reviewed
Mar 28, 2024
chhitz
force-pushed
the
fail-if-encryption-fails
branch
2 times, most recently
from
7af9b2b to
bb00049
Compare
chhitz
force-pushed
the
fail-if-encryption-fails
branch
from
bb00049 to
e2d3130
Compare
bk138
reviewed
Mar 30, 2024
| @@ -1557,7 +1557,7 @@ typedef union { | |||
| extern int rfbEncryptAndStorePasswd(char *passwd, char *fname); | |||
| extern char *rfbDecryptPasswdFromFile(char *fname); | |||
| extern void rfbRandomBytes(unsigned char *bytes); | |||
| extern void rfbEncryptBytes(unsigned char *bytes, char *passwd); | |||
| extern int rfbEncryptBytes(unsigned char *bytes, char *passwd); | |||
There was a problem hiding this comment.
API change but I think it's OK ABI-wise. https://stackoverflow.com/questions/15626579/c-abi-is-changing-a-void-function-to-return-an-int-a-breaking-change also indicates so.
There was a problem hiding this comment.
What's the semantics of the return value? If it's boolean why not use the rfbBool type?
bk138
requested changes
Mar 30, 2024
| @@ -1557,7 +1557,7 @@ typedef union { | |||
| extern int rfbEncryptAndStorePasswd(char *passwd, char *fname); | |||
| extern char *rfbDecryptPasswdFromFile(char *fname); | |||
| extern void rfbRandomBytes(unsigned char *bytes); | |||
| extern void rfbEncryptBytes(unsigned char *bytes, char *passwd); | |||
| extern int rfbEncryptBytes(unsigned char *bytes, char *passwd); | |||
There was a problem hiding this comment.
What's the semantics of the return value? If it's boolean why not use the rfbBool type?
| @@ -197,19 +200,27 @@ rfbEncryptBytes(unsigned char *bytes, char *passwd) | |||
| } | |||
| } | |||
|
|
|||
| encrypt_rfbdes(bytes, &out_len, key, bytes, CHALLENGESIZE); | |||
| if (encrypt_rfbdes(bytes, &out_len, key, bytes, CHALLENGESIZE) == 0) { | |||
There was a problem hiding this comment.
Maybe just return the return value of encrypt_rfbdes() or use a ternary op?
| } | ||
|
|
||
| void | ||
| int |
There was a problem hiding this comment.
Comment here about return value semantics would be good!
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.
No description provided.