From e79909cf30efce3949f375df3aef096d334eb6fe Mon Sep 17 00:00:00 2001 From: beck <> Date: Thu, 29 May 2014 18:27:52 +0000 Subject: Any sane platform has stdio. Stop pretending we will ever use a platform that does not. "fire bomb" tedu@ --- src/lib/libcrypto/x509/by_file.c | 2 -- src/lib/libcrypto/x509/x509_d2.c | 2 -- src/lib/libcrypto/x509/x509_vfy.h | 4 ---- 3 files changed, 8 deletions(-) (limited to 'src/lib/libcrypto/x509') diff --git a/src/lib/libcrypto/x509/by_file.c b/src/lib/libcrypto/x509/by_file.c index ffffac8855..eb9cdc17ab 100644 --- a/src/lib/libcrypto/x509/by_file.c +++ b/src/lib/libcrypto/x509/by_file.c @@ -66,7 +66,6 @@ #include #include -#ifndef OPENSSL_NO_STDIO static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc, long argl, char **ret); @@ -283,4 +282,3 @@ X509_load_cert_crl_file(X509_LOOKUP *ctx, const char *file, int type) return count; } -#endif /* OPENSSL_NO_STDIO */ diff --git a/src/lib/libcrypto/x509/x509_d2.c b/src/lib/libcrypto/x509/x509_d2.c index 5ccd434665..5ad8188ba9 100644 --- a/src/lib/libcrypto/x509/x509_d2.c +++ b/src/lib/libcrypto/x509/x509_d2.c @@ -61,7 +61,6 @@ #include #include -#ifndef OPENSSL_NO_STDIO int X509_STORE_set_default_paths(X509_STORE *ctx) { @@ -106,4 +105,3 @@ X509_STORE_load_locations(X509_STORE *ctx, const char *file, const char *path) return (0); return (1); } -#endif diff --git a/src/lib/libcrypto/x509/x509_vfy.h b/src/lib/libcrypto/x509/x509_vfy.h index 1766e3cd21..8f69f919ad 100644 --- a/src/lib/libcrypto/x509/x509_vfy.h +++ b/src/lib/libcrypto/x509/x509_vfy.h @@ -445,11 +445,9 @@ int X509_STORE_get_by_subject(X509_STORE_CTX *vs,int type,X509_NAME *name, int X509_LOOKUP_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc, long argl, char **ret); -#ifndef OPENSSL_NO_STDIO int X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type); int X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type); int X509_load_cert_crl_file(X509_LOOKUP *ctx, const char *file, int type); -#endif X509_LOOKUP *X509_LOOKUP_new(X509_LOOKUP_METHOD *method); @@ -465,11 +463,9 @@ int X509_LOOKUP_by_alias(X509_LOOKUP *ctx, int type, char *str, int len, X509_OBJECT *ret); int X509_LOOKUP_shutdown(X509_LOOKUP *ctx); -#ifndef OPENSSL_NO_STDIO int X509_STORE_load_locations (X509_STORE *ctx, const char *file, const char *dir); int X509_STORE_set_default_paths(X509_STORE *ctx); -#endif int X509_STORE_CTX_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func); -- cgit v1.2.3-55-g6feb