diff options
| author | Todd Short <tshort@akamai.com> | 2021-08-09 16:56:37 -0400 |
|---|---|---|
| committer | Todd Short <todd.short@me.com> | 2022-10-18 09:30:21 -0400 |
| commit | caf9317d7d75213990014e07048384be15688889 (patch) | |
| tree | 50cf59d363c17f389d6c8dbc2372795e3e53658d /crypto/objects | |
| parent | 12e96a23604a7aa1cd8f83486b02f1bcab6d468f (diff) | |
| download | openssl-new-caf9317d7d75213990014e07048384be15688889.tar.gz | |
Add ZSTD compression support (RFC8478bis)
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18186)
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, 9 insertions, 4 deletions
diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h index 115c707cd1..ca710b7ffe 100644 --- a/crypto/objects/obj_dat.h +++ b/crypto/objects/obj_dat.h @@ -1154,7 +1154,7 @@ static const unsigned char so[8356] = { 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x32, /* [ 8344] OBJ_id_ct_signedTAL */ }; -#define NUM_NID 1289 +#define NUM_NID 1290 static const ASN1_OBJECT nid_objs[NUM_NID] = { {"UNDEF", "undefined", NID_undef}, {"rsadsi", "RSA Data Security, Inc.", NID_rsadsi, 6, &so[0]}, @@ -2445,9 +2445,10 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = { {"brainpoolP384r1tls13", "brainpoolP384r1tls13", NID_brainpoolP384r1tls13}, {"brainpoolP512r1tls13", "brainpoolP512r1tls13", NID_brainpoolP512r1tls13}, {"brotli", "Brotli compression", NID_brotli}, + {"zstd", "Zstandard compression", NID_zstd}, }; -#define NUM_SN 1280 +#define NUM_SN 1281 static const unsigned int sn_objs[NUM_SN] = { 364, /* "AD_DVCS" */ 419, /* "AES-128-CBC" */ @@ -3729,9 +3730,10 @@ static const unsigned int sn_objs[NUM_SN] = { 158, /* "x509Certificate" */ 160, /* "x509Crl" */ 1093, /* "x509ExtAdmission" */ + 1289, /* "zstd" */ }; -#define NUM_LN 1280 +#define NUM_LN 1281 static const unsigned int ln_objs[NUM_LN] = { 363, /* "AD Time Stamping" */ 405, /* "ANSI X9.62" */ @@ -3961,6 +3963,7 @@ static const unsigned int ln_objs[NUM_LN] = { 184, /* "X9.57" */ 185, /* "X9.57 CM ?" */ 1209, /* "XmppAddr" */ + 1289, /* "Zstandard compression" */ 478, /* "aRecord" */ 289, /* "aaControls" */ 287, /* "ac-auditEntity" */ diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num index 5940f6911b..6f9cea2b0e 100644 --- a/crypto/objects/obj_mac.num +++ b/crypto/objects/obj_mac.num @@ -1286,3 +1286,4 @@ brainpoolP256r1tls13 1285 brainpoolP384r1tls13 1286 brainpoolP512r1tls13 1287 brotli 1288 +zstd 1289 diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt index a0991529b9..d8aaac0570 100644 --- a/crypto/objects/objects.txt +++ b/crypto/objects/objects.txt @@ -1803,5 +1803,6 @@ joint-iso-itu-t 16 840 1 113894 : oracle-organization : Oracle organization # Jdk trustedKeyUsage attribute oracle 746875 1 1 : oracle-jdk-trustedkeyusage : Trusted key usage (Oracle) -# NID for brotli +# NID for compression : brotli : Brotli compression + : zstd : Zstandard compression |