Fix no-cms build errors.
authorShane Lontis <shane.lontis@oracle.com>
Wed, 19 Aug 2020 03:27:31 +0000 (13:27 +1000)
committerShane Lontis <shane.lontis@oracle.com>
Wed, 19 Aug 2020 03:27:31 +0000 (13:27 +1000)
commit7fe32ef68855d727c55186bda99b3e2500afa2c2
tree9b838b944a6878e5301a6134bbb411d217933fb2
parentc51a8af8cca755ceefba64b3cbd0bdb91c74d77c
Fix no-cms build errors.

Fixes #12640

The X942-KDF is now indepedent of the CMS code (since it no longer uses CMS_SharedInfo_encode).
Any code related to EVP_PKEY_DH_KDF_X9_42 needs to not be wrapped by !defined(OPENSSL_NO_CMS).

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/12642)
crypto/dh/dh_kdf.c
crypto/dh/dh_pmeth.c
include/openssl/dh.h
util/libcrypto.num