#undef X509_EXTENSIONS to avoid conflict with CryptoAPI.

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

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 0242a078b9fd9daa42f332c40a0b36ada2a84c93..dc10278f4143cad6101d4f34a4b87df28350aae7 100644 (file)
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -298,7 +298,6 @@ id-smime-alg 4              : id-smime-alg-RC2wrap
 id-smime-alg 5         : id-smime-alg-ESDH
 id-smime-alg 6         : id-smime-alg-CMS3DESwrap
 id-smime-alg 7         : id-smime-alg-CMSRC2wrap
-id-smime-alg 8         : id-smime-alg-zlibCompress
 
 # S/MIME Certificate Distribution
 id-smime-cd 1          : id-smime-cd-ldap
@@ -794,7 +793,7 @@ mime-mhs-headings 2 : id-hex-multipart-message : id-hex-multipart-message
 !Cname rle-compression
 1 1 1 1 666 1          : RLE                   : run length compression
 !Cname zlib-compression
-1 1 1 1 666 2          : ZLIB                  : zlib compression
+id-smime-alg 8         : ZLIB                  : zlib compression
 
 # AES aka Rijndael