summaryrefslogtreecommitdiffstats
path: root/crypto/objects/objects.txt
diff options
context:
space:
mode:
authorAlessandro Ghedini <alessandro@ghedini.me>2016-03-02 23:58:27 +0000
committerRich Salz <rsalz@openssl.org>2016-03-03 18:21:20 -0500
commitaacfb134be2a88211b79dc53bb5bd0e422dbb60d (patch)
tree5b247240da2fcc6e55e00a6296e0cc0ad3eb8fc5 /crypto/objects/objects.txt
parentb894054e3f7de6c64b505006395aa24b30928e97 (diff)
GH355: Implement HKDF
This patch implements the HMAC-based Extract-and-Expand Key Derivation Function (HKDF) as defined in RFC 5869. It is required to implement the QUIC and TLS 1.3 protocols (among others). Signed-off-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
Diffstat (limited to 'crypto/objects/objects.txt')
-rw-r--r--crypto/objects/objects.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 14e68e384c..9d04a63431 100644
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -1444,6 +1444,9 @@ secg-scheme 14 3 : dhSinglePass-cofactorDH-sha512kdf-scheme
# NID for TLS1 PRF
: TLS1-PRF : tls1-prf
+# NID for HKDF
+ : HKDF : hkdf
+
# RFC 4556
1 3 6 1 5 2 3 : id-pkinit
id-pkinit 4 : pkInitClientAuth : PKINIT Client Auth