From 7dba28fa4f6f6bd7851af1a6e2a21e4fce2a1375 Mon Sep 17 00:00:00 2001 From: tb Date: Mon, 2 Sep 2024 07:57:27 +0000 Subject: [PATCH] The X509at_* manuals are no longer needed --- lib/libcrypto/man/Makefile | 4 +- lib/libcrypto/man/X509_ATTRIBUTE_new.3 | 8 +- lib/libcrypto/man/X509at_add1_attr.3 | 133 --------------------- lib/libcrypto/man/X509at_get_attr.3 | 158 ------------------------- 4 files changed, 4 insertions(+), 299 deletions(-) delete mode 100644 lib/libcrypto/man/X509at_add1_attr.3 delete mode 100644 lib/libcrypto/man/X509at_get_attr.3 diff --git a/lib/libcrypto/man/Makefile b/lib/libcrypto/man/Makefile index 11c990ebd26..3b636f24415 100644 --- a/lib/libcrypto/man/Makefile +++ b/lib/libcrypto/man/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.292 2024/08/29 20:25:13 tb Exp $ +# $OpenBSD: Makefile,v 1.293 2024/09/02 07:57:27 tb Exp $ .include @@ -376,8 +376,6 @@ MAN= \ X509_sign.3 \ X509_signature_dump.3 \ X509_verify_cert.3 \ - X509at_add1_attr.3 \ - X509at_get_attr.3 \ X509v3_addr_add_inherit.3 \ X509v3_addr_get_range.3 \ X509v3_addr_inherits.3 \ diff --git a/lib/libcrypto/man/X509_ATTRIBUTE_new.3 b/lib/libcrypto/man/X509_ATTRIBUTE_new.3 index 8d664cd69e6..cc2b27d4c01 100644 --- a/lib/libcrypto/man/X509_ATTRIBUTE_new.3 +++ b/lib/libcrypto/man/X509_ATTRIBUTE_new.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: X509_ATTRIBUTE_new.3,v 1.17 2024/08/24 09:15:36 tb Exp $ +.\" $OpenBSD: X509_ATTRIBUTE_new.3,v 1.18 2024/09/02 07:57:27 tb Exp $ .\" .\" Copyright (c) 2016, 2021 Ingo Schwarze .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: August 24 2024 $ +.Dd $Mdocdate: September 2 2024 $ .Dt X509_ATTRIBUTE_NEW 3 .Os .Sh NAME @@ -121,9 +121,7 @@ fails on .Xr X509_EXTENSION_new 3 , .Xr X509_new 3 , .Xr X509_REQ_add1_attr 3 , -.Xr X509_REQ_new 3 , -.Xr X509at_add1_attr 3 , -.Xr X509at_get_attr 3 +.Xr X509_REQ_new 3 .Sh STANDARDS .Bl -ohang .It Xo diff --git a/lib/libcrypto/man/X509at_add1_attr.3 b/lib/libcrypto/man/X509at_add1_attr.3 deleted file mode 100644 index 126b1b41ba2..00000000000 --- a/lib/libcrypto/man/X509at_add1_attr.3 +++ /dev/null @@ -1,133 +0,0 @@ -.\" $OpenBSD: X509at_add1_attr.3,v 1.6 2024/08/24 09:15:36 tb Exp $ -.\" -.\" Copyright (c) 2021 Ingo Schwarze -.\" -.\" Permission to use, copy, modify, and distribute this software for any -.\" purpose with or without fee is hereby granted, provided that the above -.\" copyright notice and this permission notice appear in all copies. -.\" -.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -.\" -.Dd $Mdocdate: August 24 2024 $ -.Dt X509AT_ADD1_ATTR 3 -.Os -.Sh NAME -.Nm X509at_add1_attr , -.Nm X509at_add1_attr_by_OBJ , -.Nm X509at_add1_attr_by_NID , -.Nm X509at_add1_attr_by_txt , -.Nm X509at_delete_attr -.Nd change an array of X.501 Attribute objects -.Sh SYNOPSIS -.In openssl/x509.h -.Ft STACK_OF(X509_ATTRIBUTE) * -.Fo X509at_add1_attr -.Fa "STACK_OF(X509_ATTRIBUTE) **pattrs" -.Fa "X509_ATTRIBUTE *attr" -.Fc -.Ft STACK_OF(X509_ATTRIBUTE) * -.Fo X509at_add1_attr_by_OBJ -.Fa "STACK_OF(X509_ATTRIBUTE) **pattrs" -.Fa "const ASN1_OBJECT *obj" -.Fa "int type" -.Fa "const unsigned char *data" -.Fa "int len" -.Fc -.Ft STACK_OF(X509_ATTRIBUTE) * -.Fo X509at_add1_attr_by_NID -.Fa "STACK_OF(X509_ATTRIBUTE) **pattrs" -.Fa "int nid" -.Fa "int type" -.Fa "const unsigned char *data" -.Fa "int len" -.Fc -.Ft STACK_OF(X509_ATTRIBUTE) * -.Fo X509at_add1_attr_by_txt -.Fa "STACK_OF(X509_ATTRIBUTE) **pattrs" -.Fa "const char *name" -.Fa "int type" -.Fa "const unsigned char *data" -.Fa "int len" -.Fc -.Ft X509_ATTRIBUTE * -.Fo X509at_delete_attr -.Fa "STACK_OF(X509_ATTRIBUTE) *attrs" -.Fa "int index" -.Fc -.Sh DESCRIPTION -.Fn X509at_add1_attr -appends a deep copy of -.Fa attr -to the end of -.Pf ** Fa pattrs . -If -.Pf * Fa pattrs -is -.Dv NULL , -a new array is allocated, and in case of success, -a pointer to it is assigned to -.Pf * Fa pattrs . -.Pp -.Fn X509at_add1_attr_by_OBJ , -.Fn X509at_add1_attr_by_NID , -and -.Fn X509at_add1_attr_by_txt -create a new X.501 Attribute object using -.Xr X509_ATTRIBUTE_create_by_OBJ 3 , -.Xr X509_ATTRIBUTE_create_by_NID 3 , -or -.Xr X509_ATTRIBUTE_create_by_txt 3 , -respectively, and append it to -.Pf ** Fa pattrs -using -.Fn X509at_add1_attr . -.Pp -.Fn X509at_delete_attr -deletes the element with the zero-based -.Fa index -from the array -.Pf * Fa attrs . -.Sh RETURN VALUES -.Fn X509at_add1_attr , -.Fn X509at_add1_attr_by_OBJ , -.Fn X509at_add1_attr_by_NID , -and -.Fn X509at_add1_attr_by_txt -return a pointer to the modified or new array or -.Dv NULL -if the -.Fa pattrs -argument is -.Dv NULL -or if creating or copying the X.501 Attribute object -or memory allocation fails. -.Pp -.Fn X509at_delete_attr -returns the deleted element or -.Dv NULL -if -.Fa attrs -is -.Dv NULL -or if the requested -.Fa index -is negative or greater than or equal to the number of objects in -.Pf * Fa attrs . -.Sh SEE ALSO -.Xr OBJ_nid2obj 3 , -.Xr PKCS8_pkey_add1_attr_by_NID 3 , -.Xr STACK_OF 3 , -.Xr X509_ATTRIBUTE_create_by_OBJ 3 , -.Xr X509_ATTRIBUTE_new 3 , -.Xr X509_REQ_add1_attr 3 , -.Xr X509at_get_attr 3 -.Sh HISTORY -These functions first appeared in OpenSSL 0.9.5 -and have been available since -.Ox 2.7 . diff --git a/lib/libcrypto/man/X509at_get_attr.3 b/lib/libcrypto/man/X509at_get_attr.3 deleted file mode 100644 index 03581695b3b..00000000000 --- a/lib/libcrypto/man/X509at_get_attr.3 +++ /dev/null @@ -1,158 +0,0 @@ -.\" $OpenBSD: X509at_get_attr.3,v 1.9 2024/08/24 09:23:09 tb Exp $ -.\" -.\" Copyright (c) 2021 Ingo Schwarze -.\" -.\" Permission to use, copy, modify, and distribute this software for any -.\" purpose with or without fee is hereby granted, provided that the above -.\" copyright notice and this permission notice appear in all copies. -.\" -.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -.\" -.Dd $Mdocdate: August 24 2024 $ -.Dt X509AT_GET_ATTR 3 -.Os -.Sh NAME -.Nm X509at_get_attr , -.Nm X509at_get_attr_count , -.Nm X509at_get_attr_by_OBJ , -.Nm X509at_get_attr_by_NID , -.Nm X509at_get0_data_by_OBJ -.\" In the following line, "X.501" and "Attribute" are not typos. -.\" The "Attribute" type is defined in X.501, not in X.509. -.\" The type is called "Attribute" with capital "A", not "attribute". -.Nd X.501 Attribute array read accessors -.Sh SYNOPSIS -.In openssl/x509.h -.Ft X509_ATTRIBUTE * -.Fo X509at_get_attr -.Fa "const STACK_OF(X509_ATTRIBUTE) *attrs" -.Fa "int index" -.Fc -.Ft int -.Fo X509at_get_attr_count -.Fa "const STACK_OF(X509_ATTRIBUTE) *attrs" -.Fc -.Ft int -.Fo X509at_get_attr_by_OBJ -.Fa "const STACK_OF(X509_ATTRIBUTE) *attrs" -.Fa "const ASN1_OBJECT *obj" -.Fa "int start_after" -.Fc -.Ft int -.Fo X509at_get_attr_by_NID -.Fa "const STACK_OF(X509_ATTRIBUTE) *attrs" -.Fa "int nid" -.Fa "int start_after" -.Fc -.Ft void * -.Fo X509at_get0_data_by_OBJ -.Fa "STACK_OF(X509_ATTRIBUTE) *attrs" -.Fa "const ASN1_OBJECT *obj" -.Fa "int start_after" -.Fa "int type" -.Fc -.Sh DESCRIPTION -These functions retrieve information from the -.Fa attrs -array of X.501 Attribute objects. -They all fail if -.Fa attrs -is a -.Dv NULL -pointer. -.Pp -.Fn X509at_get_attr -returns the array element at the zero-based -.Fa index . -It fails if the -.Fa index -is negative or greater than or equal to the number of objects in the array. -.Pp -.Fn X509at_get_attr_count -returns the number of objects currently stored in the array. -.Pp -The three remaining functions search the array starting after the index -.Fa start_after . -They fail if no matching object is found. -.Fn X509at_get0_data_by_OBJ -also fails if the data is not of the requested -.Fa type . -.Pp -Additionally, the -.Fa start_after -argument of -.Fn X509at_get0_data_by_OBJ -is interpreted in a special way. -If -.Fa start_after -is \-2 or smaller, -.Fn X509at_get0_data_by_OBJ -also fails if -.Fa attrs -contains more than one matching object. -If -.Fa start_after -is \-3 or smaller, it also fails unless the matching object -contains exactly one value. -.Sh RETURN VALUES -.Fn X509at_get_attr -returns an internal pointer or -.Dv NULL -on failure. -.Pp -.Fn X509at_get_attr_count -returns the number of array elements or \-1 on failure. -.Pp -.Fn X509at_get_attr_by_OBJ -and -.Fn X509at_get_attr_by_NID -return the index of the first object in the array -that has an index greater than -.Fa start_after -and a type matching -.Fa obj -or -.Fa nid , -respectively, or \-1 on failure. -In addition, -.Fn X509at_get_attr_by_NID -returns \-2 -if -.Xr OBJ_nid2obj 3 -fails on the requested -.Fa nid . -.Pp -.Fn X509at_get0_data_by_OBJ -returns an internal pointer to the data contained in the value -of the first object that has an index greater than -.Fa start_after -and a type matching -.Fa obj , -or -.Dv NULL -on failure. -.Sh SEE ALSO -.Xr OBJ_nid2obj 3 , -.Xr PKCS8_pkey_get0_attrs 3 , -.Xr STACK_OF 3 , -.Xr X509_ATTRIBUTE_get0_data 3 , -.Xr X509_ATTRIBUTE_new 3 , -.Xr X509_REQ_get_attr 3 -.Sh HISTORY -.Fn X509at_get_attr , -.Fn X509at_get_attr_count , -.Fn X509at_get_attr_by_OBJ , -and -.Fn X509at_get_attr_by_NID -first appeared in OpenSSL 0.9.5 and have been available since -.Ox 2.7 . -.Pp -.Fn X509at_get0_data_by_OBJ -first appeared in OpenSSL 0.9.8h and has been available since -.Ox 4.5 . -- 2.20.1