Commit 4825092b authored by Lutz Jänicke's avatar Lutz Jänicke
Browse files

Fix buggy object definitions (Svenning Sorensen <sss@sss.dnsalias.net>).

parent bbd79bdf

CHANGES

+7 −0
Original line number Diff line number Diff line
@@ -49,6 +49,13 @@ 
         *) applies to 0.9.6a ... 0.9.6d 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>).

crypto/objects/obj_mac.h

+2 −2
Original line number Diff line number Diff line
@@ -2152,12 +2152,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"

crypto/objects/objects.pl

+2 −0
Original line number Diff line number Diff line
@@ -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;

crypto/objects/objects.txt

+2 −2
Original line number Diff line number Diff line
@@ -699,10 +699,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