diff options
| author | Pauli <pauli@openssl.org> | 2021-04-29 11:08:42 +1000 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2021-05-05 22:11:04 +1000 |
| commit | f14a2c9d7ac79afb36cacbf910a6363c7abc3135 (patch) | |
| tree | d0624ba9eba626b1fb4a2899d0cda0a1708de04f | |
| parent | a59c69724d7cbc3a4ec9f7774da9da83871ea944 (diff) | |
mac: update life-cycle description and diagrams to include finalXOF
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15061)
| -rw-r--r-- | doc/life-cycles/lifecycles.ods | bin | 16717 -> 16752 bytes | |||
| -rw-r--r-- | doc/life-cycles/mac.dot | 6 | ||||
| -rw-r--r-- | doc/man7/life_cycle-mac.pod | 14 | ||||
| -rw-r--r-- | doc/man7/mac.png | bin | 50554 -> 56417 bytes |
4 files changed, 15 insertions, 5 deletions
diff --git a/doc/life-cycles/lifecycles.ods b/doc/life-cycles/lifecycles.ods Binary files differindex b8f198a8e5..f80a76e622 100644 --- a/doc/life-cycles/lifecycles.ods +++ b/doc/life-cycles/lifecycles.ods diff --git a/doc/life-cycles/mac.dot b/doc/life-cycles/mac.dot index c52701742c..799d90e7d3 100644 --- a/doc/life-cycles/mac.dot +++ b/doc/life-cycles/mac.dot @@ -11,9 +11,11 @@ digraph mac { initialised -> updated [label="EVP_MAC_update"]; updated -> updated [label="EVP_MAC_update"]; updated -> finaled [label="EVP_MAC_final"]; + updated -> finaled [label="EVP_MAC_finalXOF", + fontcolor="#808080", color="#808080"]; /* Once this works it should go back in: - updated -> finaled [label="EVP_MAC_final_XOF", style=dashed]; - finaled -> finaled [label="EVP_MAC_final_XOF", style=dashed]; + finaled -> finaled [label="EVP_MAC_final_XOF", + fontcolor="#808080", color="#808080"]; */ finaled -> end [label="EVP_MAC_CTX_free"]; updated -> initialised [label="EVP_MAC_init", style=dashed, diff --git a/doc/man7/life_cycle-mac.pod b/doc/man7/life_cycle-mac.pod index 0e7590740d..17be432ab0 100644 --- a/doc/man7/life_cycle-mac.pod +++ b/doc/man7/life_cycle-mac.pod @@ -68,9 +68,9 @@ The usual life-cycle of a MAC is illustrated: EVP_MAC_init | +-------------------+ | | | updated | -+ | +-------------------+ - | | - | | EVP_MAC_final - | v + | | | + | | EVP_MAC_final | EVP_MAC_finalXOF + | v v | +-------------------+ +- | finaled | +-------------------+ @@ -98,6 +98,7 @@ This is the canonical list. EVP_MAC_init initialised initialised initialised initialised EVP_MAC_update updated updated EVP_MAC_final finaled + EVP_MAC_finalXOF finaled EVP_MAC_CTX_free freed freed freed freed freed EVP_MAC_CTX_get_params newed initialised updated EVP_MAC_CTX_set_params newed initialised updated @@ -146,6 +147,13 @@ This is the canonical list. <td style="border:1px solid" align="center">finaled</td> <td style="border:1px solid" align="center"></td> <td style="border:1px solid" align="center"></td></tr> +<tr><th style="border:1px solid" align="left">EVP_MAC_finalXOF</th> + <td style="border:1px solid" align="center"></td> + <td style="border:1px solid" align="center"></td> + <td style="border:1px solid" align="center"></td> + <td style="border:1px solid" align="center">finaled</td> + <td style="border:1px solid" align="center"></td> + <td style="border:1px solid" align="center"></td></tr> <tr><th style="border:1px solid" align="left">EVP_MAC_CTX_free</th> <td style="border:1px solid" align="center">freed</td> <td style="border:1px solid" align="center">freed</td> diff --git a/doc/man7/mac.png b/doc/man7/mac.png Binary files differindex 1c486e1ba4..620f50a6f3 100644 --- a/doc/man7/mac.png +++ b/doc/man7/mac.png |
