diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2019-07-09 09:33:18 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2019-07-09 09:33:18 +1000 |
| commit | 1aec7716c1c5fccf605a46252a46ea468e684454 (patch) | |
| tree | f8b2cce477100f92a3daac1ab72f607d0023c44e /crypto/kdf/build.info | |
| parent | 9fd6f7d1cd2a3c8e2bc69dcb8bde8406eb6c2623 (diff) | |
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)
Diffstat (limited to 'crypto/kdf/build.info')
| -rw-r--r-- | crypto/kdf/build.info | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/kdf/build.info b/crypto/kdf/build.info index 52e40a4f2f..4fdaccddec 100644 --- a/crypto/kdf/build.info +++ b/crypto/kdf/build.info @@ -1,4 +1,4 @@ LIBS=../../libcrypto SOURCE[../../libcrypto]=\ tls1_prf.c kdf_err.c kdf_util.c hkdf.c scrypt.c pbkdf2.c sshkdf.c \ - sskdf.c + sskdf.c x942kdf.c |