summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/libcrypto/bio/bio_cb.c2
-rw-r--r--lib/libcrypto/bio/bss_file.c2
-rw-r--r--lib/libcrypto/x509/by_file.c2
-rw-r--r--lib/libcrypto/x509/x509_d2.c2
-rw-r--r--lib/libcrypto/x509/x509_vfy.h4
-rw-r--r--lib/libssl/ssl.h2
-rw-r--r--lib/libssl/ssl_cert.c2
-rw-r--r--lib/libssl/ssl_lib.c2
-rw-r--r--lib/libssl/ssl_rsa.c14
9 files changed, 0 insertions, 32 deletions
diff --git a/lib/libcrypto/bio/bio_cb.c b/lib/libcrypto/bio/bio_cb.c
index 133d2b77dc3..067a25aba3c 100644
--- a/lib/libcrypto/bio/bio_cb.c
+++ b/lib/libcrypto/bio/bio_cb.c
@@ -139,9 +139,7 @@ BIO_debug_callback(BIO *bio, int cmd, const char *argp, int argi, long argl,
b = (BIO *)bio->cb_arg;
if (b != NULL)
BIO_write(b, buf, strlen(buf));
-#if !defined(OPENSSL_NO_STDIO)
else
fputs(buf, stderr);
-#endif
return (r);
}
diff --git a/lib/libcrypto/bio/bss_file.c b/lib/libcrypto/bio/bss_file.c
index 6f81a45a475..6ac7bdd0202 100644
--- a/lib/libcrypto/bio/bss_file.c
+++ b/lib/libcrypto/bio/bss_file.c
@@ -89,7 +89,6 @@
#include <openssl/bio.h>
#include <openssl/err.h>
-#if !defined(OPENSSL_NO_STDIO)
static int file_write(BIO *h, const char *buf, int num);
static int file_read(BIO *h, char *buf, int size);
@@ -324,6 +323,5 @@ file_puts(BIO *bp, const char *str)
return (ret);
}
-#endif /* OPENSSL_NO_STDIO */
#endif /* HEADER_BSS_FILE_C */
diff --git a/lib/libcrypto/x509/by_file.c b/lib/libcrypto/x509/by_file.c
index ffffac8855e..eb9cdc17ab1 100644
--- a/lib/libcrypto/x509/by_file.c
+++ b/lib/libcrypto/x509/by_file.c
@@ -66,7 +66,6 @@
#include <openssl/x509.h>
#include <openssl/pem.h>
-#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/lib/libcrypto/x509/x509_d2.c b/lib/libcrypto/x509/x509_d2.c
index 5ccd4346655..5ad8188ba9e 100644
--- a/lib/libcrypto/x509/x509_d2.c
+++ b/lib/libcrypto/x509/x509_d2.c
@@ -61,7 +61,6 @@
#include <openssl/crypto.h>
#include <openssl/x509.h>
-#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/lib/libcrypto/x509/x509_vfy.h b/lib/libcrypto/x509/x509_vfy.h
index 1766e3cd219..8f69f919ad4 100644
--- a/lib/libcrypto/x509/x509_vfy.h
+++ b/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);
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 23:27:49 +0000