From b7274ba6d22991e910900ca5e330d872dcc276c8 Mon Sep 17 00:00:00 2001 From: tb Date: Sun, 19 Nov 2023 10:34:26 +0000 Subject: [PATCH] Strip mention of ENGINE out of *_set_method.3 --- lib/libcrypto/man/DH_set_method.3 | 40 ++++++--------------------- lib/libcrypto/man/DSA_set_method.3 | 40 ++++++--------------------- lib/libcrypto/man/RSA_set_method.3 | 44 ++++++------------------------ 3 files changed, 26 insertions(+), 98 deletions(-) diff --git a/lib/libcrypto/man/DH_set_method.3 b/lib/libcrypto/man/DH_set_method.3 index e89fdc64a56..70cf367c9d8 100644 --- a/lib/libcrypto/man/DH_set_method.3 +++ b/lib/libcrypto/man/DH_set_method.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: DH_set_method.3,v 1.8 2022/01/15 23:38:50 jsg Exp $ +.\" $OpenBSD: DH_set_method.3,v 1.9 2023/11/19 10:34:26 tb Exp $ .\" OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100 .\" .\" This file was written by Ulf Moeller . @@ -48,7 +48,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: January 15 2022 $ +.Dd $Mdocdate: November 19 2023 $ .Dt DH_SET_METHOD 3 .Os .Sh NAME @@ -98,16 +98,9 @@ selects as the default method for all .Vt DH structures created later. -If any -.Vt ENGINE -was registered with -.Xr ENGINE_register_DH 3 -that can be successfully initialized, it overrides the default. .Pp .Fn DH_get_default_method -returns a pointer to the current default method, -even if it is actually overridden by an -.Vt ENGINE . +returns a pointer to the current default method. .Pp .Fn DH_set_method selects @@ -118,17 +111,12 @@ This replaces the .Vt DH_METHOD used by the .Fa dh -key and if the previous method was supplied by an -.Vt ENGINE , -.Xr ENGINE_finish 3 -is called on it. +key. It is possible to have .Vt DH keys that only work with certain .Vt DH_METHOD -implementations (e.g. from an -.Vt ENGINE -module that supports embedded hardware-protected keys), +implementations, and in such cases attempting to change the .Vt DH_METHOD for the key can have unexpected results. @@ -136,17 +124,10 @@ for the key can have unexpected results. .Fn DH_new_method allocates and initializes a .Vt DH -structure so that -.Fa engine -is used for the DH operations. -If +structure. +The .Fa engine -is -.Dv NULL , -.Xr ENGINE_get_default_DH 3 -is used. -If that returns -.Dv NULL , +argument is ignored and the default method controlled by .Fn DH_set_default_method is used. @@ -202,10 +183,7 @@ and sets an error code that can be obtained by if the allocation fails. Otherwise it returns a pointer to the newly allocated structure. .Sh SEE ALSO -.Xr DH_new 3 , -.Xr ENGINE_get_default_DH 3 , -.Xr ENGINE_register_DH 3 , -.Xr ENGINE_set_default_DH 3 +.Xr DH_new 3 .Sh HISTORY .Fn DH_set_default_method , .Fn DH_get_default_method , diff --git a/lib/libcrypto/man/DSA_set_method.3 b/lib/libcrypto/man/DSA_set_method.3 index 31ded16d8c2..ec6d2b4cd96 100644 --- a/lib/libcrypto/man/DSA_set_method.3 +++ b/lib/libcrypto/man/DSA_set_method.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: DSA_set_method.3,v 1.10 2022/01/15 23:38:50 jsg Exp $ +.\" $OpenBSD: DSA_set_method.3,v 1.11 2023/11/19 10:34:26 tb Exp $ .\" OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100 .\" .\" This file was written by Ulf Moeller . @@ -48,7 +48,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: January 15 2022 $ +.Dd $Mdocdate: November 19 2023 $ .Dt DSA_SET_METHOD 3 .Os .Sh NAME @@ -93,16 +93,9 @@ selects as the default method for all .Vt DSA structures created later. -If any -.Vt ENGINE -was registered with -.Xr ENGINE_register_DSA 3 -that can be successfully initialized, it overrides the default. .Pp .Fn DSA_get_default_method -returns a pointer to the current default method, -even if it is actually overridden by an -.Vt ENGINE . +returns a pointer to the current default method. .Pp .Fn DSA_set_method selects @@ -111,15 +104,10 @@ to perform all operations using the key .Fa dsa . This replaces the .Vt DSA_METHOD -used by the DSA key and if the previous method was supplied by an -.Vt ENGINE , -.Xr ENGINE_finish 3 -is called on it. +used by the DSA key. It is possible to have DSA keys that only work with certain .Vt DSA_METHOD -implementations (e.g. from an -.Vt ENGINE -module that supports embedded hardware-protected keys), +implementations, and in such cases attempting to change the .Vt DSA_METHOD for the key can have unexpected results. @@ -127,17 +115,10 @@ for the key can have unexpected results. .Fn DSA_new_method allocates and initializes a .Vt DSA -structure so that -.Fa engine -is used for the DSA operations. -If +structure. +The .Fa engine -is -.Dv NULL , -.Xr ENGINE_get_default_DSA 3 -is used. -If that returns -.Dv NULL , +argument is ignored and the default method controlled by .Fn DSA_set_default_method is used. @@ -206,10 +187,7 @@ if the allocation fails. Otherwise it returns a pointer to the newly allocated structure. .Sh SEE ALSO .Xr DSA_meth_new 3 , -.Xr DSA_new 3 , -.Xr ENGINE_get_default_DSA 3 , -.Xr ENGINE_register_DSA 3 , -.Xr ENGINE_set_default_DSA 3 +.Xr DSA_new 3 .Sh HISTORY .Fn DSA_set_default_method , .Fn DSA_get_default_method , diff --git a/lib/libcrypto/man/RSA_set_method.3 b/lib/libcrypto/man/RSA_set_method.3 index 818b64823dc..ffe22c116f4 100644 --- a/lib/libcrypto/man/RSA_set_method.3 +++ b/lib/libcrypto/man/RSA_set_method.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: RSA_set_method.3,v 1.17 2023/05/14 09:33:19 tb Exp $ +.\" $OpenBSD: RSA_set_method.3,v 1.18 2023/11/19 10:34:26 tb Exp $ .\" OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400 .\" .\" This file was written by Ulf Moeller @@ -50,7 +50,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: May 14 2023 $ +.Dd $Mdocdate: November 19 2023 $ .Dt RSA_SET_METHOD 3 .Os .Sh NAME @@ -105,16 +105,9 @@ selects as the default method for all .Vt RSA structures created later. -If any -.Vt ENGINE -was registered with -.Xr ENGINE_register_RSA 3 -that can be successfully initialized, it overrides the default. .Pp .Fn RSA_get_default_method -returns a pointer to the current default method, -even if it is actually overridden by an -.Vt ENGINE . +returns a pointer to the current default method. .Pp .Fn RSA_set_method selects @@ -127,10 +120,7 @@ used by the RSA key, calling the .Fa finish function set up with .Xr RSA_meth_set_finish 3 -if any, and if the previous method was supplied by an -.Vt ENGINE , -.Xr ENGINE_finish 3 -is called on it. +if any. If .Fa meth contains an @@ -142,9 +132,7 @@ that function is called just before returning from .Pp It is possible to have RSA keys that only work with certain .Vt RSA_METHOD -implementations (e.g. from an -.Vt ENGINE -module that supports embedded hardware-protected keys), +implementations, and in such cases attempting to change the .Vt RSA_METHOD for the key can have unexpected results. @@ -154,12 +142,6 @@ returns a pointer to the .Vt RSA_METHOD being used by .Fa rsa . -This method may or may not be supplied by an -.Vt ENGINE -implementation but if it is, the return value can only be guaranteed -to be valid as long as the RSA key itself is valid and does not -have its implementation changed by -.Fn RSA_set_method . .Pp The misleadingly named function .Fn RSA_flags @@ -178,17 +160,10 @@ section for more details. .Fn RSA_new_method allocates and initializes an .Vt RSA -structure so that -.Fa engine -is used for the RSA operations. -If +structure. +The .Fa engine -is -.Dv NULL , -.Xr ENGINE_get_default_RSA 3 -is used. -If that returns -.Dv NULL , +argument is ignored and the default method controlled by .Fn RSA_set_default_method is used. @@ -224,9 +199,6 @@ and sets an error code that can be obtained by if the allocation fails. Otherwise it returns a pointer to the newly allocated structure. .Sh SEE ALSO -.Xr ENGINE_get_default_RSA 3 , -.Xr ENGINE_register_RSA 3 , -.Xr ENGINE_set_default_RSA 3 , .Xr RSA_meth_new 3 , .Xr RSA_new 3 .Sh HISTORY -- 2.20.1