Revert "Move random-related defines from e_os.h to rand_unix.c"
authorDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Sun, 5 Jan 2020 23:28:20 +0000 (00:28 +0100)
committerDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Tue, 7 Jan 2020 15:31:21 +0000 (16:31 +0100)
commitf245be91a7bb4ccfdff630f92390e7ae72c6ca98
tree6b7af048c34540fb6492ed26f9e24327ed05f03a
parent16d92fa873975b2a32d3ea01b7d63c64f7fd9ee7
Revert "Move random-related defines from e_os.h to rand_unix.c"

This reverts commit 7b18d1a53f932391bbc599a4717d6f98a597849c, which moved the
DEVRANDOM and DEVRANDOM_EGD defines into rand_unix.c. That change introduced
the regression that the compiler complains about missing declarations in
apps/version.c when OpenSSL is configured using `--with-rand-seed=devrandom`
(resp. `--with-rand-seed=egd`):

apps/version.c:173:42: error: 'DEVRANDOM' undeclared
             static const char *dev[] = { DEVRANDOM, NULL };
                                          ^~~~~~~~~

Fixes #10759

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10764)
crypto/rand/rand_unix.c
e_os.h