diff options
| author | jsing <> | 2014-05-03 16:03:54 +0000 |
|---|---|---|
| committer | jsing <> | 2014-05-03 16:03:54 +0000 |
| commit | 0225d59faf0ea827794d5d88eb3e1dddb205242c (patch) | |
| tree | ab6e1aab4c77e8c063e27b06dc61ae6366c3b229 | |
| parent | d7f470a7ef3c6db76e177079e2cbfe887f2861b6 (diff) | |
| download | openbsd-0225d59faf0ea827794d5d88eb3e1dddb205242c.tar.gz openbsd-0225d59faf0ea827794d5d88eb3e1dddb205242c.tar.bz2 openbsd-0225d59faf0ea827794d5d88eb3e1dddb205242c.zip | |
Nuke more defines - we have setvbuf() and _IONBF.
ok deraadt@
| -rw-r--r-- | src/lib/libssl/src/apps/apps.c | 12 | ||||
| -rw-r--r-- | src/lib/libssl/src/apps/enc.c | 4 |
2 files changed, 0 insertions, 16 deletions
diff --git a/src/lib/libssl/src/apps/apps.c b/src/lib/libssl/src/apps/apps.c index 259981ea0f..5e6b94f84b 100644 --- a/src/lib/libssl/src/apps/apps.c +++ b/src/lib/libssl/src/apps/apps.c | |||
| @@ -615,11 +615,7 @@ load_cert(BIO * err, const char *file, int format, const char *pass, ENGINE * e, | |||
| 615 | goto end; | 615 | goto end; |
| 616 | } | 616 | } |
| 617 | if (file == NULL) { | 617 | if (file == NULL) { |
| 618 | #ifdef _IONBF | ||
| 619 | #ifndef OPENSSL_NO_SETVBUF_IONBF | ||
| 620 | setvbuf(stdin, NULL, _IONBF, 0); | 618 | setvbuf(stdin, NULL, _IONBF, 0); |
| 621 | #endif /* ndef OPENSSL_NO_SETVBUF_IONBF */ | ||
| 622 | #endif | ||
| 623 | BIO_set_fp(cert, stdin, BIO_NOCLOSE); | 619 | BIO_set_fp(cert, stdin, BIO_NOCLOSE); |
| 624 | } else { | 620 | } else { |
| 625 | if (BIO_read_filename(cert, file) <= 0) { | 621 | if (BIO_read_filename(cert, file) <= 0) { |
| @@ -709,11 +705,7 @@ load_key(BIO * err, const char *file, int format, int maybe_stdin, | |||
| 709 | goto end; | 705 | goto end; |
| 710 | } | 706 | } |
| 711 | if (file == NULL && maybe_stdin) { | 707 | if (file == NULL && maybe_stdin) { |
| 712 | #ifdef _IONBF | ||
| 713 | #ifndef OPENSSL_NO_SETVBUF_IONBF | ||
| 714 | setvbuf(stdin, NULL, _IONBF, 0); | 708 | setvbuf(stdin, NULL, _IONBF, 0); |
| 715 | #endif /* ndef OPENSSL_NO_SETVBUF_IONBF */ | ||
| 716 | #endif | ||
| 717 | BIO_set_fp(key, stdin, BIO_NOCLOSE); | 709 | BIO_set_fp(key, stdin, BIO_NOCLOSE); |
| 718 | } else if (BIO_read_filename(key, file) <= 0) { | 710 | } else if (BIO_read_filename(key, file) <= 0) { |
| 719 | BIO_printf(err, "Error opening %s %s\n", | 711 | BIO_printf(err, "Error opening %s %s\n", |
| @@ -789,11 +781,7 @@ load_pubkey(BIO * err, const char *file, int format, int maybe_stdin, | |||
| 789 | goto end; | 781 | goto end; |
| 790 | } | 782 | } |
| 791 | if (file == NULL && maybe_stdin) { | 783 | if (file == NULL && maybe_stdin) { |
| 792 | #ifdef _IONBF | ||
| 793 | #ifndef OPENSSL_NO_SETVBUF_IONBF | ||
| 794 | setvbuf(stdin, NULL, _IONBF, 0); | 784 | setvbuf(stdin, NULL, _IONBF, 0); |
| 795 | #endif /* ndef OPENSSL_NO_SETVBUF_IONBF */ | ||
| 796 | #endif | ||
| 797 | BIO_set_fp(key, stdin, BIO_NOCLOSE); | 785 | BIO_set_fp(key, stdin, BIO_NOCLOSE); |
| 798 | } else if (BIO_read_filename(key, file) <= 0) { | 786 | } else if (BIO_read_filename(key, file) <= 0) { |
| 799 | BIO_printf(err, "Error opening %s %s\n", key_descrip, file); | 787 | BIO_printf(err, "Error opening %s %s\n", key_descrip, file); |
diff --git a/src/lib/libssl/src/apps/enc.c b/src/lib/libssl/src/apps/enc.c index eb986623f2..cda196a782 100644 --- a/src/lib/libssl/src/apps/enc.c +++ b/src/lib/libssl/src/apps/enc.c | |||
| @@ -363,10 +363,8 @@ enc_main(int argc, char **argv) | |||
| 363 | BIO_set_callback_arg(out, (char *) bio_err); | 363 | BIO_set_callback_arg(out, (char *) bio_err); |
| 364 | } | 364 | } |
| 365 | if (inf == NULL) { | 365 | if (inf == NULL) { |
| 366 | #ifndef OPENSSL_NO_SETVBUF_IONBF | ||
| 367 | if (bufsize != NULL) | 366 | if (bufsize != NULL) |
| 368 | setvbuf(stdin, (char *) NULL, _IONBF, 0); | 367 | setvbuf(stdin, (char *) NULL, _IONBF, 0); |
| 369 | #endif /* ndef OPENSSL_NO_SETVBUF_IONBF */ | ||
| 370 | BIO_set_fp(in, stdin, BIO_NOCLOSE); | 368 | BIO_set_fp(in, stdin, BIO_NOCLOSE); |
| 371 | } else { | 369 | } else { |
| 372 | if (BIO_read_filename(in, inf) <= 0) { | 370 | if (BIO_read_filename(in, inf) <= 0) { |
| @@ -412,10 +410,8 @@ enc_main(int argc, char **argv) | |||
| 412 | } | 410 | } |
| 413 | if (outf == NULL) { | 411 | if (outf == NULL) { |
| 414 | BIO_set_fp(out, stdout, BIO_NOCLOSE); | 412 | BIO_set_fp(out, stdout, BIO_NOCLOSE); |
| 415 | #ifndef OPENSSL_NO_SETVBUF_IONBF | ||
| 416 | if (bufsize != NULL) | 413 | if (bufsize != NULL) |
| 417 | setvbuf(stdout, (char *) NULL, _IONBF, 0); | 414 | setvbuf(stdout, (char *) NULL, _IONBF, 0); |
| 418 | #endif /* ndef OPENSSL_NO_SETVBUF_IONBF */ | ||
| 419 | } else { | 415 | } else { |
| 420 | if (BIO_write_filename(out, outf) <= 0) { | 416 | if (BIO_write_filename(out, outf) <= 0) { |
| 421 | perror(outf); | 417 | perror(outf); |