openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

DOCS: Fix provider-mac.pod and the docs of our implementations 

The idea being that doc/man7/provider-mac.pod is for provider authors,
while provider users find the documentation for each implementation in
doc/man7/EVP_MAC-*.pod, the documentation of parameters wasn't quite
aligned.  This change re-arranges the parameter documentation to be
more aligned with this idea.

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14380)
This commit is contained in:
Richard Levitte 2021-03-01 18:46:20 +01:00
parent cb54d1b9d7
commit 8593ff00cc
8 changed files with 100 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
doc/man7/EVP_MAC-BLAKE2.pod
View File

@ -36,25 +36,28 @@ The length of the "size" parameter should not exceed that of a B<size_t>.
=item "key" (B<OSSL_MAC_PARAM_KEY>) <octet string>
This may be at most 64 bytes for BLAKE2BMAC or 32 for BLAKE2SMAC and
at least 1 byte in both cases.
Sets the MAC key.
It may be at most 64 bytes for BLAKE2BMAC or 32 for BLAKE2SMAC and at
least 1 byte in both cases.
Setting this parameter is identical to passing a I<key> to L<EVP_MAC_init(3)>.
=item "custom" (B<OSSL_MAC_PARAM_CUSTOM>) <octet string>
This is an optional value of at most 16 bytes for BLAKE2BMAC or 8 for
BLAKE2SMAC.
It is empty by default.
Sets the custom value.
It is an optional value of at most 16 bytes for BLAKE2BMAC or 8 for
BLAKE2SMAC, and is empty by default.
=item "salt" (B<OSSL_MAC_PARAM_SALT>) <octet string>
This is an optional value of at most 16 bytes for BLAKE2BMAC or 8 for
BLAKE2SMAC.
It is empty by default.
Sets the salt.
It is an optional value of at most 16 bytes for BLAKE2BMAC or 8 for
BLAKE2SMAC, and is empty by default.
=item "size" (B<OSSL_MAC_PARAM_SIZE>) <unsigned integer>
When set, this can be any number between between 1 and 32 for
EVP_MAC_BLAKE2S or 64 for EVP_MAC_BLAKE2B.
Sets the MAC size.
It can be any number between 1 and 32 for EVP_MAC_BLAKE2S or between 1
and 64 for EVP_MAC_BLAKE2B.
It is 32 and 64 respectively by default.
=back

12
doc/man7/EVP_MAC-CMAC.pod
View File

@ -8,6 +8,9 @@ EVP_MAC-CMAC - The CMAC EVP_MAC implementation
Support for computing CMAC MACs through the B<EVP_MAC> API.
This implementation uses EVP_CIPHER functions to get access to the underlying
cipher.
=head2 Identity
This implementation is identified with this name and properties, to be
@ -30,10 +33,19 @@ The following parameter can be set with EVP_MAC_CTX_set_params():
=item "key" (B<OSSL_MAC_PARAM_KEY>) <octet string>
Sets the MAC key.
Setting this parameter is identical to passing a I<key> to L<EVP_MAC_init(3)>.
=item "cipher" (B<OSSL_MAC_PARAM_CIPHER>) <UTF8 string>
Sets the name of the underlying cipher to be used.
=item "properties" (B<OSSL_MAC_PARAM_PROPERTIES>) <UTF8 string>
Sets the properties to be queried when trying to fetch the underlying cipher.
This must be given together with the cipher naming parameter to be considered
valid.
=back
The following parameters can be retrieved with

16
doc/man7/EVP_MAC-GMAC.pod
View File

@ -8,6 +8,9 @@ EVP_MAC-GMAC - The GMAC EVP_MAC implementation
Support for computing GMAC MACs through the B<EVP_MAC> API.
This implementation uses EVP_CIPHER functions to get access to the underlying
cipher.
=head2 Identity
This implementation is identified with this name and properties, to be
@ -30,12 +33,23 @@ The following parameter can be set with EVP_MAC_CTX_set_params():
=item "key" (B<OSSL_MAC_PARAM_KEY>) <octet string>
Sets the MAC key.
Setting this parameter is identical to passing a I<key> to L<EVP_MAC_init(3)>.
=item "iv" (B<OSSL_MAC_PARAM_IV>) <octet string>
Sets the IV of the underlying cipher, when applicable.
=item "cipher" (B<OSSL_MAC_PARAM_CIPHER>) <UTF8 string>
Sets the name of the underlying cipher to be used.
=item "properties" (B<OSSL_MAC_PARAM_PROPERTIES>) <UTF8 string>
Sets the properties to be queried when trying to fetch the underlying cipher.
This must be given together with the cipher naming parameter to be considered
valid.
=back
The following parameters can be retrieved with
@ -45,6 +59,8 @@ EVP_MAC_CTX_get_params():
=item "size" (B<OSSL_MAC_PARAM_SIZE>) <unsigned integer>
Gets the MAC size.
=back
The "size" parameter can also be retrieved with EVP_MAC_CTX_get_mac_size().

26
doc/man7/EVP_MAC-HMAC.pod
View File

@ -8,6 +8,9 @@ EVP_MAC-HMAC - The HMAC EVP_MAC implementation
Support for computing HMAC MACs through the B<EVP_MAC> API.
This implementation uses EVP_MD functions to get access to the underlying
digest.
=head2 Identity
This implementation is identified with this name and properties, to be
@ -30,22 +33,37 @@ The following parameter can be set with EVP_MAC_CTX_set_params():
=item "key" (B<OSSL_MAC_PARAM_KEY>) <octet string>
Sets the MAC key.
Setting this parameter is identical to passing a I<key> to L<EVP_MAC_init(3)>.
=item "digest" (B<OSSL_MAC_PARAM_DIGEST>) <UTF8 string>
Sets the name of the underlying digest to be used.
=item "properties" (B<OSSL_MAC_PARAM_PROPERTIES>) <UTF8 string>
Sets the properties to be queried when trying to fetch the underlying digest.
This must be given together with the digest naming parameter ("digest", or
B<OSSL_MAC_PARAM_DIGEST>) to be considered valid.
=item "digest-noinit" (B<OSSL_MAC_PARAM_DIGEST_NOINIT>) <integer>
A flag to set the MAC digest to not initialise the implementation
specific data.
The value 0 or 1 is expected.
=item "digest-oneshot" (B<OSSL_MAC_PARAM_DIGEST_ONESHOT>) <integer>
=item "properties" (B<OSSL_MAC_PARAM_PROPERTIES>) <UTF8 string>
A flag to set the MAC digest to be a one-shot operation.
The value 0 or 1 is expected.
=item "tls-data-size" (B<OSSL_MAC_PARAM_TLS_DATA_SIZE>) <unsigned integer>
=back
The "flags" parameter is passed directly to HMAC_CTX_set_flags().
=for comment The "flags" parameter is passed directly to HMAC_CTX_set_flags().
The following parameter can be retrieved with
EVP_MAC_CTX_get_params():
The following parameter can be retrieved with EVP_MAC_CTX_get_params():
=over 4

9
doc/man7/EVP_MAC-KMAC.pod
View File

@ -36,10 +36,19 @@ The length of the "size" parameter should not exceed that of a B<size_t>.
=item "key" (B<OSSL_MAC_PARAM_KEY>) <octet string>
Sets the MAC key.
Setting this parameter is identical to passing a I<key> to L<EVP_MAC_init(3)>.
=item "custom" (B<OSSL_MAC_PARAM_CUSTOM>) <octet string>
Sets the custom value.
It is an optional value of at most 127 bytes, and is empty by default.
=item "size" (B<OSSL_MAC_PARAM_SIZE>) <unsigned integer>
Sets the MAC size.
By default, it is 16 for C<KMAC-128> and 32 for C<KMAC-256>.
=item "xof" (B<OSSL_MAC_PARAM_XOF>) <integer>
The "xof" parameter value is expected to be 1 or 0. Use 1 to enable XOF mode.

5
doc/man7/EVP_MAC-Poly1305.pod
View File

@ -30,6 +30,9 @@ The following parameter can be set with EVP_MAC_CTX_set_params():
=item "key" (B<OSSL_MAC_PARAM_KEY>) <octet string>
Sets the MAC key.
Setting this parameter is identical to passing a I<key> to L<EVP_MAC_init(3)>.
=back
The following parameters can be retrieved with
@ -39,6 +42,8 @@ EVP_MAC_CTX_get_params():
=item "size" (B<OSSL_MAC_PARAM_SIZE>) <unsigned integer>
Gets the MAC size.
=back
The "size" parameter can also be retrieved with with EVP_MAC_CTX_get_mac_size().

5
doc/man7/EVP_MAC-Siphash.pod
View File

@ -34,8 +34,13 @@ The length of the "size" parameter should not exceed that of a B<size_t>.
=item "key" (B<OSSL_MAC_PARAM_KEY>) <octet string>
Sets the MAC key.
Setting this parameter is identical to passing a I<key> to L<EVP_MAC_init(3)>.
=item "size" (B<OSSL_MAC_PARAM_SIZE>) <unsigned integer>
Sets the MAC size.
=item "c-rounds" (B<OSSL_MAC_PARAM_C_ROUNDS>) <unsigned integer>
Specifies the number of rounds per message block. By default this is I<2>.

65
doc/man7/provider-mac.pod
View File

@ -152,9 +152,11 @@ with the provider side context I<mctx> in its current state if it is
not NULL. Otherwise, they return the parameters associated with the
provider side algorithm I<provctx>.
All MAC implementations are expected to handle the following parameters:
Parameters currently recognised by built-in macs are as follows. Not all
parameters are relevant to, or are understood by all macs:
=over 4
=item with OSSL_FUNC_set_ctx_params():
=over 4
@ -163,56 +165,21 @@ parameters are relevant to, or are understood by all macs:
Sets the key in the associated MAC ctx. This is identical to passing a I<key>
argument to the OSSL_FUNC_mac_init() function.
=item "iv" (B<OSSL_MAC_PARAM_IV>) <octet string>
=back
Sets the IV of the underlying cipher, when applicable.
=item with OSSL_FUNC_get_params():
=item "custom" (B<OSSL_MAC_PARAM_CUSTOM>) <UTF8 string>
Sets the custom string in the associated MAC ctx.
=item "salt" (B<OSSL_MAC_PARAM_SALT>) <octet string>
Sets the salt of the underlying cipher, when applicable.
=item "xof" (B<OSSL_MAC_PARAM_BLOCK_XOF>) <integer>
Sets XOF mode in the associated MAC ctx.
0 means no XOF mode, 1 means XOF mode.
=item "digest-noinit" (B<OSSL_MAC_PARAM_DIGEST_NOINIT>) <integer>
A simple flag to set the MAC digest to not initialise the
implementation specific data. The value 0 or 1 is expected.
=item "digest-oneshot" (B<OSSL_MAC_PARAM_DIGEST_ONESHOT>) <integer>
A simple flag to set the MAC digest to be a oneshot operation.
The value 0 or 1 is expected.
=for comment We need to investigate if this is the right approach
=item "cipher" (B<OSSL_MAC_PARAM_CIPHER>) <UTF8 string>
=item "digest" (B<OSSL_MAC_PARAM_DIGEST>) <UTF8 string>
Sets the name of the underlying cipher or digest to be used.
It must name a suitable algorithm for the MAC that's being used.
=item "properties" (B<OSSL_MAC_PARAM_PROPERTIES>) <UTF8 string>
Sets the properties to be queried when trying to fetch the underlying algorithm.
This must be given together with the algorithm naming parameter to be
considered valid.
=over 4
=item "size" (B<OSSL_MAC_PARAM_SIZE>) <integer>
Can be used to get the resulting MAC size.
Can be used to get the default MAC size (which might be the only allowable
MAC size for the implementation).
With some MAC algorithms, it can also be used to set the size that the
resulting MAC should have.
Allowable sizes are decided within each implementation.
Note that some implementations allow setting the size that the resulting MAC
should have as well, see the documentation of the implementation.
=back
=back
@ -231,7 +198,11 @@ array, or NULL if none is offered.
=head1 SEE ALSO
L<provider(7)>, L<EVP_MAC_init(3)>
L<provider(7)>,
L<EVP_MAC-BLAKE2(7)>, L<EVP_MAC-CMAC(7)>, L<EVP_MAC-GMAC(7)>,
L<EVP_MAC-HMAC(7)>, L<EVP_MAC-KMAC(7)>, L<EVP_MAC-Poly1305(7)>,
L<EVP_MAC-Siphash(7)>
=head1 HISTORY