[openssl] master update

[shane.lontis at oracle.com]

The branch master has been updated
       via  7339547d455046e14b50fe64d71d45c6786ac960 (commit)
      from  c57a59b1a0395733c89a56d3d5fc65a4bf576e4e (commit)


- Log -----------------------------------------------------------------
commit 7339547d455046e14b50fe64d71d45c6786ac960
Author: Shane Lontis <shane.lontis at oracle.com>
Date:   Sat Sep 26 12:41:41 2020 +1000

    Remove TODO comment from sskdf.c
    
    Fixes #12993
    
    The implementation follows the standards/recommendations specified by https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-56Cr2.pdf.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/12999)

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

Summary of changes:
 providers/implementations/kdfs/sskdf.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/providers/implementations/kdfs/sskdf.c b/providers/implementations/kdfs/sskdf.c
index 22c65d26ba..04c1fb6f54 100644
--- a/providers/implementations/kdfs/sskdf.c
+++ b/providers/implementations/kdfs/sskdf.c
@@ -371,11 +371,6 @@ static int sskdf_derive(void *vctx, unsigned char *key, size_t keylen)
         int default_salt_len;
         EVP_MAC *mac = EVP_MAC_CTX_mac(ctx->macctx);
 
-        /*
-         * TODO(3.0) investigate the necessity to have all these controls.
-         * Why does KMAC require a salt length that's shorter than the MD
-         * block size?
-         */
         if (EVP_MAC_is_a(mac, OSSL_MAC_NAME_HMAC)) {
             /* H(x) = HMAC(x, salt, hash) */
             if (md == NULL) {