wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

We already have an object for "zlib compression" but it was a place

Browse source 
holder and its actual encoding never used.

Just as well because it's value looks like it was made up in the mists of
time...

Now there is a registered value for zlib compression (used in S/MIME
compressedData content type) use that instead.
This commit is contained in:
Dr. Stephen Henson 2008-02-29 14:24:52 +00:00
parent 56c7754cab
commit b510d77535
4 changed files with 1415 additions and 1427 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2828
crypto/objects/obj_dat.h
View file

File diff suppressed because it is too large Load diff

8
crypto/objects/obj_mac.h
View file

@ -977,10 +977,6 @@
#define NID_id_smime_alg_CMSRC2wrap 247
#define OBJ_id_smime_alg_CMSRC2wrap OBJ_id_smime_alg,7L
#define SN_id_smime_alg_zlibCompress "id-smime-alg-zlibCompress"
#define NID_id_smime_alg_zlibCompress 852
#define OBJ_id_smime_alg_zlibCompress OBJ_id_smime_alg,8L
#define SN_id_smime_cd_ldap "id-smime-cd-ldap"
#define NID_id_smime_cd_ldap 248
#define OBJ_id_smime_cd_ldap OBJ_id_smime_cd,1L
@ -2404,7 +2400,7 @@
#define SN_zlib_compression "ZLIB"
#define LN_zlib_compression "zlib compression"
#define NID_zlib_compression 125
#define OBJ_zlib_compression 1L,1L,1L,1L,666L,2L
#define OBJ_zlib_compression OBJ_id_smime_alg,8L
#define OBJ_csor 2L,16L,840L,1L,101L,3L
@ -3461,7 +3457,7 @@
#define SN_id_Gost28147_89_MAC "gost-mac"
#define LN_id_Gost28147_89_MAC "GOST 28147-89 MAC"
#define NID_id_Gost28147_89_MAC 853
#define NID_id_Gost28147_89_MAC 852
#define OBJ_id_Gost28147_89_MAC OBJ_cryptopro,22L
#define SN_id_GostR3411_94_prf "prf-gostr3411-94"

3
crypto/objects/obj_mac.num
View file

@ -849,5 +849,4 @@ id_GostR3411_94_with_GostR3410_2001_cc 848
id_GostR3410_2001_ParamSet_cc 849
hmac 850
id_smime_ct_compressedData 851
id_smime_alg_zlibCompress 852
id_Gost28147_89_MAC 853
id_Gost28147_89_MAC 852

3
crypto/objects/objects.txt
View file

@ -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