summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbeck <>2014-05-29 18:27:52 +0000
committerbeck <>2014-05-29 18:27:52 +0000
commit4327b50dba2fee1f5f80fb82c9e8af6c4e5c1f66 (patch)
treeca968a1e03b93576c57aab8158bdc988383fd13a /src
parent4b16b4eb75628208ef991b55d5625a36adc0d6fd (diff)
downloadopenbsd-4327b50dba2fee1f5f80fb82c9e8af6c4e5c1f66.tar.gz
openbsd-4327b50dba2fee1f5f80fb82c9e8af6c4e5c1f66.tar.bz2
openbsd-4327b50dba2fee1f5f80fb82c9e8af6c4e5c1f66.zip
Any sane platform has stdio. Stop pretending we will ever use a platform
that does not. "fire bomb" tedu@
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/bio/bio_cb.c2
-rw-r--r--src/lib/libcrypto/bio/bss_file.c2
-rw-r--r--src/lib/libcrypto/x509/by_file.c2
-rw-r--r--src/lib/libcrypto/x509/x509_d2.c2
-rw-r--r--src/lib/libcrypto/x509/x509_vfy.h4
-rw-r--r--src/lib/libssl/src/crypto/bio/bio_cb.c2
-rw-r--r--src/lib/libssl/src/crypto/bio/bss_file.c2
-rw-r--r--src/lib/libssl/src/crypto/x509/by_file.c2
-rw-r--r--src/lib/libssl/src/crypto/x509/x509_d2.c2
-rw-r--r--src/lib/libssl/src/crypto/x509/x509_vfy.h4
-rw-r--r--src/lib/libssl/src/ssl/ssl.h2
-rw-r--r--src/lib/libssl/src/ssl/ssl_cert.c2
-rw-r--r--src/lib/libssl/src/ssl/ssl_lib.c2
-rw-r--r--src/lib/libssl/src/ssl/ssl_rsa.c14
-rw-r--r--src/lib/libssl/ssl.h2
-rw-r--r--src/lib/libssl/ssl_cert.c2
-rw-r--r--src/lib/libssl/ssl_lib.c2
-rw-r--r--src/lib/libssl/ssl_rsa.c14
18 files changed, 0 insertions, 64 deletions
diff --git a/src/lib/libcrypto/bio/bio_cb.c b/src/lib/libcrypto/bio/bio_cb.c
index 133d2b77dc..067a25aba3 100644
--- a/src/lib/libcrypto/bio/bio_cb.c
+++ b/src/lib/libcrypto/bio/bio_cb.c
@@ -139,9 +139,7 @@ BIO_debug_callback(BIO *bio, int cmd, const char *argp, int argi, long argl,
139 b = (BIO *)bio->cb_arg; 139 b = (BIO *)bio->cb_arg;
140 if (b != NULL) 140 if (b != NULL)
141 BIO_write(b, buf, strlen(buf)); 141 BIO_write(b, buf, strlen(buf));
142#if !defined(OPENSSL_NO_STDIO)
143 else 142 else
144 fputs(buf, stderr); 143 fputs(buf, stderr);
145#endif
146 return (r); 144 return (r);
147} 145}
diff --git a/src/lib/libcrypto/bio/bss_file.c b/src/lib/libcrypto/bio/bss_file.c
index 6f81a45a47..6ac7bdd020 100644
--- a/src/lib/libcrypto/bio/bss_file.c
+++ b/src/lib/libcrypto/bio/bss_file.c
@@ -89,7 +89,6 @@
89#include <openssl/bio.h> 89#include <openssl/bio.h>
90#include <openssl/err.h> 90#include <openssl/err.h>
91 91
92#if !defined(OPENSSL_NO_STDIO)
93 92
94static int file_write(BIO *h, const char *buf, int num); 93static int file_write(BIO *h, const char *buf, int num);
95static int file_read(BIO *h, char *buf, int size); 94static int file_read(BIO *h, char *buf, int size);
@@ -324,6 +323,5 @@ file_puts(BIO *bp, const char *str)
324 return (ret); 323 return (ret);
325} 324}
326 325
327#endif /* OPENSSL_NO_STDIO */
328 326
329#endif /* HEADER_BSS_FILE_C */ 327#endif /* HEADER_BSS_FILE_C */
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 @@
66#include <openssl/x509.h> 66#include <openssl/x509.h>
67#include <openssl/pem.h> 67#include <openssl/pem.h>
68 68
69#ifndef OPENSSL_NO_STDIO
70 69
71static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc, 70static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc,
72 long argl, char **ret); 71 long argl, char **ret);
@@ -283,4 +282,3 @@ X509_load_cert_crl_file(X509_LOOKUP *ctx, const char *file, int type)
283 return count; 282 return count;
284} 283}
285 284
286#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 @@
61#include <openssl/crypto.h> 61#include <openssl/crypto.h>
62#include <openssl/x509.h> 62#include <openssl/x509.h>
63 63
64#ifndef OPENSSL_NO_STDIO
65int 64int
66X509_STORE_set_default_paths(X509_STORE *ctx) 65X509_STORE_set_default_paths(X509_STORE *ctx)
67{ 66{
@@ -106,4 +105,3 @@ X509_STORE_load_locations(X509_STORE *ctx, const char *file, const char *path)
106 return (0); 105 return (0);
107 return (1); 106 return (1);
108} 107}
109#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,
445int X509_LOOKUP_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc, 445int X509_LOOKUP_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc,
446 long argl, char **ret); 446 long argl, char **ret);
447 447
448#ifndef OPENSSL_NO_STDIO
449int X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type); 448int X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type);
450int X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type); 449int X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type);
451int X509_load_cert_crl_file(X509_LOOKUP *ctx, const char *file, int type); 450int X509_load_cert_crl_file(X509_LOOKUP *ctx, const char *file, int type);
452#endif
453 451
454 452
455X509_LOOKUP *X509_LOOKUP_new(X509_LOOKUP_METHOD *method); 453X509_LOOKUP *X509_LOOKUP_new(X509_LOOKUP_METHOD *method);
@@ -465,11 +463,9 @@ int X509_LOOKUP_by_alias(X509_LOOKUP *ctx, int type, char *str,
465 int len, X509_OBJECT *ret); 463 int len, X509_OBJECT *ret);
466int X509_LOOKUP_shutdown(X509_LOOKUP *ctx); 464int X509_LOOKUP_shutdown(X509_LOOKUP *ctx);
467 465
468#ifndef OPENSSL_NO_STDIO
469int X509_STORE_load_locations (X509_STORE *ctx, 466int X509_STORE_load_locations (X509_STORE *ctx,
470 const char *file, const char *dir); 467 const char *file, const char *dir);
471int X509_STORE_set_default_paths(X509_STORE *ctx); 468int X509_STORE_set_default_paths(X509_STORE *ctx);
472#endif
473 469
474int X509_STORE_CTX_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, 470int X509_STORE_CTX_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
475 CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func); 471 CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
diff --git a/src/lib/libssl/src/crypto/bio/bio_cb.c b/src/lib/libssl/src/crypto/bio/bio_cb.c
index 133d2b77dc..067a25aba3 100644
--- a/src/lib/libssl/src/crypto/bio/bio_cb.c
+++ b/src/lib/libssl/src/crypto/bio/bio_cb.c
@@ -139,9 +139,7 @@ BIO_debug_callback(BIO *bio, int cmd, const char *argp, int argi, long argl,
139 b = (BIO *)bio->cb_arg; 139 b = (BIO *)bio->cb_arg;
140 if (b != NULL) 140 if (b != NULL)
141 BIO_write(b, buf, strlen(buf)); 141 BIO_write(b, buf, strlen(buf));
142#if !defined(OPENSSL_NO_STDIO)
143 else 142 else
144 fputs(buf, stderr); 143 fputs(buf, stderr);
145#endif
146 return (r); 144 return (r);
147} 145}
diff --git a/src/lib/libssl/src/crypto/bio/bss_file.c b/src/lib/libssl/src/crypto/bio/bss_file.c
index 6f81a45a47..6ac7bdd020 100644
--- a/src/lib/libssl/src/crypto/bio/bss_file.c
+++ b/src/lib/libssl/src/crypto/bio/bss_file.c
@@ -89,7 +89,6 @@
89#include <openssl/bio.h> 89#include <openssl/bio.h>
90#include <openssl/err.h> 90#include <openssl/err.h>
91 91
92#if !defined(OPENSSL_NO_STDIO)
93 92
94static int file_write(BIO *h, const char *buf, int num); 93static int file_write(BIO *h, const char *buf, int num);
95static int file_read(BIO *h, char *buf, int size); 94static int file_read(BIO *h, char *buf, int size);
@@ -324,6 +323,5 @@ file_puts(BIO *bp, const char *str)
324 return (ret); 323 return (ret);
325} 324}
326 325
327#endif /* OPENSSL_NO_STDIO */
328 326
329#endif /* HEADER_BSS_FILE_C */ 327#endif /* HEADER_BSS_FILE_C */
diff --git a/src/lib/libssl/src/crypto/x509/by_file.c b/src/lib/libssl/src/crypto/x509/by_file.c
index ffffac8855..eb9cdc17ab 100644
--- a/src/lib/libssl/src/crypto/x509/by_file.c
+++ b/src/lib/libssl/src/crypto/x509/by_file.c
@@ -66,7 +66,6 @@
66#include <openssl/x509.h> 66#include <openssl/x509.h>
67#include <openssl/pem.h> 67#include <openssl/pem.h>
68 68
69#ifndef OPENSSL_NO_STDIO
70 69
71static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc, 70static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc,
72 long argl, char **ret); 71 long argl, char **ret);
@@ -283,4 +282,3 @@ X509_load_cert_crl_file(X509_LOOKUP *ctx, const char *file, int type)
283 return count; 282 return count;
284} 283}
285 284
286#endif /* OPENSSL_NO_STDIO */
diff --git a/src/lib/libssl/src/crypto/x509/x509_d2.c b/src/lib/libssl/src/crypto/x509/x509_d2.c
index 5ccd434665..5ad8188ba9 100644
--- a/src/lib/libssl/src/crypto/x509/x509_d2.c
+++ b/src/lib/libssl/src/crypto/x509/x509_d2.c
@@ -61,7 +61,6 @@
61#include <openssl/crypto.h> 61#include <openssl/crypto.h>
62#include <openssl/x509.h> 62#include <openssl/x509.h>
63 63
64#ifndef OPENSSL_NO_STDIO
65int 64int
66X509_STORE_set_default_paths(X509_STORE *ctx) 65X509_STORE_set_default_paths(X509_STORE *ctx)
67{ 66{
@@ -106,4 +105,3 @@ X509_STORE_load_locations(X509_STORE *ctx, const char *file, const char *path)
106 return (0); 105 return (0);
107 return (1); 106 return (1);
108} 107}
109#endif
diff --git a/src/lib/libssl/src/crypto/x509/x509_vfy.h b/src/lib/libssl/src/crypto/x509/x509_vfy.h
index 1766e3cd21..8f69f919ad 100644
--- a/src/lib/libssl/src/crypto/x509/x509_vfy.h
+++ b/src/lib/libssl/src/crypto/x509/x509_vfy.h
@@ -445,11 +445,9 @@ int X509_STORE_get_by_subject(X509_STORE_CTX *vs,int type,X509_NAME *name,
445int X509_LOOKUP_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc, 445int X509_LOOKUP_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc,
446 long argl, char **ret); 446 long argl, char **ret);
447 447
448#ifndef OPENSSL_NO_STDIO
449int X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type); 448int X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type);
450int X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type); 449int X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type);
451int X509_load_cert_crl_file(X509_LOOKUP *ctx, const char *file, int type); 450int X509_load_cert_crl_file(X509_LOOKUP *ctx, const char *file, int type);
452#endif
453 451
454 452
455X509_LOOKUP *X509_LOOKUP_new(X509_LOOKUP_METHOD *method); 453X509_LOOKUP *X509_LOOKUP_new(X509_LOOKUP_METHOD *method);
@@ -465,11 +463,9 @@ int X509_LOOKUP_by_alias(X509_LOOKUP *ctx, int type, char *str,
465 int len, X509_OBJECT *ret); 463 int len, X509_OBJECT *ret);
466int X509_LOOKUP_shutdown(X509_LOOKUP *ctx); 464int X509_LOOKUP_shutdown(X509_LOOKUP *ctx);
467 465
468#ifndef OPENSSL_NO_STDIO
469int X509_STORE_load_locations (X509_STORE *ctx, 466int X509_STORE_load_locations (X509_STORE *ctx,
470 const char *file, const char *dir); 467 const char *file, const char *dir);
471int X509_STORE_set_default_paths(X509_STORE *ctx); 468int X509_STORE_set_default_paths(X509_STORE *ctx);
472#endif
473 469
474int X509_STORE_CTX_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, 470int X509_STORE_CTX_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
475 CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func); 471 CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
diff --git a/src/lib/libssl/src/ssl/ssl.h b/src/lib/libssl/src/ssl/ssl.h
index 69c0bb00e2..31bc197b54 100644
--- a/src/lib/libssl/src/ssl/ssl.h
+++ b/src/lib/libssl/src/ssl/ssl.h
@@ -1627,7 +1627,6 @@ int SSL_use_PrivateKey_ASN1(int pk, SSL *ssl, const unsigned char *d, long len);
1627int SSL_use_certificate(SSL *ssl, X509 *x); 1627int SSL_use_certificate(SSL *ssl, X509 *x);
1628int SSL_use_certificate_ASN1(SSL *ssl, const unsigned char *d, int len); 1628int SSL_use_certificate_ASN1(SSL *ssl, const unsigned char *d, int len);
1629 1629
1630#ifndef OPENSSL_NO_STDIO
1631int SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type); 1630int SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type);
1632int SSL_use_PrivateKey_file(SSL *ssl, const char *file, int type); 1631int SSL_use_PrivateKey_file(SSL *ssl, const char *file, int type);
1633int SSL_use_certificate_file(SSL *ssl, const char *file, int type); 1632int 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,
1640 const char *file); 1639 const char *file);
1641int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs, 1640int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
1642 const char *dir); 1641 const char *dir);
1643#endif
1644 1642
1645void SSL_load_error_strings(void ); 1643void SSL_load_error_strings(void );
1646const char *SSL_state_string(const SSL *s); 1644const char *SSL_state_string(const SSL *s);
diff --git a/src/lib/libssl/src/ssl/ssl_cert.c b/src/lib/libssl/src/ssl/ssl_cert.c
index f506ae685f..c4099ca24f 100644
--- a/src/lib/libssl/src/ssl/ssl_cert.c
+++ b/src/lib/libssl/src/ssl/ssl_cert.c
@@ -589,7 +589,6 @@ xname_cmp(const X509_NAME * const *a, const X509_NAME * const *b)
589 return (X509_NAME_cmp(*a, *b)); 589 return (X509_NAME_cmp(*a, *b));
590} 590}
591 591
592#ifndef OPENSSL_NO_STDIO
593/*! 592/*!
594 * Load CA certs from a file into a ::STACK. Note that it is somewhat misnamed; 593 * Load CA certs from a file into a ::STACK. Note that it is somewhat misnamed;
595 * it doesn't really have anything to do with clients (except that a common use 594 * it doesn't really have anything to do with clients (except that a common use
@@ -657,7 +656,6 @@ err:
657 ERR_clear_error(); 656 ERR_clear_error();
658 return (ret); 657 return (ret);
659} 658}
660#endif
661 659
662/*! 660/*!
663 * Add a file of certs to a stack. 661 * Add a file of certs to a stack.
diff --git a/src/lib/libssl/src/ssl/ssl_lib.c b/src/lib/libssl/src/ssl/ssl_lib.c
index 90a94817b6..3e654117bf 100644
--- a/src/lib/libssl/src/ssl/ssl_lib.c
+++ b/src/lib/libssl/src/ssl/ssl_lib.c
@@ -2895,7 +2895,6 @@ SSL_set_SSL_CTX(SSL *ssl, SSL_CTX* ctx)
2895 return (ssl->ctx); 2895 return (ssl->ctx);
2896} 2896}
2897 2897
2898#ifndef OPENSSL_NO_STDIO
2899int 2898int
2900SSL_CTX_set_default_verify_paths(SSL_CTX *ctx) 2899SSL_CTX_set_default_verify_paths(SSL_CTX *ctx)
2901{ 2900{
@@ -2908,7 +2907,6 @@ SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile,
2908{ 2907{
2909 return (X509_STORE_load_locations(ctx->cert_store, CAfile, CApath)); 2908 return (X509_STORE_load_locations(ctx->cert_store, CAfile, CApath));
2910} 2909}
2911#endif
2912 2910
2913void 2911void
2914SSL_set_info_callback(SSL *ssl, 2912SSL_set_info_callback(SSL *ssl,
diff --git a/src/lib/libssl/src/ssl/ssl_rsa.c b/src/lib/libssl/src/ssl/ssl_rsa.c
index 05d18de1d9..23891bf11b 100644
--- a/src/lib/libssl/src/ssl/ssl_rsa.c
+++ b/src/lib/libssl/src/ssl/ssl_rsa.c
@@ -80,7 +80,6 @@ SSL_use_certificate(SSL *ssl, X509 *x)
80 return (ssl_set_cert(ssl->cert, x)); 80 return (ssl_set_cert(ssl->cert, x));
81} 81}
82 82
83#ifndef OPENSSL_NO_STDIO
84int 83int
85SSL_use_certificate_file(SSL *ssl, const char *file, int type) 84SSL_use_certificate_file(SSL *ssl, const char *file, int type)
86{ 85{
@@ -123,7 +122,6 @@ end:
123 BIO_free(in); 122 BIO_free(in);
124 return (ret); 123 return (ret);
125} 124}
126#endif
127 125
128int 126int
129SSL_use_certificate_ASN1(SSL *ssl, const unsigned char *d, int len) 127SSL_use_certificate_ASN1(SSL *ssl, const unsigned char *d, int len)
@@ -210,7 +208,6 @@ ssl_set_pkey(CERT *c, EVP_PKEY *pkey)
210 return (1); 208 return (1);
211} 209}
212 210
213#ifndef OPENSSL_NO_STDIO
214int 211int
215SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type) 212SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type)
216{ 213{
@@ -250,7 +247,6 @@ end:
250 BIO_free(in); 247 BIO_free(in);
251 return (ret); 248 return (ret);
252} 249}
253#endif
254 250
255int 251int
256SSL_use_RSAPrivateKey_ASN1(SSL *ssl, unsigned char *d, long len) 252SSL_use_RSAPrivateKey_ASN1(SSL *ssl, unsigned char *d, long len)
@@ -287,7 +283,6 @@ SSL_use_PrivateKey(SSL *ssl, EVP_PKEY *pkey)
287 return (ret); 283 return (ret);
288} 284}
289 285
290#ifndef OPENSSL_NO_STDIO
291int 286int
292SSL_use_PrivateKey_file(SSL *ssl, const char *file, int type) 287SSL_use_PrivateKey_file(SSL *ssl, const char *file, int type)
293{ 288{
@@ -327,7 +322,6 @@ end:
327 BIO_free(in); 322 BIO_free(in);
328 return (ret); 323 return (ret);
329} 324}
330#endif
331 325
332int 326int
333SSL_use_PrivateKey_ASN1(int type, SSL *ssl, const unsigned char *d, long len) 327SSL_use_PrivateKey_ASN1(int type, SSL *ssl, const unsigned char *d, long len)
@@ -415,7 +409,6 @@ ssl_set_cert(CERT *c, X509 *x)
415 return (1); 409 return (1);
416} 410}
417 411
418#ifndef OPENSSL_NO_STDIO
419int 412int
420SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type) 413SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type)
421{ 414{
@@ -458,7 +451,6 @@ end:
458 BIO_free(in); 451 BIO_free(in);
459 return (ret); 452 return (ret);
460} 453}
461#endif
462 454
463int 455int
464SSL_CTX_use_certificate_ASN1(SSL_CTX *ctx, int len, const unsigned char *d) 456SSL_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)
504 return (ret); 496 return (ret);
505} 497}
506 498
507#ifndef OPENSSL_NO_STDIO
508int 499int
509SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file, int type) 500SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file, int type)
510{ 501{
@@ -544,7 +535,6 @@ end:
544 BIO_free(in); 535 BIO_free(in);
545 return (ret); 536 return (ret);
546} 537}
547#endif
548 538
549int 539int
550SSL_CTX_use_RSAPrivateKey_ASN1(SSL_CTX *ctx, const unsigned char *d, long len) 540SSL_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)
578 return (ssl_set_pkey(ctx->cert, pkey)); 568 return (ssl_set_pkey(ctx->cert, pkey));
579} 569}
580 570
581#ifndef OPENSSL_NO_STDIO
582int 571int
583SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type) 572SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type)
584{ 573{
@@ -618,7 +607,6 @@ end:
618 BIO_free(in); 607 BIO_free(in);
619 return (ret); 608 return (ret);
620} 609}
621#endif
622 610
623int 611int
624SSL_CTX_use_PrivateKey_ASN1(int type, SSL_CTX *ctx, const unsigned char *d, 612SSL_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,
640} 628}
641 629
642 630
643#ifndef OPENSSL_NO_STDIO
644/* Read a file that contains our certificate in "PEM" format, 631/* Read a file that contains our certificate in "PEM" format,
645 * possibly followed by a sequence of CA certificates that should be 632 * possibly followed by a sequence of CA certificates that should be
646 * sent to the peer in the Certificate message. 633 * sent to the peer in the Certificate message.
@@ -720,4 +707,3 @@ end:
720 BIO_free(in); 707 BIO_free(in);
721 return (ret); 708 return (ret);
722} 709}
723#endif
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index 69c0bb00e2..31bc197b54 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -1627,7 +1627,6 @@ int SSL_use_PrivateKey_ASN1(int pk, SSL *ssl, const unsigned char *d, long len);
1627int SSL_use_certificate(SSL *ssl, X509 *x); 1627int SSL_use_certificate(SSL *ssl, X509 *x);
1628int SSL_use_certificate_ASN1(SSL *ssl, const unsigned char *d, int len); 1628int SSL_use_certificate_ASN1(SSL *ssl, const unsigned char *d, int len);
1629 1629
1630#ifndef OPENSSL_NO_STDIO
1631int SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type); 1630int SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type);
1632int SSL_use_PrivateKey_file(SSL *ssl, const char *file, int type); 1631int SSL_use_PrivateKey_file(SSL *ssl, const char *file, int type);
1633int SSL_use_certificate_file(SSL *ssl, const char *file, int type); 1632int 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,
1640 const char *file); 1639 const char *file);
1641int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs, 1640int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
1642 const char *dir); 1641 const char *dir);
1643#endif
1644 1642
1645void SSL_load_error_strings(void ); 1643void SSL_load_error_strings(void );
1646const char *SSL_state_string(const SSL *s); 1644const char *SSL_state_string(const SSL *s);
diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c
index f506ae685f..c4099ca24f 100644
--- a/src/lib/libssl/ssl_cert.c
+++ b/src/lib/libssl/ssl_cert.c
@@ -589,7 +589,6 @@ xname_cmp(const X509_NAME * const *a, const X509_NAME * const *b)
589 return (X509_NAME_cmp(*a, *b)); 589 return (X509_NAME_cmp(*a, *b));
590} 590}
591 591
592#ifndef OPENSSL_NO_STDIO
593/*! 592/*!
594 * Load CA certs from a file into a ::STACK. Note that it is somewhat misnamed; 593 * Load CA certs from a file into a ::STACK. Note that it is somewhat misnamed;
595 * it doesn't really have anything to do with clients (except that a common use 594 * it doesn't really have anything to do with clients (except that a common use
@@ -657,7 +656,6 @@ err:
657 ERR_clear_error(); 656 ERR_clear_error();
658 return (ret); 657 return (ret);
659} 658}
660#endif
661 659
662/*! 660/*!
663 * Add a file of certs to a stack. 661 * Add a file of certs to a stack.
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index 90a94817b6..3e654117bf 100644
--- a/src/lib/libssl/ssl_lib.c
+++ b/src/lib/libssl/ssl_lib.c
@@ -2895,7 +2895,6 @@ SSL_set_SSL_CTX(SSL *ssl, SSL_CTX* ctx)
2895 return (ssl->ctx); 2895 return (ssl->ctx);
2896} 2896}
2897 2897
2898#ifndef OPENSSL_NO_STDIO
2899int 2898int
2900SSL_CTX_set_default_verify_paths(SSL_CTX *ctx) 2899SSL_CTX_set_default_verify_paths(SSL_CTX *ctx)
2901{ 2900{
@@ -2908,7 +2907,6 @@ SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile,
2908{ 2907{
2909 return (X509_STORE_load_locations(ctx->cert_store, CAfile, CApath)); 2908 return (X509_STORE_load_locations(ctx->cert_store, CAfile, CApath));
2910} 2909}
2911#endif
2912 2910
2913void 2911void
2914SSL_set_info_callback(SSL *ssl, 2912SSL_set_info_callback(SSL *ssl,
diff --git a/src/lib/libssl/ssl_rsa.c b/src/lib/libssl/ssl_rsa.c
index 05d18de1d9..23891bf11b 100644
--- a/src/lib/libssl/ssl_rsa.c
+++ b/src/lib/libssl/ssl_rsa.c
@@ -80,7 +80,6 @@ SSL_use_certificate(SSL *ssl, X509 *x)
80 return (ssl_set_cert(ssl->cert, x)); 80 return (ssl_set_cert(ssl->cert, x));
81} 81}
82 82
83#ifndef OPENSSL_NO_STDIO
84int 83int
85SSL_use_certificate_file(SSL *ssl, const char *file, int type) 84SSL_use_certificate_file(SSL *ssl, const char *file, int type)
86{ 85{
@@ -123,7 +122,6 @@ end:
123 BIO_free(in); 122 BIO_free(in);
124 return (ret); 123 return (ret);
125} 124}
126#endif
127 125
128int 126int
129SSL_use_certificate_ASN1(SSL *ssl, const unsigned char *d, int len) 127SSL_use_certificate_ASN1(SSL *ssl, const unsigned char *d, int len)
@@ -210,7 +208,6 @@ ssl_set_pkey(CERT *c, EVP_PKEY *pkey)
210 return (1); 208 return (1);
211} 209}
212 210
213#ifndef OPENSSL_NO_STDIO
214int 211int
215SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type) 212SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type)
216{ 213{
@@ -250,7 +247,6 @@ end:
250 BIO_free(in); 247 BIO_free(in);
251 return (ret); 248 return (ret);
252} 249}
253#endif
254 250
255int 251int
256SSL_use_RSAPrivateKey_ASN1(SSL *ssl, unsigned char *d, long len) 252SSL_use_RSAPrivateKey_ASN1(SSL *ssl, unsigned char *d, long len)
@@ -287,7 +283,6 @@ SSL_use_PrivateKey(SSL *ssl, EVP_PKEY *pkey)
287 return (ret); 283 return (ret);
288} 284}
289 285
290#ifndef OPENSSL_NO_STDIO
291int 286int
292SSL_use_PrivateKey_file(SSL *ssl, const char *file, int type) 287SSL_use_PrivateKey_file(SSL *ssl, const char *file, int type)
293{ 288{
@@ -327,7 +322,6 @@ end:
327 BIO_free(in); 322 BIO_free(in);
328 return (ret); 323 return (ret);
329} 324}
330#endif
331 325
332int 326int
333SSL_use_PrivateKey_ASN1(int type, SSL *ssl, const unsigned char *d, long len) 327SSL_use_PrivateKey_ASN1(int type, SSL *ssl, const unsigned char *d, long len)
@@ -415,7 +409,6 @@ ssl_set_cert(CERT *c, X509 *x)
415 return (1); 409 return (1);
416} 410}
417 411
418#ifndef OPENSSL_NO_STDIO
419int 412int
420SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type) 413SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type)
421{ 414{
@@ -458,7 +451,6 @@ end:
458 BIO_free(in); 451 BIO_free(in);
459 return (ret); 452 return (ret);
460} 453}
461#endif
462 454
463int 455int
464SSL_CTX_use_certificate_ASN1(SSL_CTX *ctx, int len, const unsigned char *d) 456SSL_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)
504 return (ret); 496 return (ret);
505} 497}
506 498
507#ifndef OPENSSL_NO_STDIO
508int 499int
509SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file, int type) 500SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file, int type)
510{ 501{
@@ -544,7 +535,6 @@ end:
544 BIO_free(in); 535 BIO_free(in);
545 return (ret); 536 return (ret);
546} 537}
547#endif
548 538
549int 539int
550SSL_CTX_use_RSAPrivateKey_ASN1(SSL_CTX *ctx, const unsigned char *d, long len) 540SSL_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)
578 return (ssl_set_pkey(ctx->cert, pkey)); 568 return (ssl_set_pkey(ctx->cert, pkey));
579} 569}
580 570
581#ifndef OPENSSL_NO_STDIO
582int 571int
583SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type) 572SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type)
584{ 573{
@@ -618,7 +607,6 @@ end:
618 BIO_free(in); 607 BIO_free(in);
619 return (ret); 608 return (ret);
620} 609}
621#endif
622 610
623int 611int
624SSL_CTX_use_PrivateKey_ASN1(int type, SSL_CTX *ctx, const unsigned char *d, 612SSL_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,
640} 628}
641 629
642 630
643#ifndef OPENSSL_NO_STDIO
644/* Read a file that contains our certificate in "PEM" format, 631/* Read a file that contains our certificate in "PEM" format,
645 * possibly followed by a sequence of CA certificates that should be 632 * possibly followed by a sequence of CA certificates that should be
646 * sent to the peer in the Certificate message. 633 * sent to the peer in the Certificate message.
@@ -720,4 +707,3 @@ end:
720 BIO_free(in); 707 BIO_free(in);
721 return (ret); 708 return (ret);
722} 709}
723#endif
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-23 15:04:00 +0000