Add XTS OIDs from HEAD. (0209e111) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

crypto/objects/obj_dat.h

+9 −3

Original line number	Diff line number	Diff line
		@@ -62,9 +62,9 @@
		* [including the GNU Public Licence.]
		*/

		#define NUM_NID 913
		#define NUM_SN 906
		#define NUM_LN 906
		#define NUM_NID 915
		#define NUM_SN 908
		#define NUM_LN 908
		#define NUM_OBJ 856

		static const unsigned char lvalues[5971]={
		@@ -2395,6 +2395,8 @@ static const ASN1_OBJECT nid_objs[NUM_NID]={
		NID_anyExtendedKeyUsage,4,&(lvalues[5948]),0},
		{"MGF1","mgf1",NID_mgf1,9,&(lvalues[5952]),0},
		{"RSASSA-PSS","rsassaPss",NID_rsassaPss,9,&(lvalues[5961]),0},
		{"AES-128-XTS","aes-128-xts",NID_aes_128_xts,0,NULL,0},
		{"AES-256-XTS","aes-256-xts",NID_aes_256_xts,0,NULL,0},
		};

		static const unsigned int sn_objs[NUM_SN]={
		@@ -2406,6 +2408,7 @@ static const unsigned int sn_objs[NUM_SN]={
		904, /* "AES-128-CTR" */
		418, /* "AES-128-ECB" */
		420, /* "AES-128-OFB" */
		913, /* "AES-128-XTS" */
		423, /* "AES-192-CBC" */
		425, /* "AES-192-CFB" */
		651, /* "AES-192-CFB1" */
		@@ -2420,6 +2423,7 @@ static const unsigned int sn_objs[NUM_SN]={
		906, /* "AES-256-CTR" */
		426, /* "AES-256-ECB" */
		428, /* "AES-256-OFB" */
		914, /* "AES-256-XTS" */
		91, /* "BF-CBC" */
		93, /* "BF-CFB" */
		92, /* "BF-ECB" */
		@@ -3459,6 +3463,7 @@ static const unsigned int ln_objs[NUM_LN]={
		418, /* "aes-128-ecb" */
		895, /* "aes-128-gcm" */
		420, /* "aes-128-ofb" */
		913, /* "aes-128-xts" */
		423, /* "aes-192-cbc" */
		899, /* "aes-192-ccm" */
		425, /* "aes-192-cfb" */
		@@ -3477,6 +3482,7 @@ static const unsigned int ln_objs[NUM_LN]={
		426, /* "aes-256-ecb" */
		901, /* "aes-256-gcm" */
		428, /* "aes-256-ofb" */
		914, /* "aes-256-xts" */
		376, /* "algorithm" */
		484, /* "associatedDomain" */
		485, /* "associatedName" */

crypto/objects/obj_mac.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -2735,6 +2735,14 @@
		#define LN_aes_256_ctr "aes-256-ctr"
		#define NID_aes_256_ctr 906

		#define SN_aes_128_xts "AES-128-XTS"
		#define LN_aes_128_xts "aes-128-xts"
		#define NID_aes_128_xts 913

		#define SN_aes_256_xts "AES-256-XTS"
		#define LN_aes_256_xts "aes-256-xts"
		#define NID_aes_256_xts 914

		#define SN_des_cfb1 "DES-CFB1"
		#define LN_des_cfb1 "des-cfb1"
		#define NID_des_cfb1 656

crypto/objects/obj_mac.num

+2 −0

Original line number	Diff line number	Diff line
		@@ -910,3 +910,5 @@ id_camellia256_wrap 909
		anyExtendedKeyUsage 910
		mgf1 911
		rsassaPss 912
		aes_128_xts 913
		aes_256_xts 914

crypto/objects/obj_xref.h

+1 −1

Original line number	Diff line number	Diff line
		/* AUTOGENERATED BY crypto/objects/objxref.pl, DO NOT EDIT */
		/* AUTOGENERATED BY objxref.pl, DO NOT EDIT */

		typedef struct
		{

crypto/objects/objects.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -892,6 +892,8 @@ aes 48 : id-aes256-wrap-pad
		: AES-128-CTR : aes-128-ctr
		: AES-192-CTR : aes-192-ctr
		: AES-256-CTR : aes-256-ctr
		: AES-128-XTS : aes-128-xts
		: AES-256-XTS : aes-256-xts
		: DES-CFB1 : des-cfb1
		: DES-CFB8 : des-cfb8
		: DES-EDE3-CFB1 : des-ede3-cfb1