summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/cms/cms_cd.c
diff options
context:
space:
mode:
authorjsing <>2019-08-11 10:38:27 +0000
committerjsing <>2019-08-11 10:38:27 +0000
commit66c480d1798005c797335d0f02a75fc501efcc7f (patch)
tree42de514d40b8fbdc31f900b32db6a05e12455f76 /src/lib/libcrypto/cms/cms_cd.c
parent08cb6e4d4d31afbeec6bc3bdd6594710504fd25b (diff)
downloadopenbsd-66c480d1798005c797335d0f02a75fc501efcc7f.tar.gz
openbsd-66c480d1798005c797335d0f02a75fc501efcc7f.tar.bz2
openbsd-66c480d1798005c797335d0f02a75fc501efcc7f.zip
Convert CMSerr() to CMSerror().
Diffstat (limited to 'src/lib/libcrypto/cms/cms_cd.c')
-rw-r--r--src/lib/libcrypto/cms/cms_cd.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/lib/libcrypto/cms/cms_cd.c b/src/lib/libcrypto/cms/cms_cd.c
index e3e9f78e5b..752c808c65 100644
--- a/src/lib/libcrypto/cms/cms_cd.c
+++ b/src/lib/libcrypto/cms/cms_cd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cms_cd.c,v 1.13 2019/08/10 18:15:52 jsing Exp $ */ 1/* $OpenBSD: cms_cd.c,v 1.14 2019/08/11 10:38:27 jsing Exp $ */
2/* 2/*
3 * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 3 * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
4 * project. 4 * project.
@@ -77,8 +77,7 @@ cms_CompressedData_create(int comp_nid)
77 * compression algorithm or parameters have some meaning... 77 * compression algorithm or parameters have some meaning...
78 */ 78 */
79 if (comp_nid != NID_zlib_compression) { 79 if (comp_nid != NID_zlib_compression) {
80 CMSerr(CMS_F_CMS_COMPRESSEDDATA_CREATE, 80 CMSerror(CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
81 CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
82 return NULL; 81 return NULL;
83 } 82 }
84 cms = CMS_ContentInfo_new(); 83 cms = CMS_ContentInfo_new();
@@ -114,15 +113,13 @@ cms_CompressedData_init_bio(CMS_ContentInfo *cms)
114 const ASN1_OBJECT *compoid; 113 const ASN1_OBJECT *compoid;
115 114
116 if (OBJ_obj2nid(cms->contentType) != NID_id_smime_ct_compressedData) { 115 if (OBJ_obj2nid(cms->contentType) != NID_id_smime_ct_compressedData) {
117 CMSerr(CMS_F_CMS_COMPRESSEDDATA_INIT_BIO, 116 CMSerror(CMS_R_CONTENT_TYPE_NOT_COMPRESSED_DATA);
118 CMS_R_CONTENT_TYPE_NOT_COMPRESSED_DATA);
119 return NULL; 117 return NULL;
120 } 118 }
121 cd = cms->d.compressedData; 119 cd = cms->d.compressedData;
122 X509_ALGOR_get0(&compoid, NULL, NULL, cd->compressionAlgorithm); 120 X509_ALGOR_get0(&compoid, NULL, NULL, cd->compressionAlgorithm);
123 if (OBJ_obj2nid(compoid) != NID_zlib_compression) { 121 if (OBJ_obj2nid(compoid) != NID_zlib_compression) {
124 CMSerr(CMS_F_CMS_COMPRESSEDDATA_INIT_BIO, 122 CMSerror(CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
125 CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
126 return NULL; 123 return NULL;
127 } 124 }
128 return BIO_new(BIO_f_zlib()); 125 return BIO_new(BIO_f_zlib());