generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Have the test executables output in text mode

Browse Source 
The test executables use standard output and standard error for text output,
so let's open the corresponding BIOs in text mode.

Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Richard Levitte 2015-09-04 14:07:57 +02:00
parent bdd58d9846
commit 0f81f5f78c
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/bntest.c
View File

@ -168,7 +168,7 @@ int main(int argc, char *argv[])
if (out == NULL) if (out == NULL)
EXIT(1); EXIT(1);
if (outfile == NULL) { if (outfile == NULL) {
BIO_set_fp(out, stdout, BIO_NOCLOSE); BIO_set_fp(out, stdout, BIO_NOCLOSE | BIO_FP_TEXT);
} else { } else {
if (!BIO_write_filename(out, outfile)) { if (!BIO_write_filename(out, outfile)) {
perror(outfile); perror(outfile);

2
test/dhtest.c
View File

@ -107,7 +107,7 @@ int main(int argc, char *argv[])
out = BIO_new(BIO_s_file()); out = BIO_new(BIO_s_file());
if (out == NULL) if (out == NULL)
EXIT(1); EXIT(1);
BIO_set_fp(out, stdout, BIO_NOCLOSE); BIO_set_fp(out, stdout, BIO_NOCLOSE | BIO_FP_TEXT);
_cb = BN_GENCB_new(); _cb = BN_GENCB_new();
if (!_cb) if (!_cb)

2
test/dsatest.c
View File

@ -136,7 +136,7 @@ int main(int argc, char **argv)
unsigned int siglen; unsigned int siglen;
if (bio_err == NULL) if (bio_err == NULL)
bio_err = BIO_new_fp(stderr, BIO_NOCLOSE); bio_err = BIO_new_fp(stderr, BIO_NOCLOSE | BIO_FP_TEXT);
CRYPTO_malloc_debug_init(); CRYPTO_malloc_debug_init();
CRYPTO_dbg_set_options(V_CRYPTO_MDEBUG_ALL); CRYPTO_dbg_set_options(V_CRYPTO_MDEBUG_ALL);

2
test/ecdhtest.c
View File

@ -466,7 +466,7 @@ int main(int argc, char *argv[])
out = BIO_new(BIO_s_file()); out = BIO_new(BIO_s_file());
if (out == NULL) if (out == NULL)
EXIT(1); EXIT(1);
BIO_set_fp(out, stdout, BIO_NOCLOSE); BIO_set_fp(out, stdout, BIO_NOCLOSE | BIO_FP_TEXT);
if ((ctx = BN_CTX_new()) == NULL) if ((ctx = BN_CTX_new()) == NULL)
goto err; goto err;

2
test/ecdsatest.c
View File

@ -510,7 +510,7 @@ int main(void)
int ret = 1; int ret = 1;
BIO *out; BIO *out;
out = BIO_new_fp(stdout, BIO_NOCLOSE); out = BIO_new_fp(stdout, BIO_NOCLOSE | BIO_FP_TEXT);
/* enable memory leak checking unless explicitly disabled */ /* enable memory leak checking unless explicitly disabled */
if (!((getenv("OPENSSL_DEBUG_MEMORY") != NULL) && if (!((getenv("OPENSSL_DEBUG_MEMORY") != NULL) &&

2
test/exptest.c
View File

@ -151,7 +151,7 @@ int main(int argc, char *argv[])
if (out == NULL) if (out == NULL)
EXIT(1); EXIT(1);
BIO_set_fp(out, stdout, BIO_NOCLOSE); BIO_set_fp(out, stdout, BIO_NOCLOSE | BIO_FP_TEXT);
for (i = 0; i < 200; i++) { for (i = 0; i < 200; i++) {
RAND_bytes(&c, 1); RAND_bytes(&c, 1);

2
test/jpaketest.c
View File

@ -114,7 +114,7 @@ int main(int argc, char **argv)
BIGNUM *secret = BN_new(); BIGNUM *secret = BN_new();
BIO *bio_err; BIO *bio_err;
bio_err = BIO_new_fp(stderr, BIO_NOCLOSE); bio_err = BIO_new_fp(stderr, BIO_NOCLOSE | BIO_FP_TEXT);
CRYPTO_malloc_debug_init(); CRYPTO_malloc_debug_init();
CRYPTO_dbg_set_options(V_CRYPTO_MDEBUG_ALL); CRYPTO_dbg_set_options(V_CRYPTO_MDEBUG_ALL);

2
test/srptest.c
View File

@ -124,7 +124,7 @@ static int run_srp(const char *username, const char *client_pass,
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
BIO *bio_err; BIO *bio_err;
bio_err = BIO_new_fp(stderr, BIO_NOCLOSE); bio_err = BIO_new_fp(stderr, BIO_NOCLOSE | BIO_FP_TEXT);
CRYPTO_malloc_debug_init(); CRYPTO_malloc_debug_init();
CRYPTO_dbg_set_options(V_CRYPTO_MDEBUG_ALL); CRYPTO_dbg_set_options(V_CRYPTO_MDEBUG_ALL);

2
test/ssltest.c
View File

@ -1310,7 +1310,7 @@ int main(int argc, char *argv[])
if (fips_mode) { if (fips_mode) {
if (!FIPS_mode_set(1)) { if (!FIPS_mode_set(1)) {
ERR_load_crypto_strings(); ERR_load_crypto_strings();
ERR_print_errors(BIO_new_fp(stderr, BIO_NOCLOSE)); ERR_print_errors(bio_err);
EXIT(1); EXIT(1);
} else } else
fprintf(stderr, "*** IN FIPS MODE ***\n"); fprintf(stderr, "*** IN FIPS MODE ***\n");