Commit 5cd42251 authored by Pauli's avatar Pauli
Browse files

Missings OIDs for XTS added. 



Added two missing OIDs for AES-{128,256}-XTS.

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5622)
parent 35a164ea

crypto/objects/obj_dat.h

+409 −395

File changed.

Preview size limit exceeded, changes collapsed.

crypto/objects/obj_mac.num

+2 −0
Original line number Diff line number Diff line
@@ -1167,3 +1167,5 @@ uacurve6 1166 
uacurve7		1167

uacurve8		1168

uacurve9		1169

ieee		1170

ieee_siswg		1171

crypto/objects/objects.txt

+6 −2
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ identified-organization 36 8 3 3 : x509ExtAdmission : Professional Information o 


identified-organization 132	: certicom-arc



identified-organization 111     : ieee

ieee 2 1619                     : ieee-siswg    : IEEE Security in Storage Working Group



joint-iso-itu-t 23	: international-organizations	: International Organizations



international-organizations 43	: wap
@@ -916,6 +919,9 @@ aes 46 : id-aes256-GCM : aes-256-gcm 
aes 47			: id-aes256-CCM		: aes-256-ccm

aes 48			: id-aes256-wrap-pad



ieee-siswg 0 1 1        : AES-128-XTS		: aes-128-xts

ieee-siswg 0 1 2        : AES-256-XTS		: aes-256-xts



# There are no OIDs for these modes...



			: AES-128-CFB1		: aes-128-cfb1
@@ -930,8 +936,6 @@ aes 48 : id-aes256-wrap-pad 
			: AES-128-OCB		: aes-128-ocb

			: AES-192-OCB		: aes-192-ocb

			: AES-256-OCB		: aes-256-ocb

			: 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

fuzz/oids.txt

+4 −0
Original line number Diff line number Diff line
@@ -848,6 +848,8 @@ OBJ_id_camellia256_wrap="\x2A\x83\x08\x8C\x9A\x4B\x3D\x01\x01\x03\x04" 
OBJ_anyExtendedKeyUsage="\x55\x1D\x25\x00"

OBJ_mgf1="\x2A\x86\x48\x86\xF7\x0D\x01\x01\x08"

OBJ_rsassaPss="\x2A\x86\x48\x86\xF7\x0D\x01\x01\x0A"

OBJ_aes_128_xts="\x2B\x6F\x02\x8C\x53\x00\x01\x01"

OBJ_aes_256_xts="\x2B\x6F\x02\x8C\x53\x00\x01\x02"

OBJ_rsaesOaep="\x2A\x86\x48\x86\xF7\x0D\x01\x01\x07"

OBJ_dhpublicnumber="\x2A\x86\x48\xCE\x3E\x02\x01"

OBJ_brainpoolP160r1="\x2B\x24\x03\x03\x02\x08\x01\x01\x01"
@@ -1042,3 +1044,5 @@ OBJ_uacurve6="\x2A\x86\x24\x02\x01\x01\x01\x01\x03\x01\x01\x02\x06" 
OBJ_uacurve7="\x2A\x86\x24\x02\x01\x01\x01\x01\x03\x01\x01\x02\x07"

OBJ_uacurve8="\x2A\x86\x24\x02\x01\x01\x01\x01\x03\x01\x01\x02\x08"

OBJ_uacurve9="\x2A\x86\x24\x02\x01\x01\x01\x01\x03\x01\x01\x02\x09"

OBJ_ieee="\x2B\x6F"

OBJ_ieee_siswg="\x2B\x6F\x02\x8C\x53"

include/openssl/obj_mac.h

+19 −8
Original line number Diff line number Diff line
@@ -63,6 +63,15 @@ 
#define NID_certicom_arc                677

#define OBJ_certicom_arc                OBJ_identified_organization,132L



#define SN_ieee         "ieee"

#define NID_ieee                1170

#define OBJ_ieee                OBJ_identified_organization,111L



#define SN_ieee_siswg           "ieee-siswg"

#define LN_ieee_siswg           "IEEE Security in Storage Working Group"

#define NID_ieee_siswg          1171

#define OBJ_ieee_siswg          OBJ_ieee,2L,1619L



#define SN_international_organizations          "international-organizations"

#define LN_international_organizations          "International Organizations"

#define NID_international_organizations         647
@@ -2780,6 +2789,16 @@ 
#define NID_id_aes256_wrap_pad          903

#define OBJ_id_aes256_wrap_pad          OBJ_aes,48L



#define SN_aes_128_xts          "AES-128-XTS"

#define LN_aes_128_xts          "aes-128-xts"

#define NID_aes_128_xts         913

#define OBJ_aes_128_xts         OBJ_ieee_siswg,0L,1L,1L



#define SN_aes_256_xts          "AES-256-XTS"

#define LN_aes_256_xts          "aes-256-xts"

#define NID_aes_256_xts         914

#define OBJ_aes_256_xts         OBJ_ieee_siswg,0L,1L,2L



#define SN_aes_128_cfb1         "AES-128-CFB1"

#define LN_aes_128_cfb1         "aes-128-cfb1"

#define NID_aes_128_cfb1                650
@@ -2828,14 +2847,6 @@ 
#define LN_aes_256_ocb          "aes-256-ocb"

#define NID_aes_256_ocb         960



#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