openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

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:
Tomas Mraz 2024-02-08 17:19:19 +01:00
parent 37cd49f57f
commit 5c846d32d4
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/x509.c
View File

@ -25,6 +25,7 @@
#ifndef OPENSSL_NO_DSA
# include <openssl/dsa.h>
#endif
#include "internal/e_os.h" /* For isatty() */
#undef POSTFIX
#define POSTFIX ".srl"
@ -709,7 +710,7 @@ int x509_main(int argc, char **argv)
}
if (reqfile) {
if (infile == NULL)
if (infile == NULL && isatty(fileno_stdin()))
BIO_printf(bio_err,
"Warning: Reading cert request from stdin since no -in option is given\n");
req = load_csr_autofmt(infile, informat, vfyopts,
@ -762,7 +763,7 @@ int x509_main(int argc, char **argv)
}
}
} else {
if (infile == NULL)
if (infile == NULL && isatty(fileno_stdin()))
BIO_printf(bio_err,
"Warning: Reading certificate from stdin since no -in or -new option is given\n");
x = load_cert_pass(infile, informat, 1, passin, "certificate");

1
include/internal/e_os.h
View File

@ -258,6 +258,7 @@ FILE *__iob_func(void);
# endif
# define unlink _unlink
# define fileno _fileno
# define isatty _isatty
# endif
# else
# include <strings.h>