diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2019-07-09 01:33:18 +0200 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2019-07-09 01:33:18 +0200 |
| commit | 1aec7716c1c5fccf605a46252a46ea468e684454 (patch) | |
| tree | f8b2cce477100f92a3daac1ab72f607d0023c44e /crypto/objects/objects.txt | |
| parent | Avoid NULL pointer dereference. Fixes #9043. (diff) | |
| download | openssl-1aec7716c1c5fccf605a46252a46ea468e684454.tar.xz openssl-1aec7716c1c5fccf605a46252a46ea468e684454.zip | |
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/objects/objects.txt')
| -rw-r--r-- | crypto/objects/objects.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt index dcdfa903c5..47cf2f183d 100644 --- a/crypto/objects/objects.txt +++ b/crypto/objects/objects.txt @@ -1616,6 +1616,8 @@ secg-scheme 14 3 : dhSinglePass-cofactorDH-sha512kdf-scheme # NID for SSKDF : SSKDF : sskdf +# NID for X942KDF + : X942KDF : x942kdf # NID for X963-2001 KDF : X963KDF : x963kdf |