[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  e82fc27bcd34f246e1acd42a61e8ba62907e1d19 (commit)
      from  435981cbadad2c58c35bacd30ca5d8b4c9bea72f (commit)


- Log -----------------------------------------------------------------
commit e82fc27bcd34f246e1acd42a61e8ba62907e1d19
Author: astraujums <astraujums at whitecryption.com>
Date:   Wed Sep 8 15:55:39 2021 +0300

    Fixed state transitions for the HTML version of the life_cycle-kdf.pod.
    The MAN version was fine and so are kdf.dot and lifecycles.ods from doc/life-cycles
    
    CLA: trivial
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16559)

-----------------------------------------------------------------------

Summary of changes:
 doc/man7/life_cycle-kdf.pod | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/man7/life_cycle-kdf.pod b/doc/man7/life_cycle-kdf.pod
index 6a50cc9aa6..d2aec8fe82 100644
--- a/doc/man7/life_cycle-kdf.pod
+++ b/doc/man7/life_cycle-kdf.pod
@@ -103,19 +103,19 @@ This is the canonical list.
     <td style="border:1px solid"></td></tr>
 <tr><th style="border:1px solid" align="left">EVP_KDF_derive</th>
     <td style="border:1px solid" align="center"></td>
-    <td style="border:1px solid" align="center">newed</td>
     <td style="border:1px solid" align="center">deriving</td>
-    <td style="border:1px solid"></td></tr>
-<tr><th style="border:1px solid" align="left">EVP_KDF_CTX_free</th>
-    <td style="border:1px solid" align="center"></td>
-    <td style="border:1px solid" align="center">newed</td>
     <td style="border:1px solid" align="center">deriving</td>
     <td style="border:1px solid"></td></tr>
-<tr><th style="border:1px solid" align="left">EVP_KDF_CTX_reset</th>
+<tr><th style="border:1px solid" align="left">EVP_KDF_CTX_free</th>
     <td style="border:1px solid" align="center">freed</td>
     <td style="border:1px solid" align="center">freed</td>
     <td style="border:1px solid" align="center">freed</td>
     <td style="border:1px solid"></td></tr>
+<tr><th style="border:1px solid" align="left">EVP_KDF_CTX_reset</th>
+    <td style="border:1px solid" align="center"></td>
+    <td style="border:1px solid" align="center">newed</td>
+    <td style="border:1px solid" align="center">newed</td>
+    <td style="border:1px solid"></td></tr>
 <tr><th style="border:1px solid" align="left">EVP_KDF_CTX_get_params</th>
     <td style="border:1px solid" align="center"></td>
     <td style="border:1px solid" align="center">newed</td>