summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2018-03-23 15:12:20 +0100
committerAndy Polyakov <appro@openssl.org>2018-03-27 19:55:54 +0200
commit242fcd695db6225ef98c5ad084e6f15ec5953158 (patch)
treedba35b81ce365e8309c66786efe13c9a54880daf /doc
parentf770d75b1cac264d6280ec7326277daff6965cbb (diff)
rand/randfile.c: permit non-regular files in RAND_load_file.
Apparently applications rely on RAND_load_file's ability to work with non-regular files, customarily with /dev/urandom, so that the ban was not exactly appropriate. Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de> Reviewed-by: Paul Dale <paul.dale@oracle.com> Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5737)
Diffstat (limited to 'doc')
-rw-r--r--doc/man3/RAND_load_file.pod10
1 files changed, 3 insertions, 7 deletions
diff --git a/doc/man3/RAND_load_file.pod b/doc/man3/RAND_load_file.pod
index 2fe932fd3f..489ff2d7f1 100644
--- a/doc/man3/RAND_load_file.pod
+++ b/doc/man3/RAND_load_file.pod
@@ -24,6 +24,9 @@ Do not load the same file multiple times unless its contents have
been updated by RAND_write_file() between reads.
Also, note that B<filename> should be adequately protected so that an
attacker cannot replace or examine the contents.
+If B<filename> is not a regular file, then user is considered to be
+responsible for any side effects, e.g. non-anticipated blocking or
+capture of controlling terminal.
RAND_write_file() writes a number of random bytes (currently 128) to
file B<filename> which can be used to initialize the PRNG by calling
@@ -70,13 +73,6 @@ error.
L<RAND_bytes(3)>, L<RAND_add(3)>
-=head1 HISTORY
-
-A comment in the source since at least OpenSSL 1.0.2 said that
-RAND_load_file() and RAND_write_file() were only intended for regular files,
-and not really device special files such as C</dev/random>. This was
-poorly enforced before OpenSSL 1.1.1.
-
=head1 COPYRIGHT
Copyright 2000-2017 The OpenSSL Project Authors. All Rights Reserved.