diff options
author | Damien Miller <djm@mindrot.org> | 2000-05-11 19:10:58 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-05-11 19:10:58 +1000 |
commit | accfeb3afe07be4875e33dc8f269c868ea929274 (patch) | |
tree | 1efbf3f39620f7f4346fa76104a0ff3ca35544fa | |
parent | 95e89634296bfdf5ef11f39f10021e9f24938385 (diff) |
- Fix for prng_seed permissions checking from Lutz Jaenicke
<Lutz.Jaenicke@aet.TU-Cottbus.DE>
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | entropy.c | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20000511 | ||
2 | - Fix for prng_seed permissions checking from Lutz Jaenicke | ||
3 | <Lutz.Jaenicke@aet.TU-Cottbus.DE> | ||
4 | |||
1 | 20000509 | 5 | 20000509 |
2 | - OpenBSD CVS update | 6 | - OpenBSD CVS update |
3 | - markus@cvs.openbsd.org | 7 | - markus@cvs.openbsd.org |
@@ -35,7 +35,7 @@ | |||
35 | #include <openssl/rand.h> | 35 | #include <openssl/rand.h> |
36 | #include <openssl/sha.h> | 36 | #include <openssl/sha.h> |
37 | 37 | ||
38 | RCSID("$Id: entropy.c,v 1.8 2000/05/01 23:56:41 damien Exp $"); | 38 | RCSID("$Id: entropy.c,v 1.9 2000/05/11 09:10:58 damien Exp $"); |
39 | 39 | ||
40 | #ifdef EGD_SOCKET | 40 | #ifdef EGD_SOCKET |
41 | #ifndef offsetof | 41 | #ifndef offsetof |
@@ -444,7 +444,7 @@ prng_check_seedfile(char *filename) { | |||
444 | fatal("PRNG seedfile %.100s is not a regular file", filename); | 444 | fatal("PRNG seedfile %.100s is not a regular file", filename); |
445 | 445 | ||
446 | /* mode 0600, owned by root or the current user? */ | 446 | /* mode 0600, owned by root or the current user? */ |
447 | if (((st.st_mode & 0177) != 0) || !(st.st_uid == geteuid())) | 447 | if (((st.st_mode & 0177) != 0) || !(st.st_uid == getuid())) |
448 | fatal("PRNG seedfile %.100s must be mode 0600, owned by uid %d", | 448 | fatal("PRNG seedfile %.100s must be mode 0600, owned by uid %d", |
449 | filename, getuid()); | 449 | filename, getuid()); |
450 | 450 | ||