summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/cms/cms_cd.c
diff options
context:
space:
mode:
authorjsing <>2019-08-10 18:15:52 +0000
committerjsing <>2019-08-10 18:15:52 +0000
commit3a50c787ae5b953d0555d32dbfd071620c906b84 (patch)
tree000cccad44c82ea472a03a1338613f2237b5dc09 /src/lib/libcrypto/cms/cms_cd.c
parent348e8055f6b4ea773466a117767c16e615a549ab (diff)
downloadopenbsd-3a50c787ae5b953d0555d32dbfd071620c906b84.tar.gz
openbsd-3a50c787ae5b953d0555d32dbfd071620c906b84.tar.bz2
openbsd-3a50c787ae5b953d0555d32dbfd071620c906b84.zip
More style(9), whitespace and readability fixes.
Files are identical once whitespace and newlines are removed.
Diffstat (limited to 'src/lib/libcrypto/cms/cms_cd.c')
-rw-r--r--src/lib/libcrypto/cms/cms_cd.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/lib/libcrypto/cms/cms_cd.c b/src/lib/libcrypto/cms/cms_cd.c
index 55fff110d1..e3e9f78e5b 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.12 2019/08/10 16:42:20 jsing Exp $ */ 1/* $OpenBSD: cms_cd.c,v 1.13 2019/08/10 18:15:52 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.
@@ -66,10 +66,12 @@
66 66
67/* CMS CompressedData Utilities */ 67/* CMS CompressedData Utilities */
68 68
69CMS_ContentInfo *cms_CompressedData_create(int comp_nid) 69CMS_ContentInfo *
70cms_CompressedData_create(int comp_nid)
70{ 71{
71 CMS_ContentInfo *cms; 72 CMS_ContentInfo *cms;
72 CMS_CompressedData *cd; 73 CMS_CompressedData *cd;
74
73 /* 75 /*
74 * Will need something cleverer if there is ever more than one 76 * Will need something cleverer if there is ever more than one
75 * compression algorithm or parameters have some meaning... 77 * compression algorithm or parameters have some meaning...
@@ -105,10 +107,12 @@ CMS_ContentInfo *cms_CompressedData_create(int comp_nid)
105 return NULL; 107 return NULL;
106} 108}
107 109
108BIO *cms_CompressedData_init_bio(CMS_ContentInfo *cms) 110BIO *
111cms_CompressedData_init_bio(CMS_ContentInfo *cms)
109{ 112{
110 CMS_CompressedData *cd; 113 CMS_CompressedData *cd;
111 const ASN1_OBJECT *compoid; 114 const ASN1_OBJECT *compoid;
115
112 if (OBJ_obj2nid(cms->contentType) != NID_id_smime_ct_compressedData) { 116 if (OBJ_obj2nid(cms->contentType) != NID_id_smime_ct_compressedData) {
113 CMSerr(CMS_F_CMS_COMPRESSEDDATA_INIT_BIO, 117 CMSerr(CMS_F_CMS_COMPRESSEDDATA_INIT_BIO,
114 CMS_R_CONTENT_TYPE_NOT_COMPRESSED_DATA); 118 CMS_R_CONTENT_TYPE_NOT_COMPRESSED_DATA);