[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  a80caef5583d64460903656c0bdca612bd52fba5 (commit)
      from  c0cb5a32253bf9356ae122937d15d4b9fdcff6b2 (commit)


- Log -----------------------------------------------------------------
commit a80caef5583d64460903656c0bdca612bd52fba5
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Oct 14 12:12:54 2019 +0200

    KDF: clean away old EVP_KDF declarations
    
    They were left-overs from when we still had the legacy KDF implementation
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/10170)

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

Summary of changes:
 include/crypto/evp.h | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/include/crypto/evp.h b/include/crypto/evp.h
index b9dc95164c..c49ec404d6 100644
--- a/include/crypto/evp.h
+++ b/include/crypto/evp.h
@@ -169,15 +169,6 @@ struct evp_kdf_st {
     OSSL_OP_kdf_set_ctx_params_fn *set_ctx_params;
 };
 
-extern const EVP_KDF pbkdf2_kdf_meth;
-extern const EVP_KDF scrypt_kdf_meth;
-extern const EVP_KDF tls1_prf_kdf_meth;
-extern const EVP_KDF hkdf_kdf_meth;
-extern const EVP_KDF sshkdf_kdf_meth;
-extern const EVP_KDF ss_kdf_meth;
-extern const EVP_KDF x963_kdf_meth;
-extern const EVP_KDF x942_kdf_meth;
-
 struct evp_md_st {
     /* nid */
     int type;