Cleanup RAND_load_file,RAND_write_file #3864
Closed
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
richsalz
added
branch: master
Closed
levitte
requested changes
Jul 5, 2017
crypto/rand/randfile.c
Outdated
| bytes = (bytes == -1) ? 2048 : bytes; /* ok, is 2048 enough? */ | ||
| setbuf(in, NULL); /* don't do buffered reads */ | ||
| if (stat(file, &sb) < 0 || !S_ISREG(sb.st_mode)) { | ||
| RANDerr(RAND_F_RAND_LOAD_FILE, RAND_R_NOT_IFREG); |
There was a problem hiding this comment.
Please make that RAND_R_NOT_A_REGULAR_FILE. You might also want to add something like this:
ERR_add_error_data(2, "Filename=", file);
crypto/rand/randfile.c
Outdated
| #endif | ||
| for (;;) { | ||
| if ((in = openssl_fopen(file, "rb")) == NULL) { | ||
| RANDerr(RAND_F_RAND_LOAD_FILE, RAND_R_CANNOT_FOPEN); |
There was a problem hiding this comment.
RAND_R_CANNOT_OPEN_FILE, and perhaps same additional data as above?
crypto/rand/randfile.c
Outdated
| return 1; | ||
| } | ||
| if (stat(file, &sb) >= 0 && !S_ISREG(sb.st_mode)) { | ||
| RANDerr(RAND_F_RAND_WRITE_FILE, RAND_R_NOT_IFREG); |
|
Okay, additional commit pushed that does your suggestions, @levitte
|
|
Cool. I'll do a double check on VMS tomorrow (way too tired to do it now) |
|
so, @levitte did I break VMS or did it work? :) |
|
[ahem] I was distracted... trying it now |
|
You’re not allowed to have a life ☺
|
|
Stop scaring me ;-) |
Document an internal assumption that these are only for use with files, and return an error if not. That made the code much simpler. Leave it as writing 1024 bytes, even though we don't need more than 256 from a security perspective. But the amount isn't specified, now, so we can change it later if we want.
|
Thanks! commit 9ee344f |
levitte
pushed a commit
that referenced
this pull request
Jul 6, 2017
Document an internal assumption that these are only for use with files, and return an error if not. That made the code much simpler. Leave it as writing 1024 bytes, even though we don't need more than 256 from a security perspective. But the amount isn't specified, now, so we can change it later if we want. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from #3864)
dot-asm
reviewed
Jul 6, 2017
| * As for the buffer parameter, we only use NULL here, so that passes as | ||
| * well... | ||
| */ | ||
| # define setbuf(fp,buf) (setbuf)((__FILE_ptr32)(fp), (char_ptr32)(buf)) |
There was a problem hiding this comment.
If this is removed, then one doesn't need typedef char *char_ptr32...
|
Good point. New PR coming up.
|
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.
Document an internal assumption that these are only for use with files,
and return an error if not. That made the code much simpler.
Also only write 256 bytes, we don't need more than that from a security
perspective.
This was pulled out from #3862.