Don't output bogus errors in PKCS12_parse

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

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 2bcaf83aae13ad22da9f3b89c0c1eb5eae1b03d8..655f40514b000b7be07fab1cbccf370f64b8e6bb 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
 
@@ -1362,3 +1360,6 @@ secg-scheme 14 3 : dhSinglePass-cofactorDH-sha512kdf-scheme
 1 3 6 1 4 1 311 60 2 1 1       : jurisdictionL         : jurisdictionLocalityName
 1 3 6 1 4 1 311 60 2 1 2       : jurisdictionST        : jurisdictionStateOrProvinceName
 1 3 6 1 4 1 311 60 2 1 3       : jurisdictionC         : jurisdictionCountryName
+
+# SCRYPT algorithm
+1 3 6 1 4 1 11591 4 11         : id-scrypt