diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc --- 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 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -924,8 +924,6 @@ 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 --- 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 @@ .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 @@ .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 --- a/sys/opencrypto/criov.c +++ b/sys/opencrypto/criov.c @@ -433,23 +433,6 @@ } } -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 --- a/sys/opencrypto/cryptodev.h +++ b/sys/opencrypto/cryptodev.h @@ -662,8 +662,6 @@ 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,