diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2020-01-31 08:18:46 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2020-01-31 08:18:46 +1000 |
| commit | ca2bf555cd64bc9624af1259ce3cd27f95a5763e (patch) | |
| tree | e02beb157e56973ada62c679cb7b3b8756e86dfe /crypto/objects | |
| parent | cd624ccd41ac3ac779c1c7a7a1e63427ce9588dd (diff) | |
Add support for DH 'modp' group parameters (RFC 3526)
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10897)
Diffstat (limited to 'crypto/objects')
| -rw-r--r-- | crypto/objects/obj_dat.h | 24 | ||||
| -rw-r--r-- | crypto/objects/obj_mac.num | 6 | ||||
| -rw-r--r-- | crypto/objects/objects.txt | 7 |
3 files changed, 34 insertions, 3 deletions
diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h index 80426896ba..77b4418cd4 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 1212 +#define NUM_NID 1218 static const ASN1_OBJECT nid_objs[NUM_NID] = { {"UNDEF", "undefined", NID_undef}, {"rsadsi", "RSA Data Security, Inc.", NID_rsadsi, 6, &so[0]}, @@ -2302,9 +2302,15 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = { {"id-on-xmppAddr", "XmppAddr", NID_XmppAddr, 8, &so[7820]}, {"id-on-dnsSRV", "SRVName", NID_SRVName, 8, &so[7828]}, {"id-on-NAIRealm", "NAIRealm", NID_NAIRealm, 8, &so[7836]}, + {"modp_1536", "modp_1536", NID_modp_1536}, + {"modp_2048", "modp_2048", NID_modp_2048}, + {"modp_3072", "modp_3072", NID_modp_3072}, + {"modp_4096", "modp_4096", NID_modp_4096}, + {"modp_6144", "modp_6144", NID_modp_6144}, + {"modp_8192", "modp_8192", NID_modp_8192}, }; -#define NUM_SN 1203 +#define NUM_SN 1209 static const unsigned int sn_objs[NUM_SN] = { 364, /* "AD_DVCS" */ 419, /* "AES-128-CBC" */ @@ -3163,6 +3169,12 @@ static const unsigned int sn_objs[NUM_SN] = { 506, /* "mime-mhs-bodies" */ 505, /* "mime-mhs-headings" */ 488, /* "mobileTelephoneNumber" */ + 1212, /* "modp_1536" */ + 1213, /* "modp_2048" */ + 1214, /* "modp_3072" */ + 1215, /* "modp_4096" */ + 1216, /* "modp_6144" */ + 1217, /* "modp_8192" */ 136, /* "msCTLSign" */ 135, /* "msCodeCom" */ 134, /* "msCodeInd" */ @@ -3511,7 +3523,7 @@ static const unsigned int sn_objs[NUM_SN] = { 1093, /* "x509ExtAdmission" */ }; -#define NUM_LN 1203 +#define NUM_LN 1209 static const unsigned int ln_objs[NUM_LN] = { 363, /* "AD Time Stamping" */ 405, /* "ANSI X9.62" */ @@ -4360,6 +4372,12 @@ static const unsigned int ln_objs[NUM_LN] = { 506, /* "mime-mhs-bodies" */ 505, /* "mime-mhs-headings" */ 488, /* "mobileTelephoneNumber" */ + 1212, /* "modp_1536" */ + 1213, /* "modp_2048" */ + 1214, /* "modp_3072" */ + 1215, /* "modp_4096" */ + 1216, /* "modp_6144" */ + 1217, /* "modp_8192" */ 481, /* "nSRecord" */ 173, /* "name" */ 681, /* "onBasis" */ diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num index 541bb4eb3f..15aa1e9772 100644 --- a/crypto/objects/obj_mac.num +++ b/crypto/objects/obj_mac.num @@ -1209,3 +1209,9 @@ id_on_SmtpUTF8Mailbox 1208 XmppAddr 1209 SRVName 1210 NAIRealm 1211 +modp_1536 1212 +modp_2048 1213 +modp_3072 1214 +modp_4096 1215 +modp_6144 1216 +modp_8192 1217 diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt index 693852aa3c..9819c539b7 100644 --- a/crypto/objects/objects.txt +++ b/crypto/objects/objects.txt @@ -1670,6 +1670,13 @@ id-pkinit 5 : pkInitKDC : Signing KDC Response : ffdhe4096 : ffdhe6144 : ffdhe8192 +# NIDs for RFC3526 DH parameters + : modp_1536 + : modp_2048 + : modp_3072 + : modp_4096 + : modp_6144 + : modp_8192 # OIDs for DSTU-4145/DSTU-7564 (http://zakon2.rada.gov.ua/laws/show/z0423-17) |