Add OIDs for HMAC SHA512/224 and HMAC SHA512/256. (f52292be) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

crypto/evp/evp_pbe.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -73,6 +73,8 @@ static const EVP_PBE_CTL builtin_pbe[] = {
	NID_id_GostR3411_2012_256, 0},		NID_id_GostR3411_2012_256, 0},
	{EVP_PBE_TYPE_PRF, NID_id_tc26_hmac_gost_3411_2012_512, -1,		{EVP_PBE_TYPE_PRF, NID_id_tc26_hmac_gost_3411_2012_512, -1,
	NID_id_GostR3411_2012_512, 0},		NID_id_GostR3411_2012_512, 0},
			{EVP_PBE_TYPE_PRF, NID_hmacWithSHA512_224, -1, NID_sha512_224, 0},
			{EVP_PBE_TYPE_PRF, NID_hmacWithSHA512_256, -1, NID_sha512_256, 0},
	{EVP_PBE_TYPE_KDF, NID_id_pbkdf2, -1, -1, PKCS5_v2_PBKDF2_keyivgen},		{EVP_PBE_TYPE_KDF, NID_id_pbkdf2, -1, -1, PKCS5_v2_PBKDF2_keyivgen},
	#ifndef OPENSSL_NO_SCRYPT		#ifndef OPENSSL_NO_SCRYPT
	{EVP_PBE_TYPE_KDF, NID_id_scrypt, -1, -1, PKCS5_v2_scrypt_keyivgen}		{EVP_PBE_TYPE_KDF, NID_id_scrypt, -1, -1, PKCS5_v2_scrypt_keyivgen}

crypto/objects/obj_dat.h

+15 −5

Original line number	Original line	Diff line number	Diff line
	@@ -10,7 +10,7 @@
	*/		*/

	/* Serialized OID's */		/* Serialized OID's */
	static const unsigned char so[7746] = {		static const unsigned char so[7762] = {
	0x2A,0x86,0x48,0x86,0xF7,0x0D, /* [ 0] OBJ_rsadsi */		0x2A,0x86,0x48,0x86,0xF7,0x0D, /* [ 0] OBJ_rsadsi */
	0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01, /* [ 6] OBJ_pkcs */		0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01, /* [ 6] OBJ_pkcs */
	0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x02, /* [ 13] OBJ_md2 */		0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x02, /* [ 13] OBJ_md2 */
	@@ -1074,9 +1074,11 @@ static const unsigned char so[7746] = {
	0x2A,0x85,0x03,0x07,0x01,0x02,0x01,0x01,0x02, /* [ 7718] OBJ_id_tc26_gost_3410_2012_256_paramSetB */		0x2A,0x85,0x03,0x07,0x01,0x02,0x01,0x01,0x02, /* [ 7718] OBJ_id_tc26_gost_3410_2012_256_paramSetB */
	0x2A,0x85,0x03,0x07,0x01,0x02,0x01,0x01,0x03, /* [ 7727] OBJ_id_tc26_gost_3410_2012_256_paramSetC */		0x2A,0x85,0x03,0x07,0x01,0x02,0x01,0x01,0x03, /* [ 7727] OBJ_id_tc26_gost_3410_2012_256_paramSetC */
	0x2A,0x85,0x03,0x07,0x01,0x02,0x01,0x01,0x04, /* [ 7736] OBJ_id_tc26_gost_3410_2012_256_paramSetD */		0x2A,0x85,0x03,0x07,0x01,0x02,0x01,0x01,0x04, /* [ 7736] OBJ_id_tc26_gost_3410_2012_256_paramSetD */
			0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x0C, /* [ 7745] OBJ_hmacWithSHA512_224 */
			0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x0D, /* [ 7753] OBJ_hmacWithSHA512_256 */
	};		};

	#define NUM_NID 1193		#define NUM_NID 1195
	static const ASN1_OBJECT nid_objs[NUM_NID] = {		static const ASN1_OBJECT nid_objs[NUM_NID] = {
	{"UNDEF", "undefined", NID_undef},		{"UNDEF", "undefined", NID_undef},
	{"rsadsi", "RSA Data Security, Inc.", NID_rsadsi, 6, &so[0]},		{"rsadsi", "RSA Data Security, Inc.", NID_rsadsi, 6, &so[0]},
	@@ -2271,9 +2273,11 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = {
	{"magma-cbc", "magma-cbc", NID_magma_cbc},		{"magma-cbc", "magma-cbc", NID_magma_cbc},
	{"magma-cfb", "magma-cfb", NID_magma_cfb},		{"magma-cfb", "magma-cfb", NID_magma_cfb},
	{"magma-mac", "magma-mac", NID_magma_mac},		{"magma-mac", "magma-mac", NID_magma_mac},
			{"hmacWithSHA512-224", "hmacWithSHA512-224", NID_hmacWithSHA512_224, 8, &so[7745]},
			{"hmacWithSHA512-256", "hmacWithSHA512-256", NID_hmacWithSHA512_256, 8, &so[7753]},
	};		};

	#define NUM_SN 1184		#define NUM_SN 1186
	static const unsigned int sn_objs[NUM_SN] = {		static const unsigned int sn_objs[NUM_SN] = {
	364, /* "AD_DVCS" */		364, /* "AD_DVCS" */
	419, /* "AES-128-CBC" */		419, /* "AES-128-CBC" */
	@@ -2757,6 +2761,8 @@ static const unsigned int sn_objs[NUM_SN] = {
	799, /* "hmacWithSHA256" */		799, /* "hmacWithSHA256" */
	800, /* "hmacWithSHA384" */		800, /* "hmacWithSHA384" */
	801, /* "hmacWithSHA512" */		801, /* "hmacWithSHA512" */
			1193, /* "hmacWithSHA512-224" */
			1194, /* "hmacWithSHA512-256" */
	432, /* "holdInstructionCallIssuer" */		432, /* "holdInstructionCallIssuer" */
	430, /* "holdInstructionCode" */		430, /* "holdInstructionCode" */
	431, /* "holdInstructionNone" */		431, /* "holdInstructionNone" */
	@@ -3461,7 +3467,7 @@ static const unsigned int sn_objs[NUM_SN] = {
	1093, /* "x509ExtAdmission" */		1093, /* "x509ExtAdmission" */
	};		};

	#define NUM_LN 1184		#define NUM_LN 1186
	static const unsigned int ln_objs[NUM_LN] = {		static const unsigned int ln_objs[NUM_LN] = {
	363, /* "AD Time Stamping" */		363, /* "AD Time Stamping" */
	405, /* "ANSI X9.62" */		405, /* "ANSI X9.62" */
	@@ -3981,6 +3987,8 @@ static const unsigned int ln_objs[NUM_LN] = {
	799, /* "hmacWithSHA256" */		799, /* "hmacWithSHA256" */
	800, /* "hmacWithSHA384" */		800, /* "hmacWithSHA384" */
	801, /* "hmacWithSHA512" */		801, /* "hmacWithSHA512" */
			1193, /* "hmacWithSHA512-224" */
			1194, /* "hmacWithSHA512-256" */
	486, /* "homePostalAddress" */		486, /* "homePostalAddress" */
	473, /* "homeTelephoneNumber" */		473, /* "homeTelephoneNumber" */
	466, /* "host" */		466, /* "host" */
	@@ -4649,7 +4657,7 @@ static const unsigned int ln_objs[NUM_LN] = {
	125, /* "zlib compression" */		125, /* "zlib compression" */
	};		};

	#define NUM_OBJ 1069		#define NUM_OBJ 1071
	static const unsigned int obj_objs[NUM_OBJ] = {		static const unsigned int obj_objs[NUM_OBJ] = {
	0, /* OBJ_undef 0 */		0, /* OBJ_undef 0 */
	181, /* OBJ_iso 1 */		181, /* OBJ_iso 1 */
	@@ -5161,6 +5169,8 @@ static const unsigned int obj_objs[NUM_OBJ] = {
	799, /* OBJ_hmacWithSHA256 1 2 840 113549 2 9 */		799, /* OBJ_hmacWithSHA256 1 2 840 113549 2 9 */
	800, /* OBJ_hmacWithSHA384 1 2 840 113549 2 10 */		800, /* OBJ_hmacWithSHA384 1 2 840 113549 2 10 */
	801, /* OBJ_hmacWithSHA512 1 2 840 113549 2 11 */		801, /* OBJ_hmacWithSHA512 1 2 840 113549 2 11 */
			1193, /* OBJ_hmacWithSHA512_224 1 2 840 113549 2 12 */
			1194, /* OBJ_hmacWithSHA512_256 1 2 840 113549 2 13 */
	37, /* OBJ_rc2_cbc 1 2 840 113549 3 2 */		37, /* OBJ_rc2_cbc 1 2 840 113549 3 2 */
	5, /* OBJ_rc4 1 2 840 113549 3 4 */		5, /* OBJ_rc4 1 2 840 113549 3 4 */
	44, /* OBJ_des_ede3_cbc 1 2 840 113549 3 7 */		44, /* OBJ_des_ede3_cbc 1 2 840 113549 3 7 */

crypto/objects/obj_mac.num

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1190,3 +1190,5 @@ magma_ofb 1189
	magma_cbc 1190		magma_cbc 1190
	magma_cfb 1191		magma_cfb 1191
	magma_mac 1192		magma_mac 1192
			hmacWithSHA512_224 1193
			hmacWithSHA512_256 1194

crypto/objects/objects.txt

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -391,6 +391,10 @@ rsadsi 2 9 : : hmacWithSHA256
	rsadsi 2 10 : : hmacWithSHA384		rsadsi 2 10 : : hmacWithSHA384
	rsadsi 2 11 : : hmacWithSHA512		rsadsi 2 11 : : hmacWithSHA512

			# From RFC8018
			rsadsi 2 12 : : hmacWithSHA512-224
			rsadsi 2 13 : : hmacWithSHA512-256

	rsadsi 3 2 : RC2-CBC : rc2-cbc		rsadsi 3 2 : RC2-CBC : rc2-cbc
	: RC2-ECB : rc2-ecb		: RC2-ECB : rc2-ecb
	!Cname rc2-cfb64		!Cname rc2-cfb64

fuzz/oids.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1061,3 +1061,5 @@ OBJ_id_tc26_wrap_gostr3412_2015_kuznyechik_kexp15="\x2A\x85\x03\x07\x01\x01\x07\
	OBJ_id_tc26_gost_3410_2012_256_paramSetB="\x2A\x85\x03\x07\x01\x02\x01\x01\x02"		OBJ_id_tc26_gost_3410_2012_256_paramSetB="\x2A\x85\x03\x07\x01\x02\x01\x01\x02"
	OBJ_id_tc26_gost_3410_2012_256_paramSetC="\x2A\x85\x03\x07\x01\x02\x01\x01\x03"		OBJ_id_tc26_gost_3410_2012_256_paramSetC="\x2A\x85\x03\x07\x01\x02\x01\x01\x03"
	OBJ_id_tc26_gost_3410_2012_256_paramSetD="\x2A\x85\x03\x07\x01\x02\x01\x01\x04"		OBJ_id_tc26_gost_3410_2012_256_paramSetD="\x2A\x85\x03\x07\x01\x02\x01\x01\x04"
			OBJ_hmacWithSHA512_224="\x2A\x86\x48\x86\xF7\x0D\x02\x0C"
			OBJ_hmacWithSHA512_256="\x2A\x86\x48\x86\xF7\x0D\x02\x0D"