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)

diff --git a/doc/life-cycles/lifecycles.ods b/doc/life-cycles/lifecycles.ods
index b8f198a8e594a65d4a24626e7de034fa6d6da889..f80a76e622f7ea3cae2761b8e546839e4efd515d 100644 (file)
Binary files a/doc/life-cycles/lifecycles.ods and b/doc/life-cycles/lifecycles.ods differ

diff --git a/doc/life-cycles/mac.dot b/doc/life-cycles/mac.dot
index c52701742cad0c1ce134394344b71bbd7cb6a148..799d90e7d3632c17ea2a4671423291dbb1dacac7 100644 (file)
--- 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 0e7590740d605eae984ec781ed050847ebb54e01..17be432ab07bd3f6b8adcd7e44e64f084d80d6ac 100644 (file)
--- 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
index 1c486e1ba40b4720ef5a14a2d1192a4349db8d1e..620f50a6f329192ecaf410015f7b83cc59470928 100644 (file)
Binary files a/doc/man7/mac.png and b/doc/man7/mac.png differ