[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  81cc5ce1a0f996f88051f031bda1079961ee4a5c (commit)
       via  ed348378070e6240c64900c4a4e9e8f7ff7c8320 (commit)
      from  b000a2f95bb9488ad88ba39db770e8b94031eea0 (commit)


- Log -----------------------------------------------------------------
commit 81cc5ce1a0f996f88051f031bda1079961ee4a5c
Author: Pauli <pauli at openssl.org>
Date:   Wed Apr 14 19:00:20 2021 +1000

    lifecycle: update master lifecycle transition spreadsheet fixing the ettable issue
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14867)

commit ed348378070e6240c64900c4a4e9e8f7ff7c8320
Author: Pauli <pauli at openssl.org>
Date:   Wed Apr 14 18:45:44 2021 +1000

    lifecycle: correct [sg]ettable to [sg]et
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14867)

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

Summary of changes:
 doc/life-cycles/lifecycles.ods | Bin 16408 -> 16717 bytes
 doc/man7/life_cycle-mac.pod    |   8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/life-cycles/lifecycles.ods b/doc/life-cycles/lifecycles.ods
index 4f77f281e0..b8f198a8e5 100644
Binary files a/doc/life-cycles/lifecycles.ods and b/doc/life-cycles/lifecycles.ods differ
diff --git a/doc/man7/life_cycle-mac.pod b/doc/man7/life_cycle-mac.pod
index b9812f7cae..0e7590740d 100644
--- a/doc/man7/life_cycle-mac.pod
+++ b/doc/man7/life_cycle-mac.pod
@@ -99,8 +99,8 @@ This is the canonical list.
  EVP_MAC_update                                     updated     updated
  EVP_MAC_final                                                  finaled
  EVP_MAC_CTX_free                freed   freed       freed       freed       freed
- EVP_MAC_gettable_ctx_params             newed    initialised   updated    
- EVP_MAC_settable_ctx_params             newed    initialised   updated
+ EVP_MAC_CTX_get_params                  newed    initialised   updated
+ EVP_MAC_CTX_set_params                  newed    initialised   updated
  EVP_MAC_CTX_gettable_params             newed    initialised   updated
  EVP_MAC_CTX_settable_params             newed    initialised   updated
 
@@ -153,14 +153,14 @@ This is the canonical list.
     <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"></td></tr>
-<tr><th style="border:1px solid" align="left">EVP_MAC_gettable_ctx_params</th>
+<tr><th style="border:1px solid" align="left">EVP_MAC_CTX_get_params</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">initialised</td>
     <td style="border:1px solid" align="center">updated</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_settable_ctx_params</th>
+<tr><th style="border:1px solid" align="left">EVP_MAC_CTX_set_params</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">initialised</td>