diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/bio/bio_cb.c | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/bio/bss_file.c | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/x509/by_file.c | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/x509/x509_d2.c | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/x509/x509_vfy.h | 4 |
5 files changed, 0 insertions, 12 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 | ||
| 94 | static int file_write(BIO *h, const char *buf, int num); | 93 | static int file_write(BIO *h, const char *buf, int num); |
| 95 | static int file_read(BIO *h, char *buf, int size); | 94 | static 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 | ||
| 71 | static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc, | 70 | static 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 | ||
| 65 | int | 64 | int |
| 66 | X509_STORE_set_default_paths(X509_STORE *ctx) | 65 | X509_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, | |||
| 445 | int X509_LOOKUP_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc, | 445 | int 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 | ||
| 449 | int X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type); | 448 | int X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type); |
| 450 | int X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type); | 449 | int X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type); |
| 451 | int X509_load_cert_crl_file(X509_LOOKUP *ctx, const char *file, int type); | 450 | int X509_load_cert_crl_file(X509_LOOKUP *ctx, const char *file, int type); |
| 452 | #endif | ||
| 453 | 451 | ||
| 454 | 452 | ||
| 455 | X509_LOOKUP *X509_LOOKUP_new(X509_LOOKUP_METHOD *method); | 453 | 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, | |||
| 465 | int len, X509_OBJECT *ret); | 463 | int len, X509_OBJECT *ret); |
| 466 | int X509_LOOKUP_shutdown(X509_LOOKUP *ctx); | 464 | int X509_LOOKUP_shutdown(X509_LOOKUP *ctx); |
| 467 | 465 | ||
| 468 | #ifndef OPENSSL_NO_STDIO | ||
| 469 | int X509_STORE_load_locations (X509_STORE *ctx, | 466 | int X509_STORE_load_locations (X509_STORE *ctx, |
| 470 | const char *file, const char *dir); | 467 | const char *file, const char *dir); |
| 471 | int X509_STORE_set_default_paths(X509_STORE *ctx); | 468 | int X509_STORE_set_default_paths(X509_STORE *ctx); |
| 472 | #endif | ||
| 473 | 469 | ||
| 474 | int X509_STORE_CTX_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, | 470 | int 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); |
