diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2019-01-04 18:41:21 +1000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-03-19 11:03:45 +0000 |
| commit | 9537fe5757bb07761fa275d779bbd40bcf5530e4 (patch) | |
| tree | cb748da879a7b00b758b710daed725113b839844 /crypto/objects/obj_dat.h | |
| parent | 6098b69e5817068c49e63487d3424b4122a1796d (diff) | |
Single step kdf implementation
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8230)
Diffstat (limited to 'crypto/objects/obj_dat.h')
| -rw-r--r-- | crypto/objects/obj_dat.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h index 913e107974..c778d45aa9 100644 --- a/crypto/objects/obj_dat.h +++ b/crypto/objects/obj_dat.h @@ -1080,7 +1080,7 @@ static const unsigned char so[7775] = { 0x2A,0x81,0x1C,0xCF,0x55,0x01,0x83,0x75, /* [ 7766] OBJ_SM2_with_SM3 */ }; -#define NUM_NID 1205 +#define NUM_NID 1206 static const ASN1_OBJECT nid_objs[NUM_NID] = { {"UNDEF", "undefined", NID_undef}, {"rsadsi", "RSA Data Security, Inc.", NID_rsadsi, 6, &so[0]}, @@ -2287,9 +2287,10 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = { {"BLAKE2SMAC", "blake2smac", NID_blake2smac}, {"SSHKDF", "sshkdf", NID_sshkdf}, {"SM2-SM3", "SM2-with-SM3", NID_SM2_with_SM3, 8, &so[7766]}, + {"SSKDF", "sskdf", NID_sskdf}, }; -#define NUM_SN 1196 +#define NUM_SN 1197 static const unsigned int sn_objs[NUM_SN] = { 364, /* "AD_DVCS" */ 419, /* "AES-128-CBC" */ @@ -2577,6 +2578,7 @@ static const unsigned int sn_objs[NUM_SN] = { 100, /* "SN" */ 1006, /* "SNILS" */ 1203, /* "SSHKDF" */ + 1205, /* "SSKDF" */ 16, /* "ST" */ 143, /* "SXNetID" */ 1062, /* "SipHash" */ @@ -3489,7 +3491,7 @@ static const unsigned int sn_objs[NUM_SN] = { 1093, /* "x509ExtAdmission" */ }; -#define NUM_LN 1196 +#define NUM_LN 1197 static const unsigned int ln_objs[NUM_LN] = { 363, /* "AD Time Stamping" */ 405, /* "ANSI X9.62" */ @@ -4641,6 +4643,7 @@ static const unsigned int ln_objs[NUM_LN] = { 1133, /* "sm4-ecb" */ 1135, /* "sm4-ofb" */ 1203, /* "sshkdf" */ + 1205, /* "sskdf" */ 16, /* "stateOrProvinceName" */ 660, /* "streetAddress" */ 498, /* "subtreeMaximumQuality" */ |