Added X963KDF API
authorShane Lontis <shane.lontis@oracle.com>
Thu, 16 May 2019 01:43:41 +0000 (11:43 +1000)
committerPauli <paul.dale@oracle.com>
Thu, 16 May 2019 01:43:41 +0000 (11:43 +1000)
commit8bbeaaa4fc12f8b00fbea4dc649ef74b59f73b17
treebf043355836767d39f96bd2a67b9bc3b7798dd9d
parent0211740fcc47a954be19cceb65fb57a6f7deb797
Added X963KDF API

X963 KDF is used for CMS ec keyagree Recipient Info.
The X963 KDF that is used by CMS EC Key Agreement has been moved
into a EVP_KDF object. This KDF is almost identical to the the SSKDF
hash variant, so it has been implemented inside the SSKDF code with
its own method table.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8902)
17 files changed:
crypto/ec/ecdh_kdf.c
crypto/err/openssl.txt
crypto/evp/c_allkdf.c
crypto/evp/kdf_lib.c
crypto/include/internal/evp_int.h
crypto/kdf/kdf_err.c
crypto/kdf/sskdf.c
crypto/objects/obj_dat.h
crypto/objects/obj_mac.num
crypto/objects/objects.txt
doc/man3/EVP_KDF_CTX.pod
doc/man7/EVP_KDF_X963.pod [new file with mode: 0644]
include/openssl/kdf.h
include/openssl/kdferr.h
include/openssl/obj_mac.h
test/evp_kdf_test.c
test/recipes/30-test_evp_data/evpkdf.txt