Add couple of OIDs. Resync NIDs for consistency with 0.9.7. (8544a807) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

crypto/objects/obj_dat.h

+1200 −1191

File changed.

Preview size limit exceeded, changes collapsed.

crypto/objects/obj_mac.h

+248 −240

File changed.

Preview size limit exceeded, changes collapsed.

crypto/objects/obj_mac.num

+243 −242

Original line number	Original line	Diff line number	Diff line
	@@ -500,245 +500,246 @@ personalSignature 499
	dITRedirect 500		dITRedirect 500
	audio 501		audio 501
	documentPublisher 502		documentPublisher 502
	X9_62_id_characteristic_two_basis 503		x500UniqueIdentifier 503
	X9_62_onBasis 504		mime_mhs 504
	X9_62_tpBasis 505		mime_mhs_headings 505
	X9_62_ppBasis 506		mime_mhs_bodies 506
	X9_62_c2pnb163v1 507		id_hex_partial_message 507
	X9_62_c2pnb163v2 508		id_hex_multipart_message 508
	X9_62_c2pnb163v3 509		generationQualifier 509
	X9_62_c2pnb176v1 510		pseudonym 510
	X9_62_c2tnb191v1 511		InternationalRA 511
	X9_62_c2tnb191v2 512		id_set 512
	X9_62_c2tnb191v3 513		set_ctype 513
	X9_62_c2onb191v4 514		set_msgExt 514
	X9_62_c2onb191v5 515		set_attr 515
	X9_62_c2pnb208w1 516		set_policy 516
	X9_62_c2tnb239v1 517		set_certExt 517
	X9_62_c2tnb239v2 518		set_brand 518
	X9_62_c2tnb239v3 519		setct_PANData 519
	X9_62_c2onb239v4 520		setct_PANToken 520
	X9_62_c2onb239v5 521		setct_PANOnly 521
	X9_62_c2pnb272w1 522		setct_OIData 522
	X9_62_c2pnb304w1 523		setct_PI 523
	X9_62_c2tnb359v1 524		setct_PIData 524
	X9_62_c2pnb368w1 525		setct_PIDataUnsigned 525
	X9_62_c2tnb431r1 526		setct_HODInput 526
	identified_organization 527		setct_AuthResBaggage 527
	certicom_arc 528		setct_AuthRevReqBaggage 528
	secp112r1 529		setct_AuthRevResBaggage 529
	secp112r2 530		setct_CapTokenSeq 530
	secp128r1 531		setct_PInitResData 531
	secp128r2 532		setct_PI_TBS 532
	secp160k1 533		setct_PResData 533
	secp160r1 534		setct_AuthReqTBS 534
	secp160r2 535		setct_AuthResTBS 535
	secp192k1 536		setct_AuthResTBSX 536
	secp192r1 537		setct_AuthTokenTBS 537
	secp224k1 538		setct_CapTokenData 538
	secp224r1 539		setct_CapTokenTBS 539
	secp256k1 540		setct_AcqCardCodeMsg 540
	secp256r1 541		setct_AuthRevReqTBS 541
	secp384r1 542		setct_AuthRevResData 542
	secp521r1 543		setct_AuthRevResTBS 543
	sect113r1 544		setct_CapReqTBS 544
	sect113r2 545		setct_CapReqTBSX 545
	sect131r1 546		setct_CapResData 546
	sect131r2 547		setct_CapRevReqTBS 547
	sect163k1 548		setct_CapRevReqTBSX 548
	sect163r1 549		setct_CapRevResData 549
	sect163r2 550		setct_CredReqTBS 550
	sect193r1 551		setct_CredReqTBSX 551
	sect193r2 552		setct_CredResData 552
	sect233k1 553		setct_CredRevReqTBS 553
	sect233r1 554		setct_CredRevReqTBSX 554
	sect239k1 555		setct_CredRevResData 555
	sect283k1 556		setct_PCertReqData 556
	sect283r1 557		setct_PCertResTBS 557
	sect409k1 558		setct_BatchAdminReqData 558
	sect409r1 559		setct_BatchAdminResData 559
	sect571k1 560		setct_CardCInitResTBS 560
	sect571r1 561		setct_MeAqCInitResTBS 561
	wap 562		setct_RegFormResTBS 562
	wap_wsg 563		setct_CertReqData 563
	wap_wsg_idm_ecid_wtls1 564		setct_CertReqTBS 564
	wap_wsg_idm_ecid_wtls6 565		setct_CertResData 565
	wap_wsg_idm_ecid_wtls8 566		setct_CertInqReqTBS 566
	wap_wsg_idm_ecid_wtls9 567		setct_ErrorTBS 567
	x500UniqueIdentifier 568		setct_PIDualSignedTBE 568
	mime_mhs 569		setct_PIUnsignedTBE 569
	mime_mhs_headings 570		setct_AuthReqTBE 570
	mime_mhs_bodies 571		setct_AuthResTBE 571
	id_hex_partial_message 572		setct_AuthResTBEX 572
	id_hex_multipart_message 573		setct_AuthTokenTBE 573
	generationQualifier 574		setct_CapTokenTBE 574
	pseudonym 575		setct_CapTokenTBEX 575
	id_set 576		setct_AcqCardCodeMsgTBE 576
	set_ctype 577		setct_AuthRevReqTBE 577
	set_msgExt 578		setct_AuthRevResTBE 578
	set_attr 579		setct_AuthRevResTBEB 579
	set_policy 580		setct_CapReqTBE 580
	set_certExt 581		setct_CapReqTBEX 581
	set_brand 582		setct_CapResTBE 582
	setct_PANData 583		setct_CapRevReqTBE 583
	setct_PANToken 584		setct_CapRevReqTBEX 584
	setct_PANOnly 585		setct_CapRevResTBE 585
	setct_OIData 586		setct_CredReqTBE 586
	setct_PI 587		setct_CredReqTBEX 587
	setct_PIData 588		setct_CredResTBE 588
	setct_PIDataUnsigned 589		setct_CredRevReqTBE 589
	setct_HODInput 590		setct_CredRevReqTBEX 590
	setct_AuthResBaggage 591		setct_CredRevResTBE 591
	setct_AuthRevReqBaggage 592		setct_BatchAdminReqTBE 592
	setct_AuthRevResBaggage 593		setct_BatchAdminResTBE 593
	setct_CapTokenSeq 594		setct_RegFormReqTBE 594
	setct_PInitResData 595		setct_CertReqTBE 595
	setct_PI_TBS 596		setct_CertReqTBEX 596
	setct_PResData 597		setct_CertResTBE 597
	setct_AuthReqTBS 598		setct_CRLNotificationTBS 598
	setct_AuthResTBS 599		setct_CRLNotificationResTBS 599
	setct_AuthResTBSX 600		setct_BCIDistributionTBS 600
	setct_AuthTokenTBS 601		setext_genCrypt 601
	setct_CapTokenData 602		setext_miAuth 602
	setct_CapTokenTBS 603		setext_pinSecure 603
	setct_AcqCardCodeMsg 604		setext_pinAny 604
	setct_AuthRevReqTBS 605		setext_track2 605
	setct_AuthRevResData 606		setext_cv 606
	setct_AuthRevResTBS 607		set_policy_root 607
	setct_CapReqTBS 608		setCext_hashedRoot 608
	setct_CapReqTBSX 609		setCext_certType 609
	setct_CapResData 610		setCext_merchData 610
	setct_CapRevReqTBS 611		setCext_cCertRequired 611
	setct_CapRevReqTBSX 612		setCext_tunneling 612
	setct_CapRevResData 613		setCext_setExt 613
	setct_CredReqTBS 614		setCext_setQualf 614
	setct_CredReqTBSX 615		setCext_PGWYcapabilities 615
	setct_CredResData 616		setCext_TokenIdentifier 616
	setct_CredRevReqTBS 617		setCext_Track2Data 617
	setct_CredRevReqTBSX 618		setCext_TokenType 618
	setct_CredRevResData 619		setCext_IssuerCapabilities 619
	setct_PCertReqData 620		setAttr_Cert 620
	setct_PCertResTBS 621		setAttr_PGWYcap 621
	setct_BatchAdminReqData 622		setAttr_TokenType 622
	setct_BatchAdminResData 623		setAttr_IssCap 623
	setct_CardCInitResTBS 624		set_rootKeyThumb 624
	setct_MeAqCInitResTBS 625		set_addPolicy 625
	setct_RegFormResTBS 626		setAttr_Token_EMV 626
	setct_CertReqData 627		setAttr_Token_B0Prime 627
	setct_CertReqTBS 628		setAttr_IssCap_CVM 628
	setct_CertResData 629		setAttr_IssCap_T2 629
	setct_CertInqReqTBS 630		setAttr_IssCap_Sig 630
	setct_ErrorTBS 631		setAttr_GenCryptgrm 631
	setct_PIDualSignedTBE 632		setAttr_T2Enc 632
	setct_PIUnsignedTBE 633		setAttr_T2cleartxt 633
	setct_AuthReqTBE 634		setAttr_TokICCsig 634
	setct_AuthResTBE 635		setAttr_SecDevSig 635
	setct_AuthResTBEX 636		set_brand_IATA_ATA 636
	setct_AuthTokenTBE 637		set_brand_Diners 637
	setct_CapTokenTBE 638		set_brand_AmericanExpress 638
	setct_CapTokenTBEX 639		set_brand_JCB 639
	setct_AcqCardCodeMsgTBE 640		set_brand_Visa 640
	setct_AuthRevReqTBE 641		set_brand_MasterCard 641
	setct_AuthRevResTBE 642		set_brand_Novus 642
	setct_AuthRevResTBEB 643		des_cdmf 643
	setct_CapReqTBE 644		rsaOAEPEncryptionSET 644
	setct_CapReqTBEX 645		itu_t 645
	setct_CapResTBE 646		joint_iso_itu_t 646
	setct_CapRevReqTBE 647		international_organizations 647
	setct_CapRevReqTBEX 648		ms_smartcard_login 648
	setct_CapRevResTBE 649		ms_upn 649
	setct_CredReqTBE 650		aes_128_cfb1 650
	setct_CredReqTBEX 651		aes_192_cfb1 651
	setct_CredResTBE 652		aes_256_cfb1 652
	setct_CredRevReqTBE 653		aes_128_cfb8 653
	setct_CredRevReqTBEX 654		aes_192_cfb8 654
	setct_CredRevResTBE 655		aes_256_cfb8 655
	setct_BatchAdminReqTBE 656		des_cfb1 656
	setct_BatchAdminResTBE 657		des_cfb8 657
	setct_RegFormReqTBE 658		des_ede3_cfb1 658
	setct_CertReqTBE 659		des_ede3_cfb8 659
	setct_CertReqTBEX 660		streetAddress 660
	setct_CertResTBE 661		postalCode 661
	setct_CRLNotificationTBS 662		identified_organization 662
	setct_CRLNotificationResTBS 663		certicom_arc 663
	setct_BCIDistributionTBS 664		wap 664
	setext_genCrypt 665		wap_wsg 665
	setext_miAuth 666		X9_62_id_characteristic_two_basis 666
	setext_pinSecure 667		X9_62_onBasis 667
	setext_pinAny 668		X9_62_tpBasis 668
	setext_track2 669		X9_62_ppBasis 669
	setext_cv 670		X9_62_c2pnb163v1 670
	set_policy_root 671		X9_62_c2pnb163v2 671
	setCext_hashedRoot 672		X9_62_c2pnb163v3 672
	setCext_certType 673		X9_62_c2pnb176v1 673
	setCext_merchData 674		X9_62_c2tnb191v1 674
	setCext_cCertRequired 675		X9_62_c2tnb191v2 675
	setCext_tunneling 676		X9_62_c2tnb191v3 676
	setCext_setExt 677		X9_62_c2onb191v4 677
	setCext_setQualf 678		X9_62_c2onb191v5 678
	setCext_PGWYcapabilities 679		X9_62_c2pnb208w1 679
	setCext_TokenIdentifier 680		X9_62_c2tnb239v1 680
	setCext_Track2Data 681		X9_62_c2tnb239v2 681
	setCext_TokenType 682		X9_62_c2tnb239v3 682
	setCext_IssuerCapabilities 683		X9_62_c2onb239v4 683
	setAttr_Cert 684		X9_62_c2onb239v5 684
	setAttr_PGWYcap 685		X9_62_c2pnb272w1 685
	setAttr_TokenType 686		X9_62_c2pnb304w1 686
	setAttr_IssCap 687		X9_62_c2tnb359v1 687
	set_rootKeyThumb 688		X9_62_c2pnb368w1 688
	set_addPolicy 689		X9_62_c2tnb431r1 689
	setAttr_Token_EMV 690		secp112r1 690
	setAttr_Token_B0Prime 691		secp112r2 691
	setAttr_IssCap_CVM 692		secp128r1 692
	setAttr_IssCap_T2 693		secp128r2 693
	setAttr_IssCap_Sig 694		secp160k1 694
	setAttr_GenCryptgrm 695		secp160r1 695
	setAttr_T2Enc 696		secp160r2 696
	setAttr_T2cleartxt 697		secp192k1 697
	setAttr_TokICCsig 698		secp224k1 698
	setAttr_SecDevSig 699		secp224r1 699
	set_brand_IATA_ATA 700		secp256k1 700
	set_brand_Diners 701		secp384r1 701
	set_brand_AmericanExpress 702		secp521r1 702
	set_brand_JCB 703		sect113r1 703
	set_brand_Visa 704		sect113r2 704
	set_brand_MasterCard 705		sect131r1 705
	set_brand_Novus 706		sect131r2 706
	des_cdmf 707		sect163k1 707
	rsaOAEPEncryptionSET 708		sect163r1 708
	wap_wsg_idm_ecid_wtls3 709		sect163r2 709
	wap_wsg_idm_ecid_wtls4 710		sect193r1 710
	wap_wsg_idm_ecid_wtls5 711		sect193r2 711
	wap_wsg_idm_ecid_wtls7 712		sect233k1 712
	wap_wsg_idm_ecid_wtls10 713		sect233r1 713
	wap_wsg_idm_ecid_wtls11 714		sect239k1 714
	wap_wsg_idm_ecid_wtls12 715		sect283k1 715
	ms_smartcard_login 716		sect283r1 716
	ms_upn 717		sect409k1 717
	any_policy 718		sect409r1 718
	policy_mappings 719		sect571k1 719
	name_constraints 720		sect571r1 720
	itu_t 721		wap_wsg_idm_ecid_wtls1 721
	joint_iso_itu_t 722		wap_wsg_idm_ecid_wtls3 722
	international_organizations 723		wap_wsg_idm_ecid_wtls4 723
	ipsec3 724		wap_wsg_idm_ecid_wtls5 724
	ipsec4 725		wap_wsg_idm_ecid_wtls6 725
	aes_128_cfb1 726		wap_wsg_idm_ecid_wtls7 726
	aes_192_cfb1 727		wap_wsg_idm_ecid_wtls8 727
	aes_256_cfb1 728		wap_wsg_idm_ecid_wtls9 728
	aes_128_cfb8 729		wap_wsg_idm_ecid_wtls10 729
	aes_192_cfb8 730		wap_wsg_idm_ecid_wtls11 730
	aes_256_cfb8 731		wap_wsg_idm_ecid_wtls12 731
	des_cfb1 732		sha256WithRSAEncryption 732
	des_cfb8 733		sha384WithRSAEncryption 733
	des_ede3_cfb1 734		sha512WithRSAEncryption 734
	des_ede3_cfb8 735		sha224WithRSAEncryption 735
	inhibit_any_policy 736		name_constraints 736
	sha256WithRSAEncryption 737		any_policy 737
	sha384WithRSAEncryption 738		policy_mappings 738
	sha512WithRSAEncryption 739		inhibit_any_policy 739
	sha224WithRSAEncryption 740		sha256 740
	sha256 741		sha384 741
	sha384 742		sha512 742
	sha512 743		sha224 743
	sha224 744		ipsec3 744
			ipsec4 745

crypto/objects/objects.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -629,10 +629,12 @@ X509 5 : : serialNumber
	X509 6 : C : countryName		X509 6 : C : countryName
	X509 7 : L : localityName		X509 7 : L : localityName
	X509 8 : ST : stateOrProvinceName		X509 8 : ST : stateOrProvinceName
			X509 9 : : streetAddress
	X509 10 : O : organizationName		X509 10 : O : organizationName
	X509 11 : OU : organizationalUnitName		X509 11 : OU : organizationalUnitName
	X509 12 : : title		X509 12 : : title
	X509 13 : : description		X509 13 : : description
			X509 17 : : postalCode
	X509 41 : name : name		X509 41 : name : name
	X509 42 : GN : givenName		X509 42 : GN : givenName
	X509 43 : : initials		X509 43 : : initials