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

crypto/objects/objects.txt

+2 −0

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