From: schwarze <schwarze@openbsd.org>
Date: Fri, 10 Dec 2021 16:19:52 +0000 (+0000)
Subject: document the following constants:
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=19f050bf5be2976353d98c29055481835873ca43;p=openbsd

document the following constants:
B_ASN1_DIRECTORYSTRING, B_ASN1_PRINTABLE, B_ASN1_DISPLAYTEXT, B_ASN1_TIME,
DIRSTRING_TYPE, PKCS9STRING_TYPE
---

diff --git a/lib/libcrypto/man/ASN1_mbstring_copy.3 b/lib/libcrypto/man/ASN1_mbstring_copy.3
index 208f4728526..5bdf7061f58 100644
--- a/lib/libcrypto/man/ASN1_mbstring_copy.3
+++ b/lib/libcrypto/man/ASN1_mbstring_copy.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ASN1_mbstring_copy.3,v 1.4 2021/11/28 17:40:14 schwarze Exp $
+.\" $OpenBSD: ASN1_mbstring_copy.3,v 1.5 2021/12/10 16:19:52 schwarze Exp $
 .\"
 .\" Copyright (c) 2021 Ingo Schwarze <schwarze@openbsd.org>
 .\"
@@ -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: November 28 2021 $
+.Dd $Mdocdate: December 10 2021 $
 .Dt ASN1_MBSTRING_COPY 3
 .Os
 .Sh NAME
@@ -120,6 +120,15 @@ column indicates whether the type is considered acceptable if the
 .Fa mask
 argument has the special value 0.
 .Pp
+The following bit mask constants
+each include several of the bits listed above:
+.Bl -column B_ASN1_DIRECTORYSTRING_ MMM MMM MMM MMM MMM MMMM
+.It mask constant             Ta PRI Ta IA5 Ta T61 Ta BMP Ta UNI Ta UTF8
+.It Dv B_ASN1_DIRECTORYSTRING Ta yes Ta no  Ta yes Ta yes Ta yes Ta yes
+.It Dv DIRSTRING_TYPE         Ta yes Ta no  Ta yes Ta yes Ta no  Ta yes
+.It Dv PKCS9STRING_TYPE       Ta yes Ta yes Ta yes Ta yes Ta no  Ta yes
+.El
+.Pp
 If
 .Fa out
 is
diff --git a/lib/libcrypto/man/d2i_ASN1_OCTET_STRING.3 b/lib/libcrypto/man/d2i_ASN1_OCTET_STRING.3
index fecf984b76e..73cb7536676 100644
--- a/lib/libcrypto/man/d2i_ASN1_OCTET_STRING.3
+++ b/lib/libcrypto/man/d2i_ASN1_OCTET_STRING.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: d2i_ASN1_OCTET_STRING.3,v 1.13 2021/12/08 13:13:21 schwarze Exp $
+.\"	$OpenBSD: d2i_ASN1_OCTET_STRING.3,v 1.14 2021/12/10 16:19:52 schwarze Exp $
 .\"
 .\" Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
 .\"
@@ -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: December 8 2021 $
+.Dd $Mdocdate: December 10 2021 $
 .Dt D2I_ASN1_OCTET_STRING 3
 .Os
 .Sh NAME
@@ -357,6 +357,21 @@ They are also used for certificate revocation lists; see
 When decoding, it accepts either GeneralizedTime or UTCTime.
 When encoding, it writes out the time type that is actually passed in.
 .Pp
+The following constants describe the ASN.1 tags that are valid
+when decoding with the above functions.
+See
+.Xr ASN1_tag2bit 3
+for more details about the
+.Dv B_ASN1_*
+constants.
+.Bl -column d2i_DIRECTORYSTRING() B_ASN1_DIRECTORYSTRING -offset indent
+.It decoding function      Ta mask constant
+.It Fn d2i_DIRECTORYSTRING Ta B_ASN1_DIRECTORYSTRING
+.It Fn d2i_ASN1_PRINTABLE  Ta B_ASN1_PRINTABLE
+.It Fn d2i_DISPLAYTEXT     Ta B_ASN1_DISPLAYTEXT
+.It Fn d2i_ASN1_TIME       Ta B_ASN1_TIME
+.El
+.Pp
 .Fn d2i_ASN1_UINTEGER
 is similar to
 .Fn d2i_ASN1_INTEGER