diff options
| -rw-r--r-- | crypto/objects/obj_dat.h | 12 | ||||
| -rw-r--r-- | crypto/objects/obj_mac.num | 2 | ||||
| -rw-r--r-- | crypto/objects/objects.txt | 2 | ||||
| -rw-r--r-- | include/openssl/obj_mac.h | 8 |
4 files changed, 21 insertions, 3 deletions
diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h index 9fd20596ce..d1382a2665 100644 --- a/crypto/objects/obj_dat.h +++ b/crypto/objects/obj_dat.h @@ -62,9 +62,9 @@ * [including the GNU Public Licence.] */ -#define NUM_NID 1018 -#define NUM_SN 1011 -#define NUM_LN 1011 +#define NUM_NID 1020 +#define NUM_SN 1013 +#define NUM_LN 1013 #define NUM_OBJ 936 static const unsigned char lvalues[6604]={ @@ -2667,6 +2667,8 @@ static const ASN1_OBJECT nid_objs[NUM_NID]={ {"grasshopper-cbc","grasshopper-cbc",NID_grasshopper_cbc,0,NULL,0}, {"grasshopper-cfb","grasshopper-cfb",NID_grasshopper_cfb,0,NULL,0}, {"grasshopper-mac","grasshopper-mac",NID_grasshopper_mac,0,NULL,0}, +{"ChaCha20-Poly1305","chacha20-poly1305",NID_chacha20_poly1305,0,NULL,0}, +{"ChaCha20","chacha20",NID_chacha20,0,NULL,0}, }; static const unsigned int sn_objs[NUM_SN]={ @@ -2746,6 +2748,8 @@ static const unsigned int sn_objs[NUM_SN]={ 13, /* "CN" */ 141, /* "CRLReason" */ 417, /* "CSPName" */ +1019, /* "ChaCha20" */ +1018, /* "ChaCha20-Poly1305" */ 367, /* "CrlID" */ 391, /* "DC" */ 31, /* "DES-CBC" */ @@ -3973,6 +3977,8 @@ static const unsigned int ln_objs[NUM_LN]={ 677, /* "certicom-arc" */ 517, /* "certificate extensions" */ 883, /* "certificateRevocationList" */ +1019, /* "chacha20" */ +1018, /* "chacha20-poly1305" */ 54, /* "challengePassword" */ 407, /* "characteristic-two-field" */ 395, /* "clearance" */ diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num index ac8a1a2a63..2993f5647e 100644 --- a/crypto/objects/obj_mac.num +++ b/crypto/objects/obj_mac.num @@ -1015,3 +1015,5 @@ grasshopper_ofb 1014 grasshopper_cbc 1015 grasshopper_cfb 1016 grasshopper_mac 1017 +chacha20_poly1305 1018 +chacha20 1019 diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt index 9f5f6c4e50..29517e3d7a 100644 --- a/crypto/objects/objects.txt +++ b/crypto/objects/objects.txt @@ -1368,6 +1368,8 @@ kisa 1 6 : SEED-OFB : seed-ofb : AES-128-CBC-HMAC-SHA256 : aes-128-cbc-hmac-sha256 : AES-192-CBC-HMAC-SHA256 : aes-192-cbc-hmac-sha256 : AES-256-CBC-HMAC-SHA256 : aes-256-cbc-hmac-sha256 + : ChaCha20-Poly1305 : chacha20-poly1305 + : ChaCha20 : chacha20 ISO-US 10046 2 1 : dhpublicnumber : X9.42 DH diff --git a/include/openssl/obj_mac.h b/include/openssl/obj_mac.h index 4388f70931..060126b56c 100644 --- a/include/openssl/obj_mac.h +++ b/include/openssl/obj_mac.h @@ -4301,6 +4301,14 @@ #define LN_aes_256_cbc_hmac_sha256 "aes-256-cbc-hmac-sha256" #define NID_aes_256_cbc_hmac_sha256 950 +#define SN_chacha20_poly1305 "ChaCha20-Poly1305" +#define LN_chacha20_poly1305 "chacha20-poly1305" +#define NID_chacha20_poly1305 1018 + +#define SN_chacha20 "ChaCha20" +#define LN_chacha20 "chacha20" +#define NID_chacha20 1019 + #define SN_dhpublicnumber "dhpublicnumber" #define LN_dhpublicnumber "X9.42 DH" #define NID_dhpublicnumber 920 |