From 1c8c5d4755cb4bd7fec527071f81a522834759c4 Mon Sep 17 00:00:00 2001 From: Pauli Date: Mon, 31 May 2021 14:28:32 +1000 Subject: bio: remove TODOs Reviewed-by: Tim Hudson (Merged from https://github.com/openssl/openssl/pull/15539) --- crypto/bio/b_sock.c | 1 - crypto/bio/bf_buff.c | 2 -- crypto/bio/bf_lbuf.c | 2 -- crypto/bio/bf_nbio.c | 2 -- crypto/bio/bf_null.c | 2 -- crypto/bio/bss_acpt.c | 2 -- crypto/bio/bss_bio.c | 2 -- crypto/bio/bss_conn.c | 2 -- crypto/bio/bss_dgram.c | 4 ---- crypto/bio/bss_fd.c | 2 -- crypto/bio/bss_file.c | 4 ---- crypto/bio/bss_log.c | 1 - crypto/bio/bss_mem.c | 4 ---- crypto/bio/bss_null.c | 2 -- crypto/bio/bss_sock.c | 2 -- 15 files changed, 34 deletions(-) (limited to 'crypto') diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c index 5804465dfe..b827c5b902 100644 --- a/crypto/bio/b_sock.c +++ b/crypto/bio/b_sock.c @@ -383,7 +383,6 @@ int BIO_sock_info(int sock, return 1; } -/* TODO simplify by BIO_socket_wait() further other uses of select() in apps/ */ /* * Wait on fd at most until max_time; succeed immediately if max_time == 0. * If for_read == 0 then assume to wait for writing, else wait for reading. diff --git a/crypto/bio/bf_buff.c b/crypto/bio/bf_buff.c index d12cbf9d37..cfed63bd72 100644 --- a/crypto/bio/bf_buff.c +++ b/crypto/bio/bf_buff.c @@ -25,10 +25,8 @@ static long buffer_callback_ctrl(BIO *h, int cmd, BIO_info_cb *fp); static const BIO_METHOD methods_buffer = { BIO_TYPE_BUFFER, "buffer", - /* TODO: Convert to new style write function */ bwrite_conv, buffer_write, - /* TODO: Convert to new style read function */ bread_conv, buffer_read, buffer_puts, diff --git a/crypto/bio/bf_lbuf.c b/crypto/bio/bf_lbuf.c index 946ff0d23b..73f1216987 100644 --- a/crypto/bio/bf_lbuf.c +++ b/crypto/bio/bf_lbuf.c @@ -30,10 +30,8 @@ static long linebuffer_callback_ctrl(BIO *h, int cmd, BIO_info_cb *fp); static const BIO_METHOD methods_linebuffer = { BIO_TYPE_LINEBUFFER, "linebuffer", - /* TODO: Convert to new style write function */ bwrite_conv, linebuffer_write, - /* TODO: Convert to new style read function */ bread_conv, linebuffer_read, linebuffer_puts, diff --git a/crypto/bio/bf_nbio.c b/crypto/bio/bf_nbio.c index f5b83a89f9..f9e9fe718e 100644 --- a/crypto/bio/bf_nbio.c +++ b/crypto/bio/bf_nbio.c @@ -34,10 +34,8 @@ typedef struct nbio_test_st { static const BIO_METHOD methods_nbiof = { BIO_TYPE_NBIO_TEST, "non-blocking IO test filter", - /* TODO: Convert to new style write function */ bwrite_conv, nbiof_write, - /* TODO: Convert to new style read function */ bread_conv, nbiof_read, nbiof_puts, diff --git a/crypto/bio/bf_null.c b/crypto/bio/bf_null.c index fff9938ca1..aca4c5eb6d 100644 --- a/crypto/bio/bf_null.c +++ b/crypto/bio/bf_null.c @@ -25,10 +25,8 @@ static long nullf_callback_ctrl(BIO *h, int cmd, BIO_info_cb *fp); static const BIO_METHOD methods_nullf = { BIO_TYPE_NULL_FILTER, "NULL filter", - /* TODO: Convert to new style write function */ bwrite_conv, nullf_write, - /* TODO: Convert to new style read function */ bread_conv, nullf_read, nullf_puts, diff --git a/crypto/bio/bss_acpt.c b/crypto/bio/bss_acpt.c index 834c2ffef1..c25f71cec2 100644 --- a/crypto/bio/bss_acpt.c +++ b/crypto/bio/bss_acpt.c @@ -56,10 +56,8 @@ static void BIO_ACCEPT_free(BIO_ACCEPT *a); static const BIO_METHOD methods_acceptp = { BIO_TYPE_ACCEPT, "socket accept", - /* TODO: Convert to new style write function */ bwrite_conv, acpt_write, - /* TODO: Convert to new style read function */ bread_conv, acpt_read, acpt_puts, diff --git a/crypto/bio/bss_bio.c b/crypto/bio/bss_bio.c index 0b972b2b3f..699e6bf106 100644 --- a/crypto/bio/bss_bio.c +++ b/crypto/bio/bss_bio.c @@ -38,10 +38,8 @@ static void bio_destroy_pair(BIO *bio); static const BIO_METHOD methods_biop = { BIO_TYPE_BIO, "BIO pair", - /* TODO: Convert to new style write function */ bwrite_conv, bio_write, - /* TODO: Convert to new style read function */ bread_conv, bio_read, bio_puts, diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c index 3ab2c0d4ba..d146c97b82 100644 --- a/crypto/bio/bss_conn.c +++ b/crypto/bio/bss_conn.c @@ -63,10 +63,8 @@ void BIO_CONNECT_free(BIO_CONNECT *a); static const BIO_METHOD methods_connectp = { BIO_TYPE_CONNECT, "socket connect", - /* TODO: Convert to new style write function */ bwrite_conv, conn_write, - /* TODO: Convert to new style read function */ bread_conv, conn_read, conn_puts, diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c index af3d941abb..a530832dd8 100644 --- a/crypto/bio/bss_dgram.c +++ b/crypto/bio/bss_dgram.c @@ -68,10 +68,8 @@ static void get_current_time(struct timeval *t); static const BIO_METHOD methods_dgramp = { BIO_TYPE_DGRAM, "datagram socket", - /* TODO: Convert to new style write function */ bwrite_conv, dgram_write, - /* TODO: Convert to new style read function */ bread_conv, dgram_read, dgram_puts, @@ -86,10 +84,8 @@ static const BIO_METHOD methods_dgramp = { static const BIO_METHOD methods_dgramp_sctp = { BIO_TYPE_DGRAM_SCTP, "datagram sctp socket", - /* TODO: Convert to new style write function */ bwrite_conv, dgram_sctp_write, - /* TODO: Convert to new style write function */ bread_conv, dgram_sctp_read, dgram_sctp_puts, diff --git a/crypto/bio/bss_fd.c b/crypto/bio/bss_fd.c index 65e0b10311..f756225edb 100644 --- a/crypto/bio/bss_fd.c +++ b/crypto/bio/bss_fd.c @@ -60,10 +60,8 @@ int BIO_fd_should_retry(int s); static const BIO_METHOD methods_fdp = { BIO_TYPE_FD, "file descriptor", - /* TODO: Convert to new style write function */ bwrite_conv, fd_write, - /* TODO: Convert to new style read function */ bread_conv, fd_read, fd_puts, diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c index affd67ac02..a6143b6abc 100644 --- a/crypto/bio/bss_file.c +++ b/crypto/bio/bss_file.c @@ -42,10 +42,8 @@ static int file_free(BIO *data); static const BIO_METHOD methods_filep = { BIO_TYPE_FILE, "FILE pointer", - /* TODO: Convert to new style write function */ bwrite_conv, file_write, - /* TODO: Convert to new style read function */ bread_conv, file_read, file_puts, @@ -407,10 +405,8 @@ static int file_free(BIO *a) static const BIO_METHOD methods_filep = { BIO_TYPE_FILE, "FILE pointer", - /* TODO: Convert to new style write function */ bwrite_conv, file_write, - /* TODO: Convert to new style read function */ bread_conv, file_read, file_puts, diff --git a/crypto/bio/bss_log.c b/crypto/bio/bss_log.c index b42cc4af8f..82abfd5cec 100644 --- a/crypto/bio/bss_log.c +++ b/crypto/bio/bss_log.c @@ -87,7 +87,6 @@ static void xcloselog(BIO *bp); static const BIO_METHOD methods_slg = { BIO_TYPE_MEM, "syslog", - /* TODO: Convert to new style write function */ bwrite_conv, slg_write, NULL, /* slg_write_old, */ diff --git a/crypto/bio/bss_mem.c b/crypto/bio/bss_mem.c index 5e48669e1e..7e501762bb 100644 --- a/crypto/bio/bss_mem.c +++ b/crypto/bio/bss_mem.c @@ -26,10 +26,8 @@ static int mem_buf_sync(BIO *h); static const BIO_METHOD mem_method = { BIO_TYPE_MEM, "memory buffer", - /* TODO: Convert to new style write function */ bwrite_conv, mem_write, - /* TODO: Convert to new style read function */ bread_conv, mem_read, mem_puts, @@ -43,10 +41,8 @@ static const BIO_METHOD mem_method = { static const BIO_METHOD secmem_method = { BIO_TYPE_MEM, "secure memory buffer", - /* TODO: Convert to new style write function */ bwrite_conv, mem_write, - /* TODO: Convert to new style read function */ bread_conv, mem_read, mem_puts, diff --git a/crypto/bio/bss_null.c b/crypto/bio/bss_null.c index f677bbbb15..371d5b7cd8 100644 --- a/crypto/bio/bss_null.c +++ b/crypto/bio/bss_null.c @@ -20,10 +20,8 @@ static long null_ctrl(BIO *h, int cmd, long arg1, void *arg2); static const BIO_METHOD null_method = { BIO_TYPE_NULL, "NULL", - /* TODO: Convert to new style write function */ bwrite_conv, null_write, - /* TODO: Convert to new style read function */ bread_conv, null_read, null_puts, diff --git a/crypto/bio/bss_sock.c b/crypto/bio/bss_sock.c index e142de1674..f5d8810230 100644 --- a/crypto/bio/bss_sock.c +++ b/crypto/bio/bss_sock.c @@ -38,10 +38,8 @@ int BIO_sock_should_retry(int s); static const BIO_METHOD methods_sockp = { BIO_TYPE_SOCKET, "socket", - /* TODO: Convert to new style write function */ bwrite_conv, sock_write, - /* TODO: Convert to new style read function */ bread_conv, sock_read, sock_puts, -- cgit v1.2.3