mirror of https://github.com/openssl/openssl
apps/x509.c: No warning reading from stdin if redirected
Fixes #22893 Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com> Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> Reviewed-by: Neil Horman <nhorman@openssl.org> (Merged from https://github.com/openssl/openssl/pull/23526)
This commit is contained in:
parent
37cd49f57f
commit
5c846d32d4
|
@ -25,6 +25,7 @@
|
||||||
#ifndef OPENSSL_NO_DSA
|
#ifndef OPENSSL_NO_DSA
|
||||||
# include <openssl/dsa.h>
|
# include <openssl/dsa.h>
|
||||||
#endif
|
#endif
|
||||||
|
#include "internal/e_os.h" /* For isatty() */
|
||||||
|
|
||||||
#undef POSTFIX
|
#undef POSTFIX
|
||||||
#define POSTFIX ".srl"
|
#define POSTFIX ".srl"
|
||||||
|
@ -709,7 +710,7 @@ int x509_main(int argc, char **argv)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (reqfile) {
|
if (reqfile) {
|
||||||
if (infile == NULL)
|
if (infile == NULL && isatty(fileno_stdin()))
|
||||||
BIO_printf(bio_err,
|
BIO_printf(bio_err,
|
||||||
"Warning: Reading cert request from stdin since no -in option is given\n");
|
"Warning: Reading cert request from stdin since no -in option is given\n");
|
||||||
req = load_csr_autofmt(infile, informat, vfyopts,
|
req = load_csr_autofmt(infile, informat, vfyopts,
|
||||||
|
@ -762,7 +763,7 @@ int x509_main(int argc, char **argv)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (infile == NULL)
|
if (infile == NULL && isatty(fileno_stdin()))
|
||||||
BIO_printf(bio_err,
|
BIO_printf(bio_err,
|
||||||
"Warning: Reading certificate from stdin since no -in or -new option is given\n");
|
"Warning: Reading certificate from stdin since no -in or -new option is given\n");
|
||||||
x = load_cert_pass(infile, informat, 1, passin, "certificate");
|
x = load_cert_pass(infile, informat, 1, passin, "certificate");
|
||||||
|
|
|
@ -258,6 +258,7 @@ FILE *__iob_func(void);
|
||||||
# endif
|
# endif
|
||||||
# define unlink _unlink
|
# define unlink _unlink
|
||||||
# define fileno _fileno
|
# define fileno _fileno
|
||||||
|
# define isatty _isatty
|
||||||
# endif
|
# endif
|
||||||
# else
|
# else
|
||||||
# include <strings.h>
|
# include <strings.h>
|
||||||
|
|
Loading…
Reference in New Issue