diff options
Diffstat (limited to 'src/include/openssl/bio.h')
| -rw-r--r-- | src/include/openssl/bio.h | 43 |
1 files changed, 17 insertions, 26 deletions
diff --git a/src/include/openssl/bio.h b/src/include/openssl/bio.h index 8724657..04e3790 100644 --- a/src/include/openssl/bio.h +++ b/src/include/openssl/bio.h @@ -76,8 +76,6 @@ extern "C" { /* Allocation and freeing. */ -DEFINE_STACK_OF(BIO); - /* BIO_new creates a new BIO with the given type and a reference count of one. * It returns the fresh |BIO|, or NULL on error. */ OPENSSL_EXPORT BIO *BIO_new(const BIO_METHOD *type); @@ -207,7 +205,7 @@ OPENSSL_EXPORT void BIO_clear_flags(BIO *bio, int flags); * flags on |bio|. */ OPENSSL_EXPORT void BIO_set_retry_read(BIO *bio); -/* BIO_set_retry_read sets the |BIO_FLAGS_WRITE| and |BIO_FLAGS_SHOULD_RETRY| +/* BIO_set_retry_write sets the |BIO_FLAGS_WRITE| and |BIO_FLAGS_SHOULD_RETRY| * flags on |bio|. */ OPENSSL_EXPORT void BIO_set_retry_write(BIO *bio); @@ -656,7 +654,7 @@ OPENSSL_EXPORT int BIO_zero_copy_get_read_buf(BIO* bio, * error stack. */ OPENSSL_EXPORT int BIO_zero_copy_get_read_buf_done(BIO* bio, size_t bytes_read); -/* BIO_zero_copy_get_write_buf_done initiates a zero copy write operation. +/* BIO_zero_copy_get_write_buf initiates a zero copy write operation. * |out_write_buf| is set to to the internal write buffer, and |out_buf_offset| * is set to the current write position of |out_write_buf|. * The number of bytes available for write from |out_write_buf| + @@ -667,7 +665,7 @@ OPENSSL_EXPORT int BIO_zero_copy_get_read_buf_done(BIO* bio, size_t bytes_read); * stack. * * The zero copy write operation is completed by calling - * |BIO_zero_copy_write_buf_done|. Neither |BIO_zero_copy_get_write_buf| + * |BIO_zero_copy_get_write_buf_done|. Neither |BIO_zero_copy_get_write_buf| * nor any other I/O write operation may be called while a zero copy write * operation is active. */ OPENSSL_EXPORT int BIO_zero_copy_get_write_buf(BIO* bio, @@ -675,8 +673,8 @@ OPENSSL_EXPORT int BIO_zero_copy_get_write_buf(BIO* bio, size_t* out_buf_offset, size_t* out_available_bytes); -/* BIO_zero_copy_write_buf_done must be called after writing to a BIO using - * |BIO_zero_copy_get_write_buf_done| to finish the write operation. The +/* BIO_zero_copy_get_write_buf_done must be called after writing to a BIO using + * |BIO_zero_copy_get_write_buf| to finish the write operation. The * |bytes_written| argument gives the number of bytes written. * * It returns one on success. In case of error it returns zero and pushes to the @@ -727,6 +725,18 @@ OPENSSL_EXPORT int BIO_zero_copy_get_write_buf_done(BIO* bio, #define BIO_print_errors_fp ERR_print_errors_fp +/* Deprecated functions. */ + +/* Returns a filter |BIO| that base64-encodes data written into it, and decodes + * data read from it. |BIO_gets| is not supported. Call |BIO_flush| when done + * writing, to signal that no more data are to be encoded. The flag + * |BIO_FLAGS_BASE64_NO_NL| may be set to encode all the data on one line. */ +OPENSSL_EXPORT const BIO_METHOD *BIO_f_base64(void); + +/* ERR_print_errors is an alias for |BIO_print_errors|. */ +OPENSSL_EXPORT void ERR_print_errors(BIO *bio); + + /* Private functions */ #define BIO_FLAGS_READ 0x01 @@ -870,25 +880,6 @@ struct bio_st { } /* extern C */ #endif -#define BIO_F_BIO_callback_ctrl 100 -#define BIO_F_BIO_ctrl 101 -#define BIO_F_BIO_new 102 -#define BIO_F_BIO_new_file 103 -#define BIO_F_BIO_new_mem_buf 104 -#define BIO_F_BIO_zero_copy_get_read_buf 105 -#define BIO_F_BIO_zero_copy_get_read_buf_done 106 -#define BIO_F_BIO_zero_copy_get_write_buf 107 -#define BIO_F_BIO_zero_copy_get_write_buf_done 108 -#define BIO_F_bio_io 109 -#define BIO_F_bio_make_pair 110 -#define BIO_F_bio_write 111 -#define BIO_F_buffer_ctrl 112 -#define BIO_F_conn_ctrl 113 -#define BIO_F_conn_state 114 -#define BIO_F_file_ctrl 115 -#define BIO_F_file_read 116 -#define BIO_F_mem_write 117 -#define BIO_F_BIO_printf 118 #define BIO_R_BAD_FOPEN_MODE 100 #define BIO_R_BROKEN_PIPE 101 #define BIO_R_CONNECT_ERROR 102 |