git: 8fa5c577de30 - main - crypto: Remove now-unused crypto_cursor_seg{base, len}.

[John Baldwin]

The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=8fa5c577de301642de4039a616da6f38bcb54bc5

commit 8fa5c577de301642de4039a616da6f38bcb54bc5
Author:     John Baldwin <jhb at FreeBSD.org>
AuthorDate: 2021-06-16 22:22:37 +0000
Commit:     John Baldwin <jhb at FreeBSD.org>
CommitDate: 2021-06-16 22:23:16 +0000

    crypto: Remove now-unused crypto_cursor_seg{base,len}.
    
    Callers should use crypto_cursor_segment() instead.
    
    Reviewed by:    markj
    Sponsored by:   Netflix
    Differential Revision:  https://reviews.freebsd.org/D30448
---
 ObsoleteFiles.inc              |  4 ++++
 share/man/man9/Makefile        |  2 --
 share/man/man9/crypto_buffer.9 | 14 +-------------
 sys/opencrypto/criov.c         | 17 -----------------
 sys/opencrypto/cryptodev.h     |  2 --
 5 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 19aa08e23391..3802307d7761 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -40,6 +40,10 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20210616: Remove crypto_cursor_seg{base,len}
+OLD_FILES+=usr/share/man/man9/crypto_cursor_segbase.9.gz
+OLD_FILES+=usr/share/man/man9/crypto_cursor_seglen.9.gz
+
 # 20210613: new clang import which bumps version from 11.0.1 to 12.0.0.
 OLD_FILES+=usr/lib/clang/11.0.1/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/11.0.1/include/cuda_wrappers/complex
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index e4b4a8b5c6b1..60bfc907f16a 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -924,8 +924,6 @@ MLINKS+=crypto_buffer.9 crypto_apply.9 \
 	crypto_buffer.9 crypto_cursor_copyback.9 \
 	crypto_buffer.9 crypto_cursor_copydata.9 \
 	crypto_buffer.9 crypto_cursor_copydata_noadv.9 \
-	crypto_buffer.9 crypto_cursor_segbase.9 \
-	crypto_buffer.9 crypto_cursor_seglen.9 \
 	crypto_buffer.9 crypto_cursor_segment.9 \
 	crypto_buffer.9 CRYPTO_HAS_OUTPUT_BUFFER.9
 MLINKS+=crypto_driver.9 crypto_copyback.9 \
diff --git a/share/man/man9/crypto_buffer.9 b/share/man/man9/crypto_buffer.9
index a16206e8e607..c6911d3bb1c9 100644
--- a/share/man/man9/crypto_buffer.9
+++ b/share/man/man9/crypto_buffer.9
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 25, 2021
+.Dd June 16, 2021
 .Dt CRYPTO_BUFFER 9
 .Os
 .Sh NAME
@@ -95,10 +95,6 @@
 .Fc
 .Ft void *
 .Fn crypto_cursor_segment "struct crypto_buffer_cursor *cc" "size_t *len"
-.Ft void *
-.Fn crypto_cursor_segbase "struct crypto_buffer_cursor *cc"
-.Ft size_t
-.Fn crypto_cursor_seglen "struct crypto_buffer_cursor *cc"
 .Ft bool
 .Fn CRYPTO_HAS_OUTPUT_BUFFER "struct cryptop *crp"
 .Sh DESCRIPTION
@@ -300,13 +296,6 @@ returns the start of the virtually-contiguous segment at the current position of
 .Fa cc .
 The length of the segment is stored in
 .Fa len .
-.Pp
-.Fn crypto_cursor_segbase
-and
-.Fn crypto_cursor_seglen
-return the start and length, respectively,
-of the virtually-contiguous segment at the current position of
-.Fa cc .
 .Sh RETURN VALUES
 .Fn crypto_apply
 and
@@ -315,7 +304,6 @@ return the return value from the caller-supplied callback function.
 .Pp
 .Fn crypto_buffer_contiguous_subsegment ,
 .Fn crypto_contiguous_subsegment ,
-.Fn crypto_cursor_segbase ,
 and
 .Fn crypto_cursor_segment
 return a pointer to a contiguous segment or
diff --git a/sys/opencrypto/criov.c b/sys/opencrypto/criov.c
index 25702e3592fe..52f3d7988230 100644
--- a/sys/opencrypto/criov.c
+++ b/sys/opencrypto/criov.c
@@ -433,23 +433,6 @@ crypto_cursor_segment(struct crypto_buffer_cursor *cc, size_t *len)
 	}
 }
 
-void *
-crypto_cursor_segbase(struct crypto_buffer_cursor *cc)
-{
-	size_t len;
-
-	return (crypto_cursor_segment(cc, &len));
-}
-
-size_t
-crypto_cursor_seglen(struct crypto_buffer_cursor *cc)
-{
-	size_t len;
-
-	crypto_cursor_segment(cc, &len);
-	return (len);
-}
-
 void
 crypto_cursor_copyback(struct crypto_buffer_cursor *cc, int size,
     const void *vsrc)
diff --git a/sys/opencrypto/cryptodev.h b/sys/opencrypto/cryptodev.h
index fae8ca2787c2..ce5bfefaed9d 100644
--- a/sys/opencrypto/cryptodev.h
+++ b/sys/opencrypto/cryptodev.h
@@ -662,8 +662,6 @@ void	crypto_cursor_init(struct crypto_buffer_cursor *cc,
 	    const struct crypto_buffer *cb);
 void	crypto_cursor_advance(struct crypto_buffer_cursor *cc, size_t amount);
 void	*crypto_cursor_segment(struct crypto_buffer_cursor *cc, size_t *len);
-void	*crypto_cursor_segbase(struct crypto_buffer_cursor *cc);
-size_t	crypto_cursor_seglen(struct crypto_buffer_cursor *cc);
 void	crypto_cursor_copyback(struct crypto_buffer_cursor *cc, int size,
 	    const void *vsrc);
 void	crypto_cursor_copydata(struct crypto_buffer_cursor *cc, int size,