diff options
| author | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-07-12 22:49:42 +0200 |
|---|---|---|
| committer | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-07-24 15:48:53 +0200 |
| commit | d0cf719efb4e60364ee80d3d7c9c8f69c69cdb95 (patch) | |
| tree | 4282f2d3c182b7e2d232a06b3c20e22f0e648dfd /apps/apps.c | |
| parent | dbd66443208cb0928b93bce04e32de412d452aff (diff) | |
Remove HEADER_X509_H and HEADER_SSL_H include detectors from apps
The HEADER_X509_H check is redundant, because <openssl/x509.h>
is already included.
Instead of of checking for HEADER_SSL_H, include <openssl/ssl.h>
explicitly in "s_apps.h" and don't include "s_apps.h" where it's
not necessary.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/9364)
Diffstat (limited to 'apps/apps.c')
| -rw-r--r-- | apps/apps.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/apps/apps.c b/apps/apps.c index 43af5ad2a4..79d6bec6c2 100644 --- a/apps/apps.c +++ b/apps/apps.c @@ -40,7 +40,6 @@ #endif #include <openssl/bn.h> #include <openssl/ssl.h> -#include "s_apps.h" #include "apps.h" #ifdef _WIN32 @@ -48,6 +47,14 @@ static int WIN32_rename(const char *from, const char *to); # define rename(from,to) WIN32_rename((from),(to)) #endif +#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) +# include <conio.h> +#endif + +#if defined(OPENSSL_SYS_MSDOS) && !defined(_WIN32) +# define _kbhit kbhit +#endif + #define PASS_SOURCE_SIZE_MAX 4 typedef struct { |