From 9609d19ba5b5137350eedd2f727a8c73998db85d Mon Sep 17 00:00:00 2001
From: Bob Beck <beck@cvs.openbsd.org>
Date: Thu, 29 May 2014 18:27:53 +0000
Subject: Any sane platform has stdio. Stop pretending we will ever use a
 platform that does not. "fire bomb" tedu@

---
 lib/libssl/ssl.h      |  2 --
 lib/libssl/ssl_cert.c |  2 --
 lib/libssl/ssl_lib.c  |  2 --
 lib/libssl/ssl_rsa.c  | 14 --------------
 4 files changed, 20 deletions(-)

(limited to 'lib/libssl')

diff --git a/lib/libssl/ssl.h b/lib/libssl/ssl.h
index 69c0bb00e27..31bc197b54c 100644
--- a/lib/libssl/ssl.h
+++ b/lib/libssl/ssl.h
@@ -1627,7 +1627,6 @@ int	SSL_use_PrivateKey_ASN1(int pk, SSL *ssl, const unsigned char *d, long len);
 int	SSL_use_certificate(SSL *ssl, X509 *x);
 int	SSL_use_certificate_ASN1(SSL *ssl, const unsigned char *d, int len);
 
-#ifndef OPENSSL_NO_STDIO
 int	SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type);
 int	SSL_use_PrivateKey_file(SSL *ssl, const char *file, int type);
 int	SSL_use_certificate_file(SSL *ssl, const char *file, int type);
@@ -1640,7 +1639,6 @@ int	SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
 	    const char *file);
 int	SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
 	    const char *dir);
-#endif
 
 void	SSL_load_error_strings(void );
 const char *SSL_state_string(const SSL *s);
diff --git a/lib/libssl/ssl_cert.c b/lib/libssl/ssl_cert.c
index f506ae685ff..c4099ca24fa 100644
--- a/lib/libssl/ssl_cert.c
+++ b/lib/libssl/ssl_cert.c
@@ -589,7 +589,6 @@ xname_cmp(const X509_NAME * const *a, const X509_NAME * const *b)
 	return (X509_NAME_cmp(*a, *b));
 }
 
-#ifndef OPENSSL_NO_STDIO
 /*!
  * Load CA certs from a file into a ::STACK. Note that it is somewhat misnamed;
  * it doesn't really have anything to do with clients (except that a common use
@@ -657,7 +656,6 @@ err:
 		ERR_clear_error();
 	return (ret);
 }
-#endif
 
 /*!
  * Add a file of certs to a stack.
diff --git a/lib/libssl/ssl_lib.c b/lib/libssl/ssl_lib.c
index 90a94817b68..3e654117bf0 100644
--- a/lib/libssl/ssl_lib.c
+++ b/lib/libssl/ssl_lib.c
@@ -2895,7 +2895,6 @@ SSL_set_SSL_CTX(SSL *ssl, SSL_CTX* ctx)
 	return (ssl->ctx);
 }
 
-#ifndef OPENSSL_NO_STDIO
 int
 SSL_CTX_set_default_verify_paths(SSL_CTX *ctx)
 {
@@ -2908,7 +2907,6 @@ SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile,
 {
 	return (X509_STORE_load_locations(ctx->cert_store, CAfile, CApath));
 }
-#endif
 
 void
 SSL_set_info_callback(SSL *ssl,
diff --git a/lib/libssl/ssl_rsa.c b/lib/libssl/ssl_rsa.c
index 05d18de1d99..23891bf11b2 100644
--- a/lib/libssl/ssl_rsa.c
+++ b/lib/libssl/ssl_rsa.c
@@ -80,7 +80,6 @@ SSL_use_certificate(SSL *ssl, X509 *x)
 	return (ssl_set_cert(ssl->cert, x));
 }
 
-#ifndef OPENSSL_NO_STDIO
 int
 SSL_use_certificate_file(SSL *ssl, const char *file, int type)
 {
@@ -123,7 +122,6 @@ end:
 		BIO_free(in);
 	return (ret);
 }
-#endif
 
 int
 SSL_use_certificate_ASN1(SSL *ssl, const unsigned char *d, int len)
@@ -210,7 +208,6 @@ ssl_set_pkey(CERT *c, EVP_PKEY *pkey)
 	return (1);
 }
 
-#ifndef OPENSSL_NO_STDIO
 int
 SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type)
 {
@@ -250,7 +247,6 @@ end:
 		BIO_free(in);
 	return (ret);
 }
-#endif
 
 int
 SSL_use_RSAPrivateKey_ASN1(SSL *ssl, unsigned char *d, long len)
@@ -287,7 +283,6 @@ SSL_use_PrivateKey(SSL *ssl, EVP_PKEY *pkey)
 	return (ret);
 }
 
-#ifndef OPENSSL_NO_STDIO
 int
 SSL_use_PrivateKey_file(SSL *ssl, const char *file, int type)
 {
@@ -327,7 +322,6 @@ end:
 		BIO_free(in);
 	return (ret);
 }
-#endif
 
 int
 SSL_use_PrivateKey_ASN1(int type, SSL *ssl, const unsigned char *d, long len)
@@ -415,7 +409,6 @@ ssl_set_cert(CERT *c, X509 *x)
 	return (1);
 }
 
-#ifndef OPENSSL_NO_STDIO
 int
 SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type)
 {
@@ -458,7 +451,6 @@ end:
 		BIO_free(in);
 	return (ret);
 }
-#endif
 
 int
 SSL_CTX_use_certificate_ASN1(SSL_CTX *ctx, int len, const unsigned char *d)
@@ -504,7 +496,6 @@ SSL_CTX_use_RSAPrivateKey(SSL_CTX *ctx, RSA *rsa)
 	return (ret);
 }
 
-#ifndef OPENSSL_NO_STDIO
 int
 SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file, int type)
 {
@@ -544,7 +535,6 @@ end:
 		BIO_free(in);
 	return (ret);
 }
-#endif
 
 int
 SSL_CTX_use_RSAPrivateKey_ASN1(SSL_CTX *ctx, const unsigned char *d, long len)
@@ -578,7 +568,6 @@ SSL_CTX_use_PrivateKey(SSL_CTX *ctx, EVP_PKEY *pkey)
 	return (ssl_set_pkey(ctx->cert, pkey));
 }
 
-#ifndef OPENSSL_NO_STDIO
 int
 SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type)
 {
@@ -618,7 +607,6 @@ end:
 		BIO_free(in);
 	return (ret);
 }
-#endif
 
 int
 SSL_CTX_use_PrivateKey_ASN1(int type, SSL_CTX *ctx, const unsigned char *d,
@@ -640,7 +628,6 @@ SSL_CTX_use_PrivateKey_ASN1(int type, SSL_CTX *ctx, const unsigned char *d,
 }
 
 
-#ifndef OPENSSL_NO_STDIO
 /* Read a file that contains our certificate in "PEM" format,
  * possibly followed by a sequence of CA certificates that should be
  * sent to the peer in the Certificate message.
@@ -720,4 +707,3 @@ end:
 		BIO_free(in);
 	return (ret);
 }
-#endif
-- 
cgit v1.2.3