diff options
author | marha <marha@users.sourceforge.net> | 2011-09-30 08:40:25 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-09-30 08:40:25 +0200 |
commit | 60adbfdea1ee754341d64454274e7aa83bae8971 (patch) | |
tree | 1b56329c88f1a881b0e7297bb4283cfbb7e39c97 /openssl/apps/apps.c | |
parent | af72dcd109d7610b96863035541250997c7a172e (diff) | |
download | vcxsrv-60adbfdea1ee754341d64454274e7aa83bae8971.tar.gz vcxsrv-60adbfdea1ee754341d64454274e7aa83bae8971.tar.bz2 vcxsrv-60adbfdea1ee754341d64454274e7aa83bae8971.zip |
Upgraded to openssl-1.0.0e
Diffstat (limited to 'openssl/apps/apps.c')
-rw-r--r-- | openssl/apps/apps.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/openssl/apps/apps.c b/openssl/apps/apps.c index c2797711a..feb7ed46e 100644 --- a/openssl/apps/apps.c +++ b/openssl/apps/apps.c @@ -798,7 +798,9 @@ X509 *load_cert(BIO *err, const char *file, int format, 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); } @@ -899,7 +901,9 @@ EVP_PKEY *load_key(BIO *err, const char *file, int format, int maybe_stdin, 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); } @@ -988,7 +992,9 @@ EVP_PKEY *load_pubkey(BIO *err, const char *file, int format, int maybe_stdin, 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); } |