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/objects/obj_mac.num | |
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/objects/obj_mac.num')
-rw-r--r-- | crypto/objects/obj_mac.num | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num index e0969fe1fd..022e64277c 100644 --- a/crypto/objects/obj_mac.num +++ b/crypto/objects/obj_mac.num @@ -1204,3 +1204,4 @@ sshkdf 1203 SM2_with_SM3 1204 sskdf 1205 x963kdf 1206 +x942kdf 1207 |