diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2019-05-16 11:43:41 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2019-05-16 11:43:41 +1000 |
| commit | 8bbeaaa4fc12f8b00fbea4dc649ef74b59f73b17 (patch) | |
| tree | bf043355836767d39f96bd2a67b9bc3b7798dd9d /crypto/objects/objects.txt | |
| parent | 0211740fcc47a954be19cceb65fb57a6f7deb797 (diff) | |
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)
Diffstat (limited to 'crypto/objects/objects.txt')
| -rw-r--r-- | crypto/objects/objects.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt index 2240916ff4..a84b532247 100644 --- a/crypto/objects/objects.txt +++ b/crypto/objects/objects.txt @@ -1617,6 +1617,9 @@ secg-scheme 14 3 : dhSinglePass-cofactorDH-sha512kdf-scheme # NID for SSKDF : SSKDF : sskdf +# NID for X963-2001 KDF + : X963KDF : x963kdf + # RFC 4556 1 3 6 1 5 2 3 : id-pkinit id-pkinit 4 : pkInitClientAuth : PKINIT Client Auth |