From: schwarze <schwarze@openbsd.org>
Date: Thu, 9 Dec 2021 19:01:52 +0000 (+0000)
Subject: improve the documentation of V_ASN1_APP_CHOOSE
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=3a2951b67539bd677158ec5ed7256864d5fecae6;p=openbsd

improve the documentation of V_ASN1_APP_CHOOSE
---

diff --git a/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3 b/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3
index 7437ee82c17..9226ad292f4 100644
--- a/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3
+++ b/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: X509_NAME_ENTRY_get_object.3,v 1.14 2021/07/02 16:13:56 schwarze Exp $
+.\" $OpenBSD: X509_NAME_ENTRY_get_object.3,v 1.15 2021/12/09 19:01:52 schwarze Exp $
 .\" full merge up to: OpenSSL aebb9aac Jul 19 09:27:53 2016 -0400
 .\" selective merge up to: OpenSSL ca34e08d Dec 12 07:38:07 2018 +0100
 .\"
@@ -67,7 +67,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 2 2021 $
+.Dd $Mdocdate: December 9 2021 $
 .Dt X509_NAME_ENTRY_GET_OBJECT 3
 .Os
 .Sh NAME
@@ -232,12 +232,19 @@ to
 .Fn X509_NAME_ENTRY_set_data
 sets the field value of
 .Fa ne
-to string type
+to the given string
 .Fa type
 and the value determined by
 .Fa bytes
 and
 .Fa len .
+If the
+.Fa type
+argument is
+.Dv V_ASN1_APP_CHOOSE ,
+the return value of
+.Xr ASN1_PRINTABLE_type 3
+is used instead.
 .Pp
 .Fn X509_NAME_ENTRY_create_by_txt ,
 .Fn X509_NAME_ENTRY_create_by_NID ,
diff --git a/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 b/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3
index 56e1564a63c..cd7e94d4e1a 100644
--- a/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3
+++ b/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: X509_NAME_add_entry_by_txt.3,v 1.14 2019/06/14 13:59:32 schwarze Exp $
+.\"	$OpenBSD: X509_NAME_add_entry_by_txt.3,v 1.15 2021/12/09 19:01:52 schwarze Exp $
 .\"	OpenSSL aebb9aac Jul 19 09:27:53 2016 -0400
 .\"
 .\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -49,7 +49,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 14 2019 $
+.Dd $Mdocdate: December 9 2021 $
 .Dt X509_NAME_ADD_ENTRY_BY_TXT 3
 .Os
 .Sh NAME
@@ -275,7 +275,9 @@ first appeared in OpenSSL 0.9.5 and have been available since
 .Fa type
 can still be set to
 .Dv V_ASN1_APP_CHOOSE
-to use a different algorithm to determine field types.
+to use
+.Xr ASN1_PRINTABLE_type 3
+to determine field types.
 Since this form does not understand multicharacter types, performs
 no length checks, and can result in invalid field types, its use
 is strongly discouraged.