Fix: 2.5.29 is "id-ce", not "ld-ce" (sort of a typo in objects.h).

Fix (?): Delete 'ip-pda 6' (id-pda-pseudonym) because it does not exist
in RFC 3039.

Also change Perl scripts to put auto-generation warning in the
first lines of the file.

crypto/objects/obj_dat.pl

@@ -164,7 +164,13 @@ foreach (sort obj_cmp @a)
 	}
 
 print OUT <<'EOF';
-/* lib/obj/obj_dat.h */
+/* crypto/objects/obj_dat.h */
+
+/* THIS FILE IS GENERATED FROM objects.h by obj_dat.pl via the
+ * following command:
+ * perl obj_dat.pl obj_mac.h obj_dat.h
+ */
+
 /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -222,11 +228,6 @@ print OUT <<'EOF';
  * [including the GNU Public Licence.]
  */
 
-/* THIS FILE IS GENERATED FROM Objects.h by obj_dat.pl via the
- * following command:
- * perl obj_dat.pl obj_mac.h obj_dat.h
- */
-
 EOF
 
 printf OUT "#define NUM_NID %d\n",$n;

crypto/objects/obj_mac.num

@@ -390,114 +390,113 @@ Enterprises		389
 dcObject		390
 domainComponent		391
 Domain		392
-ld_ce		393
-aes_128_ecb		394
-aes_128_cbc		395
-aes_128_ofb		396
-aes_128_cfb		397
-aes_192_ecb		398
-aes_192_cbc		399
-aes_192_ofb		400
-aes_192_cfb		401
-aes_256_ecb		402
-aes_256_cbc		403
-aes_256_ofb		404
-aes_256_cfb		405
-hold_instruction_code		406
-hold_instruction_none		407
-hold_instruction_call_issuer		408
-hold_instruction_reject		409
-ccitt		410
-data		411
-pss		412
-ucl		413
-pilot		414
-pilotAttributeType		415
-pilotAttributeSyntax		416
-pilotObjectClass		417
-pilotGroups		418
-iA5StringSyntax		419
-caseIgnoreIA5StringSyntax		420
-pilotObject		421
-pilotPerson		422
-account		423
-document		424
-room		425
-documentSeries		426
-rFC822localPart		427
-dNSDomain		428
-domainRelatedObject		429
-friendlyCountry		430
-simpleSecurityObject		431
-pilotOrganization		432
-pilotDSA		433
-qualityLabelledData		434
-userid		435
-textEncodedORAddress		436
-rfc822Mailbox		437
-info		438
-favouriteDrink		439
-roomNumber		440
-photo		441
-userClass		442
-host		443
-manager		444
-documentIdentifier		445
-documentTitle		446
-documentVersion		447
-documentAuthor		448
-documentLocation		449
-homeTelephoneNumber		450
-secretary		451
-otherMailbox		452
-lastModifiedTime		453
-lastModifiedBy		454
-aRecord		455
-pilotAttributeType27		456
-mXRecord		457
-nSRecord		458
-sOARecord		459
-cNAMERecord		460
-associatedDomain		461
-associatedName		462
-homePostalAddress		463
-personalTitle		464
-mobileTelephoneNumber		465
-pagerTelephoneNumber		466
-friendlyCountryName		467
-organizationalStatus		468
-janetMailbox		469
-mailPreferenceOption		470
-buildingName		471
-dSAQuality		472
-singleLevelQuality		473
-subtreeMinimumQuality		474
-subtreeMaximumQuality		475
-personalSignature		476
-dITRedirect		477
-audio		478
-documentPublisher		479
-ansi_X9_62		480
-X9_62_prime_field		481
-X9_62_characteristic_two_field		482
-X9_62_id_ecPublicKey		483
-X9_62_prime192v1		484
-X9_62_prime192v2		485
-X9_62_prime192v3		486
-X9_62_prime239v1		487
-X9_62_prime239v2		488
-X9_62_prime239v3		489
-X9_62_prime256v1		490
-ecdsa_with_SHA1		491
-ms_csp_name		492
-joint_iso_ccitt		493
-selected_attribute_types		494
-clearance		495
-ac_proxying		496
-sinfo_access		497
-id_aca_encAttrs		498
-role		499
-policy_constraints		500
-target_information		501
-no_rev_avail		502
-md4WithRSAEncryption		503
+joint_iso_ccitt		393
+selected_attribute_types		394
+clearance		395
+md4WithRSAEncryption		396
+ac_proxying		397
+sinfo_access		398
+id_aca_encAttrs		399
+role		400
+policy_constraints		401
+target_information		402
+no_rev_avail		403
+ccitt		404
+ansi_X9_62		405
+X9_62_prime_field		406
+X9_62_characteristic_two_field		407
+X9_62_id_ecPublicKey		408
+X9_62_prime192v1		409
+X9_62_prime192v2		410
+X9_62_prime192v3		411
+X9_62_prime239v1		412
+X9_62_prime239v2		413
+X9_62_prime239v3		414
+X9_62_prime256v1		415
+ecdsa_with_SHA1		416
+ms_csp_name		417
+aes_128_ecb		418
+aes_128_cbc		419
+aes_128_ofb		420
+aes_128_cfb		421
+aes_192_ecb		422
+aes_192_cbc		423
+aes_192_ofb		424
+aes_192_cfb		425
+aes_256_ecb		426
+aes_256_cbc		427
+aes_256_ofb		428
+aes_256_cfb		429
+hold_instruction_code		430
+hold_instruction_none		431
+hold_instruction_call_issuer		432
+hold_instruction_reject		433
+data		434
+pss		435
+ucl		436
+pilot		437
+pilotAttributeType		438
+pilotAttributeSyntax		439
+pilotObjectClass		440
+pilotGroups		441
+iA5StringSyntax		442
+caseIgnoreIA5StringSyntax		443
+pilotObject		444
+pilotPerson		445
+account		446
+document		447
+room		448
+documentSeries		449
+rFC822localPart		450
+dNSDomain		451
+domainRelatedObject		452
+friendlyCountry		453
+simpleSecurityObject		454
+pilotOrganization		455
+pilotDSA		456
+qualityLabelledData		457
+userid		458
+textEncodedORAddress		459
+rfc822Mailbox		460
+info		461
+favouriteDrink		462
+roomNumber		463
+photo		464
+userClass		465
+host		466
+manager		467
+documentIdentifier		468
+documentTitle		469
+documentVersion		470
+documentAuthor		471
+documentLocation		472
+homeTelephoneNumber		473
+secretary		474
+otherMailbox		475
+lastModifiedTime		476
+lastModifiedBy		477
+aRecord		478
+pilotAttributeType27		479
+mXRecord		480
+nSRecord		481
+sOARecord		482
+cNAMERecord		483
+associatedDomain		484
+associatedName		485
+homePostalAddress		486
+personalTitle		487
+mobileTelephoneNumber		488
+pagerTelephoneNumber		489
+friendlyCountryName		490
+organizationalStatus		491
+janetMailbox		492
+mailPreferenceOption		493
+buildingName		494
+dSAQuality		495
+singleLevelQuality		496
+subtreeMinimumQuality		497
+subtreeMaximumQuality		498
+personalSignature		499
+dITRedirect		500
+audio		501
+documentPublisher		502

crypto/objects/objects.h

@@ -452,54 +452,54 @@
 #define LN_desx_cbc			"desx-cbc"
 #define NID_desx_cbc			80
 
-#define SN_ld_ce			"ld-ce"
-#define NID_ld_ce			81
-#define OBJ_ld_ce			2L,5L,29L
+#define SN_id_ce			"id-ce"
+#define NID_id_ce			81
+#define OBJ_id_ce			2L,5L,29L
 
 #define SN_subject_key_identifier	"subjectKeyIdentifier"
 #define LN_subject_key_identifier	"X509v3 Subject Key Identifier"
 #define NID_subject_key_identifier	82
-#define OBJ_subject_key_identifier	OBJ_ld_ce,14L
+#define OBJ_subject_key_identifier	OBJ_id_ce,14L
 
 #define SN_key_usage			"keyUsage"
 #define LN_key_usage			"X509v3 Key Usage"
 #define NID_key_usage			83
-#define OBJ_key_usage			OBJ_ld_ce,15L
+#define OBJ_key_usage			OBJ_id_ce,15L
 
 #define SN_private_key_usage_period	"privateKeyUsagePeriod"
 #define LN_private_key_usage_period	"X509v3 Private Key Usage Period"
 #define NID_private_key_usage_period	84
-#define OBJ_private_key_usage_period	OBJ_ld_ce,16L
+#define OBJ_private_key_usage_period	OBJ_id_ce,16L
 
 #define SN_subject_alt_name		"subjectAltName"
 #define LN_subject_alt_name		"X509v3 Subject Alternative Name"
 #define NID_subject_alt_name		85
-#define OBJ_subject_alt_name		OBJ_ld_ce,17L
+#define OBJ_subject_alt_name		OBJ_id_ce,17L
 
 #define SN_issuer_alt_name		"issuerAltName"
 #define LN_issuer_alt_name		"X509v3 Issuer Alternative Name"
 #define NID_issuer_alt_name		86
-#define OBJ_issuer_alt_name		OBJ_ld_ce,18L
+#define OBJ_issuer_alt_name		OBJ_id_ce,18L
 
 #define SN_basic_constraints		"basicConstraints"
 #define LN_basic_constraints		"X509v3 Basic Constraints"
 #define NID_basic_constraints		87
-#define OBJ_basic_constraints		OBJ_ld_ce,19L
+#define OBJ_basic_constraints		OBJ_id_ce,19L
 
 #define SN_crl_number			"crlNumber"
 #define LN_crl_number			"X509v3 CRL Number"
 #define NID_crl_number			88
-#define OBJ_crl_number			OBJ_ld_ce,20L
+#define OBJ_crl_number			OBJ_id_ce,20L
 
 #define SN_certificate_policies		"certificatePolicies"
 #define LN_certificate_policies		"X509v3 Certificate Policies"
 #define NID_certificate_policies	89
-#define OBJ_certificate_policies	OBJ_ld_ce,32L
+#define OBJ_certificate_policies	OBJ_id_ce,32L
 
 #define SN_authority_key_identifier	"authorityKeyIdentifier"
 #define LN_authority_key_identifier	"X509v3 Authority Key Identifier"
 #define NID_authority_key_identifier	90
-#define OBJ_authority_key_identifier	OBJ_ld_ce,35L
+#define OBJ_authority_key_identifier	OBJ_id_ce,35L
 
 #define SN_bf_cbc			"BF-CBC"
 #define LN_bf_cbc			"bf-cbc"
@@ -560,7 +560,7 @@
 #define SN_crl_distribution_points	"crlDistributionPoints"
 #define LN_crl_distribution_points	"X509v3 CRL Distribution Points"
 #define NID_crl_distribution_points	103
-#define OBJ_crl_distribution_points	OBJ_ld_ce,31L
+#define OBJ_crl_distribution_points	OBJ_id_ce,31L
 
 #define SN_md5WithRSA			"RSA-NP-MD5"
 #define LN_md5WithRSA			"md5WithRSA"
@@ -677,7 +677,7 @@
 #define SN_ext_key_usage		"extendedKeyUsage"
 #define LN_ext_key_usage		"X509v3 Extended Key Usage"
 #define NID_ext_key_usage		126
-#define OBJ_ext_key_usage		OBJ_ld_ce,37
+#define OBJ_ext_key_usage		OBJ_id_ce,37
 
 #define SN_id_pkix			"PKIX"
 #define NID_id_pkix			127
@@ -751,17 +751,17 @@
 #define SN_delta_crl			"deltaCRL"
 #define LN_delta_crl			"X509v3 Delta CRL Indicator"
 #define NID_delta_crl			140
-#define OBJ_delta_crl			OBJ_ld_ce,27L
+#define OBJ_delta_crl			OBJ_id_ce,27L
 
 #define SN_crl_reason			"CRLReason"
 #define LN_crl_reason			"CRL Reason Code"
 #define NID_crl_reason			141
-#define OBJ_crl_reason			OBJ_ld_ce,21L
+#define OBJ_crl_reason			OBJ_id_ce,21L
 
 #define SN_invalidity_date		"invalidityDate"
 #define LN_invalidity_date		"Invalidity Date"
 #define NID_invalidity_date		142
-#define OBJ_invalidity_date		OBJ_ld_ce,24L
+#define OBJ_invalidity_date		OBJ_id_ce,24L
 
 #define SN_sxnet			"SXNetID"
 #define LN_sxnet			"Strong Extranet ID"

crypto/objects/objects.pl

@@ -116,7 +116,13 @@ close NUMOUT;
 
 open (OUT,">$ARGV[2]") || die "Can't open output file $ARGV[2]";
 print OUT <<'EOF';
-/* lib/obj/obj_mac.h */
+/* crypto/objects/obj_mac.h */
+
+/* THIS FILE IS GENERATED FROM objects.txt by objects.pl via the
+ * following command:
+ * perl objects.pl objects.txt obj_mac.num obj_mac.h
+ */
+
 /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -174,11 +180,6 @@ print OUT <<'EOF';
  * [including the GNU Public Licence.]
  */
 
-/* THIS FILE IS GENERATED FROM objects.txt by objects.pl via the
- * following command:
- * perl objects.pl objects.txt obj_mac.num obj_mac.h
- */
-
 #define SN_undef			"UNDEF"
 #define LN_undef			"undefined"
 #define NID_undef			0

crypto/objects/objects.txt

@@ -439,7 +439,6 @@ id-pda 2		: id-pda-placeOfBirth
 id-pda 3		: id-pda-gender
 id-pda 4		: id-pda-countryOfCitizenship
 id-pda 5		: id-pda-countryOfResidence
-id-pda 6		: id-pda-pseudonym
 
 # attribute certificate attributes
 id-aca 1		: id-aca-authenticationInfo