From: Richard Levitte Date: Thu, 11 Jul 2019 10:18:42 +0000 (+0200) Subject: Describe OSSL_PARAM as a parameter descriptor X-Git-Tag: openssl-3.0.0-alpha1~1729 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3efe19145ceaf27d27c45384269fa37aa4f4b57f;p=oweals%2Fopenssl.git Describe OSSL_PARAM as a parameter descriptor This affects doc/man3/OSSL_PARAM.pod and doc/man7/openssl-core.h.pod Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/9346) --- diff --git a/doc/man3/OSSL_PARAM.pod b/doc/man3/OSSL_PARAM.pod index 0f6358cf7b..61ff378e46 100644 --- a/doc/man3/OSSL_PARAM.pod +++ b/doc/man3/OSSL_PARAM.pod @@ -27,27 +27,37 @@ A typical usage example could be an application that wants to set some parameters for an object, or wants to find out some parameters of an object. -Arrays of this type can be used for two purposes: +Arrays of this type can be used for the following purposes: =over 4 -=item * +=item * Setting parameters for some object -Setting parameters for some object. The caller sets up the C array and calls some function (the I) that has intimate knowledge about the object that can take the data from the C array and assign them in a suitable form for the internal structure of the object. -=item * +=item * Request parameters of some object -Request parameters of some object. The caller (the I) sets up the C array and calls some function (the I) that has intimate knowledge about the object, which can take the internal data of the object and copy (possibly convert) that to the memory prepared by the I and pointed at with the C C. +=item * Request parameter descriptors + +The caller gets an array of constant C, which describe +available parameters and some of their properties; name, data type and +expected data size. +For a detailed description of each field for this use, see the field +descriptions below. + +The caller may then use the information from this descriptor array to +build up its own C array to pass down to a I or +I. + =back =head2 C fields @@ -78,6 +88,11 @@ setting parameters) or shall (when requesting parameters) be stored, and C is its size in bytes. The organization of the data depends on the parameter type and flag. +When the C is used as a parameter descriptor, C +should be ignored. +If C is zero, it means that an arbitrary data size is +accepted, otherwise it specifies the maximum size allowed. + =item C When an array of C is used to request data, the @@ -86,6 +101,9 @@ parameter data. In case the C is too small for the data, the I must still set this field to indicate the minimum data size required. +When the C is used as a parameter descriptor, +C should be ignored. + =back B diff --git a/doc/man7/openssl-core.h.pod b/doc/man7/openssl-core.h.pod index 7fd4dfb24e..737293d701 100644 --- a/doc/man7/openssl-core.h.pod +++ b/doc/man7/openssl-core.h.pod @@ -69,8 +69,8 @@ It's normally passed in arrays, where the array is terminated with an element where all fields are zero (for non-pointers) or C (for pointers). -These arrays can be used both to set parameters for some object, and -to request parameters. +These arrays can be used to set parameters for some object, to request +parameters, and to describe parameters. C is further described in L