summaryrefslogtreecommitdiffstats
path: root/src/crypto/obj/objects.txt
diff options
context:
space:
mode:
authorAdam Langley <agl@google.com>2015-06-12 16:28:27 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-12 16:28:27 +0000
commit9701a2fbe20a18d08253e84e8ec39d94db5376e0 (patch)
tree26c038b10145f502cb98f5675516a7ed6bd27fdb /src/crypto/obj/objects.txt
parent82ea518198c8ce74418c90597ccf8f444d1154ab (diff)
parent53b272a2813a0b11f107d77100ff8805ada8fbd2 (diff)
downloadexternal_boringssl-9701a2fbe20a18d08253e84e8ec39d94db5376e0.zip
external_boringssl-9701a2fbe20a18d08253e84e8ec39d94db5376e0.tar.gz
external_boringssl-9701a2fbe20a18d08253e84e8ec39d94db5376e0.tar.bz2
am 53b272a2: Bump revision of BoringSSL.
* commit '53b272a2813a0b11f107d77100ff8805ada8fbd2': Bump revision of BoringSSL.
Diffstat (limited to 'src/crypto/obj/objects.txt')
-rw-r--r--src/crypto/obj/objects.txt6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/crypto/obj/objects.txt b/src/crypto/obj/objects.txt
index aeffc6c..2757c4f 100644
--- a/src/crypto/obj/objects.txt
+++ b/src/crypto/obj/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