diff options
| author | Dmitry Belyavskiy <beldmit@gmail.com> | 2020-05-08 14:17:11 +0300 |
|---|---|---|
| committer | Dmitry Belyavskiy <beldmit@gmail.com> | 2020-05-19 13:02:43 +0300 |
| commit | 0e139a02d59323e5d9c0ad87ea9c8c3914696b83 (patch) | |
| tree | 9e3b2a825ca71f7a6d61dbb1b3c22042cd757798 /crypto | |
| parent | 092a5c71f1cba1173f17c2cd4ff5607069b0d3bb (diff) | |
| download | openssl-0e139a02d59323e5d9c0ad87ea9c8c3914696b83.zip openssl-0e139a02d59323e5d9c0ad87ea9c8c3914696b83.tar.gz openssl-0e139a02d59323e5d9c0ad87ea9c8c3914696b83.tar.bz2 | |
GOST-related objects changes
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11442)
Diffstat (limited to 'crypto')
| -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 | 1 |
3 files changed, 8 insertions, 3 deletions
diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h index 6fa2217..decf33e 100644 --- a/crypto/objects/obj_dat.h +++ b/crypto/objects/obj_dat.h @@ -1088,7 +1088,7 @@ static const unsigned char so[7845] = { 0x2B,0x06,0x01,0x05,0x05,0x07,0x08,0x08, /* [ 7836] OBJ_NAIRealm */ }; -#define NUM_NID 1218 +#define NUM_NID 1219 static const ASN1_OBJECT nid_objs[NUM_NID] = { {"UNDEF", "undefined", NID_undef}, {"rsadsi", "RSA Data Security, Inc.", NID_rsadsi, 6, &so[0]}, @@ -2308,9 +2308,10 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = { {"modp_4096", "modp_4096", NID_modp_4096}, {"modp_6144", "modp_6144", NID_modp_6144}, {"modp_8192", "modp_8192", NID_modp_8192}, + {"KxGOST18", "kx-gost18", NID_kx_gost18}, }; -#define NUM_SN 1209 +#define NUM_SN 1210 static const unsigned int sn_objs[NUM_SN] = { 364, /* "AD_DVCS" */ 419, /* "AES-128-CBC" */ @@ -2489,6 +2490,7 @@ static const unsigned int sn_objs[NUM_SN] = { 1038, /* "KxECDHE" */ 1040, /* "KxECDHE-PSK" */ 1045, /* "KxGOST" */ + 1218, /* "KxGOST18" */ 1043, /* "KxPSK" */ 1037, /* "KxRSA" */ 1042, /* "KxRSA_PSK" */ @@ -3523,7 +3525,7 @@ static const unsigned int sn_objs[NUM_SN] = { 1093, /* "x509ExtAdmission" */ }; -#define NUM_LN 1209 +#define NUM_LN 1210 static const unsigned int ln_objs[NUM_LN] = { 363, /* "AD Time Stamping" */ 405, /* "ANSI X9.62" */ @@ -4334,6 +4336,7 @@ static const unsigned int ln_objs[NUM_LN] = { 1038, /* "kx-ecdhe" */ 1040, /* "kx-ecdhe-psk" */ 1045, /* "kx-gost" */ + 1218, /* "kx-gost18" */ 1043, /* "kx-psk" */ 1037, /* "kx-rsa" */ 1042, /* "kx-rsa-psk" */ diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num index aaf7709..6d2c0d7 100644 --- a/crypto/objects/obj_mac.num +++ b/crypto/objects/obj_mac.num @@ -1215,3 +1215,4 @@ modp_3072 1214 modp_4096 1215 modp_6144 1216 modp_8192 1217 +kx_gost18 1218 diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt index a9ccf7e..b194542 100644 --- a/crypto/objects/objects.txt +++ b/crypto/objects/objects.txt @@ -1648,6 +1648,7 @@ id-pkinit 5 : pkInitKDC : Signing KDC Response : KxPSK : kx-psk : KxSRP : kx-srp : KxGOST : kx-gost + : KxGOST18 : kx-gost18 : KxANY : kx-any # NIDs for cipher authentication |