Call of memcmp with null pointers in obj_cmp()

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

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index ee389100badfbcc78497932d91f440a86d8055a8..25a9bb88aac02681ace4974ce5c3bd4ac792e669 100644 (file)
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -748,7 +748,7 @@ id-ce 24            : invalidityDate        : Invalidity Date
 !Cname delta-crl
 id-ce 27               : deltaCRL              : X509v3 Delta CRL Indicator
 !Cname issuing-distribution-point
-id-ce 28               : issuingDistributionPoint : X509v3 Issuing Distrubution Point
+id-ce 28               : issuingDistributionPoint : X509v3 Issuing Distribution Point
 !Cname certificate-issuer
 id-ce 29               : certificateIssuer     : X509v3 Certificate Issuer
 !Cname name-constraints
@@ -838,9 +838,7 @@ mime-mhs 2          : mime-mhs-bodies       : mime-mhs-bodies
 mime-mhs-headings 1    : id-hex-partial-message : id-hex-partial-message
 mime-mhs-headings 2    : id-hex-multipart-message : id-hex-multipart-message
 
-# What the hell are these OIDs, really?
-!Cname rle-compression
-1 1 1 1 666 1          : RLE                   : run length compression
+# RFC 3274
 !Cname zlib-compression
 id-smime-alg 8         : ZLIB                  : zlib compression
 
@@ -988,8 +986,7 @@ pilotAttributeType 40       :                       : personalTitle
 pilotAttributeType 41  :                       : mobileTelephoneNumber
 pilotAttributeType 42  :                       : pagerTelephoneNumber
 pilotAttributeType 43  :                       : friendlyCountryName
-# The following clashes with 2.5.4.45, so commented away
-#pilotAttributeType 44 : uid                   : uniqueIdentifier
+pilotAttributeType 44  : uid                   : uniqueIdentifier
 pilotAttributeType 45  :                       : organizationalStatus
 pilotAttributeType 46  :                       : janetMailbox
 pilotAttributeType 47  :                       : mailPreferenceOption