Add X9.42 KDF.
authorShane Lontis <shane.lontis@oracle.com>
Mon, 8 Jul 2019 23:33:18 +0000 (09:33 +1000)
committerShane Lontis <shane.lontis@oracle.com>
Mon, 8 Jul 2019 23:33:18 +0000 (09:33 +1000)
commit1aec7716c1c5fccf605a46252a46ea468e684454
treef8b2cce477100f92a3daac1ab72f607d0023c44e
parent9fd6f7d1cd2a3c8e2bc69dcb8bde8406eb6c2623
Add X9.42 KDF.

Move the KDF code for CMS DH key agreement into an EVP_KDF object.
There are 2 specifications for X9.42 KDF. This implementation uses DER for
otherinfo which embeds the KDF loop counter inside the DER object.

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8898)
18 files changed:
crypto/dh/dh_kdf.c
crypto/err/openssl.txt
crypto/evp/c_allkdf.c
crypto/include/internal/evp_int.h
crypto/kdf/build.info
crypto/kdf/kdf_err.c
crypto/kdf/x942kdf.c [new file with mode: 0644]
crypto/objects/obj_dat.h
crypto/objects/obj_mac.num
crypto/objects/objects.txt
doc/man3/EVP_KDF_CTX.pod
doc/man7/EVP_KDF_X942.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/evp_test.c
test/recipes/30-test_evp_data/evpkdf.txt