From 4825092bbe7e23e26769f0cadba70fe508b8a047 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lutz=20J=C3=A4nicke?= Date: Thu, 4 Apr 2002 17:48:37 +0000 Subject: [PATCH] Fix buggy object definitions (Svenning Sorensen ). --- CHANGES | 7 +++++++ crypto/objects/obj_mac.h | 4 ++-- crypto/objects/objects.pl | 2 ++ crypto/objects/objects.txt | 4 ++-- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 4845329aa5..a6c588a780 100644 --- a/CHANGES +++ b/CHANGES @@ -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 + ). + [Lutz Jaenicke] + +) Make object definitions compliant to LDAP (RFC2256): SN is the short form for "surname", serialNumber has no short form (Michael Bell ). diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h index 46b2b9bf66..9bfb8b2c41 100644 --- a/crypto/objects/obj_mac.h +++ b/crypto/objects/obj_mac.h @@ -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" 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 1fdc934fc5..a83007034f 100644 --- a/crypto/objects/objects.txt +++ b/crypto/objects/objects.txt @@ -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 -- GitLab