More method functions.

[openssl.git] / crypto / objects / objects.pl

diff --git a/crypto/objects/objects.pl b/crypto/objects/objects.pl
index 04fcdec2070a2e97502dcf2016c55fc423c4ebc5..41fa4147e31a7a41f313f4bbde691e2877994132 100644 (file)
--- a/crypto/objects/objects.pl
+++ b/crypto/objects/objects.pl
@@ -9,7 +9,9 @@ while(<NUMIN>)
        $o++;
        s/#.*$//;
        next if /^\s*$/;
+       $_ = 'X'.$_;
        ($Cname,$mynum) = split;
+       $Cname =~ s/^X//;
        if (defined($nidn{$mynum}))
                { die "$ARGV[1]:$o:There's already an object with NID ",$mynum," on line ",$order{$mynum},"\n"; }
        $nid{$Cname} = $mynum;
@@ -203,11 +205,22 @@ sub process_oid
 
        @a = split(/\s+/,$myoid);
        $pref_oid = "";
+       $pref_sep = "";
        if (!($a[0] =~ /^[0-9]+$/))
                {
                $a[0] =~ s/-/_/g;
-               $pref_oid = "OBJ_" . $a[0] . ',';
+               $pref_oid = "OBJ_" . $a[0];
+               $pref_sep = ",";
                shift @a;
                }
-       return($pref_oid . join('L,',@a) . 'L');
+       $oids = join('L,',@a) . "L";
+       if ($oids ne "L")
+               {
+               $oids = $pref_oid . $pref_sep . $oids;
+               }
+       else
+               {
+               $oids = $pref_oid;
+               }
+       return($oids);
        }