summaryrefslogtreecommitdiffstats
path: root/crypto/objects/objects.txt
diff options
context:
space:
mode:
authorSimo Sorce <simo@redhat.com>2018-09-19 16:23:45 -0400
committerMatt Caswell <matt@openssl.org>2019-02-27 11:02:54 +0000
commit8d76481b189b7195ef932e0fb8f0e23ab0120771 (patch)
tree859eed33157350c35682cec39e7e450aaa5b7330 /crypto/objects/objects.txt
parent149c12d5e41b238ce4af6d1b6b3a767b40293bd7 (diff)
Implement SSH KDF
SSH's KDF is defined in RFC 4253 in Section 7.2 Signed-off-by: Simo Sorce <simo@redhat.com> Reviewed-by: Paul Dale <paul.dale@oracle.com> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/7290)
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 344b67b395..cb0b99c47f 100644
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -1609,6 +1609,9 @@ secg-scheme 14 3 : dhSinglePass-cofactorDH-sha512kdf-scheme
# NID for HKDF
: HKDF : hkdf
+# NID for SSHKDF
+ : SSHKDF : sshkdf
+
# RFC 4556
1 3 6 1 5 2 3 : id-pkinit
id-pkinit 4 : pkInitClientAuth : PKINIT Client Auth