From: Lutz Jänicke <jaenicke@openssl.org>
Date: Thu, 4 Apr 2002 17:49:39 +0000 (+0000)
Subject: Fix buggy object definitions (Svenning Sorensen <sss@sss.dnsalias.net>).
X-Git-Tag: OpenSSL_0_9_7-beta1~124
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ce34d0ac09fc47ca0d35c1972280d774e718d5fd;p=oweals%2Fopenssl.git

Fix buggy object definitions (Svenning Sorensen <sss@sss.dnsalias.net>).
Submitted by:
Reviewed by:
PR:
---

diff --git a/CHANGES b/CHANGES
index 4fd48d07a9..28cb8b108e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,13 @@
          *) applies to 0.9.6a/0.9.6b/0.9.6c and 0.9.7
          +) applies to 0.9.7 only
 
+  *) Fix object definitions for Private and Enterprise: they were not
+     recognized in their shortname (=lowercase) representation. Extend
+     obj_dat.pl to issue an error when using undefined keywords instead
+     of silently ignoring the problem (Svenning Sorensen
+     <sss@sss.dnsalias.net>).
+     [Lutz Jaenicke]
+
   +) Make object definitions compliant to LDAP (RFC2256): SN is the short
      form for "surname", serialNumber has no short form (Michael Bell
      <michael.bell@rz.hu-berlin.de>).
diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h
index 468b58fb59..fb8db06b0e 100644
--- a/crypto/objects/obj_mac.h
+++ b/crypto/objects/obj_mac.h
@@ -1888,12 +1888,12 @@
 #define SN_Enterprises		"enterprises"
 #define LN_Enterprises		"Enterprises"
 #define NID_Enterprises		389
-#define OBJ_Enterprises		OBJ_private,1L
+#define OBJ_Enterprises		OBJ_Private,1L
 
 #define SN_dcObject		"dcobject"
 #define LN_dcObject		"dcObject"
 #define NID_dcObject		390
-#define OBJ_dcObject		OBJ_enterprises,1466L,344L
+#define OBJ_dcObject		OBJ_Enterprises,1466L,344L
 
 #define SN_rle_compression		"RLE"
 #define LN_rle_compression		"run length compression"
diff --git a/crypto/objects/objects.pl b/crypto/objects/objects.pl
index 3a1da4919d..76c06cc8f9 100644
--- a/crypto/objects/objects.pl
+++ b/crypto/objects/objects.pl
@@ -210,6 +210,8 @@ sub process_oid
 	if (!($a[0] =~ /^[0-9]+$/))
 		{
 		$a[0] =~ s/-/_/g;
+		if (!defined($obj{$a[0]}))
+			{ die "$ARGV[0]:$o:Undefined identifier ",$a[0],"\n"; }
 		$pref_oid = "OBJ_" . $a[0];
 		$pref_sep = ",";
 		shift @a;
diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 8254f9d43e..a0d319d569 100644
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -625,10 +625,10 @@ internet 5		: security		: Security
 internet 6		: snmpv2		: SNMPv2
 internet 7		: mail			: Mail
 
-private 1		: enterprises		: Enterprises
+Private 1		: enterprises		: Enterprises
 
 # RFC 2247
-enterprises 1466 344	: dcobject		: dcObject
+Enterprises 1466 344	: dcobject		: dcObject
 
 # What the hell are these OIDs, really?
 !Cname rle-compression