From 256236394b251beb28edf68b20430f4bad979f9b Mon Sep 17 00:00:00 2001
From: purplerain <purplerain@secbsd.org>
Date: Tue, 12 Sep 2023 21:17:19 +0000
Subject: [PATCH] sync code with last improvements from OpenBSD

---
 lib/libcrypto/man/EVP_MD_meth_new.3           |  4 +--
 .../man/EVP_PKEY_CTX_get_operation.3          | 27 ++++++++++++++++---
 share/man/man5/ruby-module.5                  | 11 ++++----
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/lib/libcrypto/man/EVP_MD_meth_new.3 b/lib/libcrypto/man/EVP_MD_meth_new.3
index 37b55b9e0..8a80cca06 100644
--- a/lib/libcrypto/man/EVP_MD_meth_new.3
+++ b/lib/libcrypto/man/EVP_MD_meth_new.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: EVP_MD_meth_new.3,v 1.4 2023/09/12 12:11:05 schwarze Exp $
+.\" $OpenBSD: EVP_MD_meth_new.3,v 1.5 2023/09/12 16:26:30 schwarze Exp $
 .\" selective merge up to:
 .\" OpenSSL man3/EVP_MD_meth_new 0388d212 Dec 14 12:47:07 2018 -0800
 .\"
@@ -235,7 +235,7 @@ and by the objects returned from
 and
 .Xr EVP_sm3 3 .
 .It Dv EVP_MD_FLAG_DIGALGID_CUSTOM
-This flag is reserved for used-defined
+This flag is reserved for user-defined
 .Vt EVP_MD
 objects supporting custom
 .Vt DigestAlgorithmIdentifier
diff --git a/lib/libcrypto/man/EVP_PKEY_CTX_get_operation.3 b/lib/libcrypto/man/EVP_PKEY_CTX_get_operation.3
index 9a9848f55..2482c746d 100644
--- a/lib/libcrypto/man/EVP_PKEY_CTX_get_operation.3
+++ b/lib/libcrypto/man/EVP_PKEY_CTX_get_operation.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: EVP_PKEY_CTX_get_operation.3,v 1.2 2023/09/10 04:05:26 jsg Exp $
+.\" $OpenBSD: EVP_PKEY_CTX_get_operation.3,v 1.3 2023/09/12 16:15:23 schwarze Exp $
 .\"
 .\" Copyright (c) 2023 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: September 10 2023 $
+.Dd $Mdocdate: September 12 2023 $
 .Dt EVP_PKEY_CTX_GET_OPERATION 3
 .Os
 .Sh NAME
@@ -92,11 +92,30 @@ was freshly returned from
 or
 .Xr EVP_PKEY_CTX_new_id 3
 and not yet initialized.
+.Pp
+The following masks are defined as the logical OR of two or more of the above
+.Dv EVP_PKEY_OP_*
+bits:
+.Pp
+.Bl -tag -width EVP_PKEY_OP_TYPE_NOGEN -compact
+.It Dv EVP_PKEY_OP_TYPE_CRYPT
+DECRYPT | ENCRYPT
+.It Dv EVP_PKEY_OP_TYPE_GEN
+KEYGEN | PARAMGEN
+.It Dv EVP_PKEY_OP_TYPE_NOGEN
+CRYPT | DERIVE | SIG
+.It Dv EVP_PKEY_OP_TYPE_SIG
+SIGN | SIGNCTX | VERIFY | VERIFYCTX | VERIFYRECOVER
+.El
 .Sh RETURN VALUES
 .Fn EVP_PKEY_CTX_get_operation
-returns one of the
+returns one of the single-bit
 .Dv EVP_PKEY_OP_*
-constants.
+constants or
+.Dv EVP_PKEY_OP_UNDEFINED
+if
+.Fa ctx
+is not initialized.
 .Pp
 .Fn EVP_PKEY_CTX_get0_pkey
 returns an internal pointer to the
diff --git a/share/man/man5/ruby-module.5 b/share/man/man5/ruby-module.5
index 58b3bbbd1..403674672 100644
--- a/share/man/man5/ruby-module.5
+++ b/share/man/man5/ruby-module.5
@@ -1,5 +1,4 @@
-m
-.\"	$OpenBSD: ruby-module.5,v 1.41 2023/09/11 20:02:38 jeremy Exp $
+.\"	$OpenBSD: ruby-module.5,v 1.42 2023/09/12 17:21:05 schwarze Exp $
 .\"
 .\" Copyright (c) 2008 Marc Espie, Jeremy Evans
 .\"
@@ -25,7 +24,7 @@ m
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: September 11 2023 $
+.Dd $Mdocdate: September 12 2023 $
 .Dt RUBY-MODULE 5
 .Os
 .Sh NAME
@@ -44,7 +43,7 @@ Sets
 .Ev GEM_BASE_LIB ,
 .Ev GEM_BIN ,
 .Ev GEM_BIN_SUFFIX ,
-.Ev GEM_EXTENSIONS_DIR,
+.Ev GEM_EXTENSIONS_DIR ,
 .Ev GEM_FLAGS ,
 .Ev GEM_LIB ,
 .Ev GEM_MAN_SUFFIX ,
@@ -154,8 +153,8 @@ to
 It also adds ruby30, ruby31, and ruby32
 .Ev FLAVOR Ns s
 to the port.
-If the C extension in the gem requires specific arguments to extconf.rb, set those
-via
+If the C extension in the gem requires specific arguments to extconf.rb,
+set those via
 .Ev CONFIGURE_ARGS .
 .El
 .Pp