list supported algorithm ids and clarify how the engine argument is used

1 files changed, 50 insertions, 10 deletions

diff --git a/src/lib/libcrypto/man/EVP_PKEY_CTX_new.3 b/src/lib/libcrypto/man/EVP_PKEY_CTX_new.3
index e2f18ccbe8..507176f596 100644
--- a/src/lib/libcrypto/man/EVP_PKEY_CTX_new.3
+++ b/src/lib/libcrypto/man/EVP_PKEY_CTX_new.3
@@ -1,7 +1,24 @@
-.\"     $OpenBSD: EVP_PKEY_CTX_new.3,v 1.8 2019/06/06 01:06:58 schwarze Exp $
-.\"     OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
+.\" $OpenBSD: EVP_PKEY_CTX_new.3,v 1.9 2019/10/29 14:10:01 schwarze Exp $
+.\" full merge up to: OpenSSL df75c2bf Dec 9 01:02:36 2018 +0100
 .\"
-.\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
+.\" This file is a derived work.
+.\" The changes are covered by the following Copyright and license:
+.\"
+.\" Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
+.\"
+.\" 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.
+.\"
+.\" The original file was written by Dr. Stephen Henson <steve@openssl.org>.
 .\" Copyright (c) 2006, 2009, 2015 The OpenSSL Project.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -48,7 +65,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 6 2019 $
+.Dd $Mdocdate: October 29 2019 $
 .Dt EVP_PKEY_CTX_NEW 3
 .Os
 .Sh NAME
@@ -83,22 +100,45 @@ The
 function allocates a public key algorithm context using the algorithm
 specified in
 .Fa pkey
-and the
-.Vt ENGINE
-.Fa e .
+and using
+.Fa e
+unless it is
+.Dv NULL .
+If
+.Fa pkey
+is associated with an engine, that engine is used and
+.Fa e
+is ignored.
 .Pp
 The
 .Fn EVP_PKEY_CTX_new_id
 function allocates a public key algorithm context using the algorithm
 specified by
 .Fa id
-and
-.Vt ENGINE
-.Fa e .
+and using
+.Fa e
+unless it is
+.Dv NULL .
 It is normally used when no
 .Vt EVP_PKEY
 structure is associated with the operations, for example during
 parameter generation of key generation for some algorithms.
+The following
+.Fa id
+constants are supported:
+.Dv EVP_PKEY_CMAC ,
+.Dv EVP_PKEY_DH ,
+.Dv EVP_PKEY_DSA ,
+.Dv EVP_PKEY_EC ,
+.Dv EVP_PKEY_GOSTIMIT ,
+.Dv EVP_PKEY_GOSTR01 ,
+.Dv EVP_PKEY_HMAC ,
+and
+.Dv EVP_PKEY_RSA .
+Application programs can define additional
+.Fa id
+values using
+.Xr EVP_PKEY_meth_new 3 .
 .Pp
 .Fn EVP_PKEY_CTX_dup
 duplicates the context