diff options
| author | Simo Sorce <simo@redhat.com> | 2018-09-19 16:23:45 -0400 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-02-27 11:02:54 +0000 |
| commit | 8d76481b189b7195ef932e0fb8f0e23ab0120771 (patch) | |
| tree | 859eed33157350c35682cec39e7e450aaa5b7330 /crypto/objects | |
| parent | 149c12d5e41b238ce4af6d1b6b3a767b40293bd7 (diff) | |
| download | openssl-new-8d76481b189b7195ef932e0fb8f0e23ab0120771.tar.gz | |
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')
| -rw-r--r-- | crypto/objects/obj_dat.h | 9 | ||||
| -rw-r--r-- | crypto/objects/obj_mac.num | 1 | ||||
| -rw-r--r-- | crypto/objects/objects.txt | 3 |
3 files changed, 10 insertions, 3 deletions
diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h index 78a9e7acaf..e7c59d610d 100644 --- a/crypto/objects/obj_dat.h +++ b/crypto/objects/obj_dat.h @@ -1079,7 +1079,7 @@ static const unsigned char so[7767] = { 0x28,0xCC,0x45,0x03,0x04, /* [ 7761] OBJ_gmac */ }; -#define NUM_NID 1203 +#define NUM_NID 1204 static const ASN1_OBJECT nid_objs[NUM_NID] = { {"UNDEF", "undefined", NID_undef}, {"rsadsi", "RSA Data Security, Inc.", NID_rsadsi, 6, &so[0]}, @@ -2284,9 +2284,10 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = { {"AES-256-SIV", "aes-256-siv", NID_aes_256_siv}, {"BLAKE2BMAC", "blake2bmac", NID_blake2bmac}, {"BLAKE2SMAC", "blake2smac", NID_blake2smac}, + {"SSHKDF", "sshkdf", NID_sshkdf}, }; -#define NUM_SN 1194 +#define NUM_SN 1195 static const unsigned int sn_objs[NUM_SN] = { 364, /* "AD_DVCS" */ 419, /* "AES-128-CBC" */ @@ -2572,6 +2573,7 @@ static const unsigned int sn_objs[NUM_SN] = { 167, /* "SMIME-CAPS" */ 100, /* "SN" */ 1006, /* "SNILS" */ + 1203, /* "SSHKDF" */ 16, /* "ST" */ 143, /* "SXNetID" */ 1062, /* "SipHash" */ @@ -3484,7 +3486,7 @@ static const unsigned int sn_objs[NUM_SN] = { 1093, /* "x509ExtAdmission" */ }; -#define NUM_LN 1194 +#define NUM_LN 1195 static const unsigned int ln_objs[NUM_LN] = { 363, /* "AD Time Stamping" */ 405, /* "ANSI X9.62" */ @@ -4634,6 +4636,7 @@ static const unsigned int ln_objs[NUM_LN] = { 1139, /* "sm4-ctr" */ 1133, /* "sm4-ecb" */ 1135, /* "sm4-ofb" */ + 1203, /* "sshkdf" */ 16, /* "stateOrProvinceName" */ 660, /* "streetAddress" */ 498, /* "subtreeMaximumQuality" */ diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num index 87790200d4..623e7e8623 100644 --- a/crypto/objects/obj_mac.num +++ b/crypto/objects/obj_mac.num @@ -1200,3 +1200,4 @@ aes_192_siv 1199 aes_256_siv 1200 blake2bmac 1201 blake2smac 1202 +sshkdf 1203 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 |