From 09ad7d1cebcba2baa1b7997a06db82cfbafb2553 Mon Sep 17 00:00:00 2001
From: jsing <jsing@openbsd.org>
Date: Sat, 3 May 2014 16:03:54 +0000
Subject: [PATCH] Nuke more defines - we have setvbuf() and _IONBF.

ok deraadt@
---
 lib/libssl/src/apps/apps.c | 12 ------------
 lib/libssl/src/apps/enc.c  |  4 ----
 2 files changed, 16 deletions(-)

diff --git a/lib/libssl/src/apps/apps.c b/lib/libssl/src/apps/apps.c
index 259981ea0ff..5e6b94f84b7 100644
--- a/lib/libssl/src/apps/apps.c
+++ b/lib/libssl/src/apps/apps.c
@@ -615,11 +615,7 @@ load_cert(BIO * err, const char *file, int format, const char *pass, ENGINE * e,
 		goto end;
 	}
 	if (file == NULL) {
-#ifdef _IONBF
-#ifndef OPENSSL_NO_SETVBUF_IONBF
 		setvbuf(stdin, NULL, _IONBF, 0);
-#endif				/* ndef OPENSSL_NO_SETVBUF_IONBF */
-#endif
 		BIO_set_fp(cert, stdin, BIO_NOCLOSE);
 	} else {
 		if (BIO_read_filename(cert, file) <= 0) {
@@ -709,11 +705,7 @@ load_key(BIO * err, const char *file, int format, int maybe_stdin,
 		goto end;
 	}
 	if (file == NULL && maybe_stdin) {
-#ifdef _IONBF
-#ifndef OPENSSL_NO_SETVBUF_IONBF
 		setvbuf(stdin, NULL, _IONBF, 0);
-#endif				/* ndef OPENSSL_NO_SETVBUF_IONBF */
-#endif
 		BIO_set_fp(key, stdin, BIO_NOCLOSE);
 	} else if (BIO_read_filename(key, file) <= 0) {
 		BIO_printf(err, "Error opening %s %s\n",
@@ -789,11 +781,7 @@ load_pubkey(BIO * err, const char *file, int format, int maybe_stdin,
 		goto end;
 	}
 	if (file == NULL && maybe_stdin) {
-#ifdef _IONBF
-#ifndef OPENSSL_NO_SETVBUF_IONBF
 		setvbuf(stdin, NULL, _IONBF, 0);
-#endif				/* ndef OPENSSL_NO_SETVBUF_IONBF */
-#endif
 		BIO_set_fp(key, stdin, BIO_NOCLOSE);
 	} else if (BIO_read_filename(key, file) <= 0) {
 		BIO_printf(err, "Error opening %s %s\n", key_descrip, file);
diff --git a/lib/libssl/src/apps/enc.c b/lib/libssl/src/apps/enc.c
index eb986623f27..cda196a782b 100644
--- a/lib/libssl/src/apps/enc.c
+++ b/lib/libssl/src/apps/enc.c
@@ -363,10 +363,8 @@ enc_main(int argc, char **argv)
 		BIO_set_callback_arg(out, (char *) bio_err);
 	}
 	if (inf == NULL) {
-#ifndef OPENSSL_NO_SETVBUF_IONBF
 		if (bufsize != NULL)
 			setvbuf(stdin, (char *) NULL, _IONBF, 0);
-#endif				/* ndef OPENSSL_NO_SETVBUF_IONBF */
 		BIO_set_fp(in, stdin, BIO_NOCLOSE);
 	} else {
 		if (BIO_read_filename(in, inf) <= 0) {
@@ -412,10 +410,8 @@ enc_main(int argc, char **argv)
 	}
 	if (outf == NULL) {
 		BIO_set_fp(out, stdout, BIO_NOCLOSE);
-#ifndef OPENSSL_NO_SETVBUF_IONBF
 		if (bufsize != NULL)
 			setvbuf(stdout, (char *) NULL, _IONBF, 0);
-#endif				/* ndef OPENSSL_NO_SETVBUF_IONBF */
 	} else {
 		if (BIO_write_filename(out, outf) <= 0) {
 			perror(outf);
-- 
2.20.1