summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/cms
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/cms')
-rw-r--r--src/lib/libcrypto/cms/Makefile264
-rw-r--r--src/lib/libcrypto/cms/cms_smime.c61
2 files changed, 268 insertions, 57 deletions
diff --git a/src/lib/libcrypto/cms/Makefile b/src/lib/libcrypto/cms/Makefile
new file mode 100644
index 0000000000..5837049725
--- /dev/null
+++ b/src/lib/libcrypto/cms/Makefile
@@ -0,0 +1,264 @@
1#
2# OpenSSL/crypto/cms/Makefile
3#
4
5DIR= cms
6TOP= ../..
7CC= cc
8INCLUDES= -I.. -I$(TOP) -I../../include
9CFLAG=-g
10MAKEFILE= Makefile
11AR= ar r
12
13CFLAGS= $(INCLUDES) $(CFLAG)
14
15GENERAL=Makefile
16TEST=
17APPS=
18
19LIB=$(TOP)/libcrypto.a
20LIBSRC= cms_lib.c cms_asn1.c cms_att.c cms_io.c cms_smime.c cms_err.c \
21 cms_sd.c cms_dd.c cms_cd.c cms_env.c cms_enc.c cms_ess.c
22LIBOBJ= cms_lib.o cms_asn1.o cms_att.o cms_io.o cms_smime.o cms_err.o \
23 cms_sd.o cms_dd.o cms_cd.o cms_env.o cms_enc.o cms_ess.o
24
25SRC= $(LIBSRC)
26
27EXHEADER= cms.h
28HEADER= cms_lcl.h $(EXHEADER)
29
30ALL= $(GENERAL) $(SRC) $(HEADER)
31
32top:
33 (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
34
35test:
36
37all: lib
38
39lib: $(LIBOBJ)
40 $(AR) $(LIB) $(LIBOBJ)
41 $(RANLIB) $(LIB) || echo Never mind.
42 @touch lib
43
44files:
45 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
46
47links:
48 @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
49 @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
50 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
51
52install:
53 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
54 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
55 do \
56 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
57 chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
58 done;
59
60tags:
61 ctags $(SRC)
62
63tests:
64
65lint:
66 lint -DLINT $(INCLUDES) $(SRC)>fluff
67
68depend:
69 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
70 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
71
72dclean:
73 $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
74 mv -f Makefile.new $(MAKEFILE)
75
76clean:
77 rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
78
79# DO NOT DELETE THIS LINE -- make depend depends on it.
80
81cms_asn1.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
82cms_asn1.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
83cms_asn1.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
84cms_asn1.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
85cms_asn1.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
86cms_asn1.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
87cms_asn1.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
88cms_asn1.o: ../../include/openssl/opensslconf.h
89cms_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
90cms_asn1.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
91cms_asn1.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
92cms_asn1.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
93cms_asn1.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
94cms_asn1.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
95cms_asn1.o: cms.h cms_asn1.c cms_lcl.h
96cms_att.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
97cms_att.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
98cms_att.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
99cms_att.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
100cms_att.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
101cms_att.o: ../../include/openssl/err.h ../../include/openssl/evp.h
102cms_att.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
103cms_att.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
104cms_att.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
105cms_att.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
106cms_att.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
107cms_att.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
108cms_att.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
109cms_att.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
110cms_att.o: cms.h cms_att.c cms_lcl.h
111cms_cd.o: ../../e_os.h ../../include/openssl/asn1.h
112cms_cd.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
113cms_cd.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h
114cms_cd.o: ../../include/openssl/comp.h ../../include/openssl/conf.h
115cms_cd.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
116cms_cd.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
117cms_cd.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
118cms_cd.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
119cms_cd.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
120cms_cd.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
121cms_cd.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h
122cms_cd.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
123cms_cd.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
124cms_cd.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
125cms_cd.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
126cms_cd.o: ../../include/openssl/x509v3.h ../cryptlib.h cms_cd.c cms_lcl.h
127cms_dd.o: ../../e_os.h ../../include/openssl/asn1.h
128cms_dd.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
129cms_dd.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h
130cms_dd.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
131cms_dd.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
132cms_dd.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
133cms_dd.o: ../../include/openssl/err.h ../../include/openssl/evp.h
134cms_dd.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
135cms_dd.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
136cms_dd.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
137cms_dd.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
138cms_dd.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
139cms_dd.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
140cms_dd.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
141cms_dd.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
142cms_dd.o: ../cryptlib.h cms_dd.c cms_lcl.h
143cms_enc.o: ../../e_os.h ../../include/openssl/asn1.h
144cms_enc.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
145cms_enc.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h
146cms_enc.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
147cms_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
148cms_enc.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
149cms_enc.o: ../../include/openssl/err.h ../../include/openssl/evp.h
150cms_enc.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
151cms_enc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
152cms_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
153cms_enc.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
154cms_enc.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
155cms_enc.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
156cms_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
157cms_enc.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
158cms_enc.o: ../../include/openssl/x509v3.h ../cryptlib.h cms_enc.c cms_lcl.h
159cms_env.o: ../../e_os.h ../../include/openssl/aes.h
160cms_env.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
161cms_env.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
162cms_env.o: ../../include/openssl/cms.h ../../include/openssl/conf.h
163cms_env.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
164cms_env.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
165cms_env.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
166cms_env.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
167cms_env.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
168cms_env.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
169cms_env.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h
170cms_env.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
171cms_env.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
172cms_env.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
173cms_env.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
174cms_env.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
175cms_env.o: ../asn1/asn1_locl.h ../cryptlib.h cms_env.c cms_lcl.h
176cms_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
177cms_err.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h
178cms_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
179cms_err.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
180cms_err.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
181cms_err.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
182cms_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
183cms_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
184cms_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
185cms_err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
186cms_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
187cms_err.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
188cms_err.o: cms_err.c
189cms_ess.o: ../../e_os.h ../../include/openssl/asn1.h
190cms_ess.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
191cms_ess.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h
192cms_ess.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
193cms_ess.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
194cms_ess.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
195cms_ess.o: ../../include/openssl/err.h ../../include/openssl/evp.h
196cms_ess.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
197cms_ess.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
198cms_ess.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
199cms_ess.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
200cms_ess.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
201cms_ess.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
202cms_ess.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
203cms_ess.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
204cms_ess.o: ../../include/openssl/x509v3.h ../cryptlib.h cms_ess.c cms_lcl.h
205cms_io.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
206cms_io.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
207cms_io.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
208cms_io.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
209cms_io.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
210cms_io.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
211cms_io.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
212cms_io.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
213cms_io.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h
214cms_io.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
215cms_io.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
216cms_io.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
217cms_io.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h cms.h
218cms_io.o: cms_io.c cms_lcl.h
219cms_lib.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
220cms_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
221cms_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
222cms_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
223cms_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
224cms_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
225cms_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
226cms_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
227cms_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h
228cms_lib.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
229cms_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
230cms_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
231cms_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h cms.h
232cms_lib.o: cms_lcl.h cms_lib.c
233cms_sd.o: ../../e_os.h ../../include/openssl/asn1.h
234cms_sd.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
235cms_sd.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h
236cms_sd.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
237cms_sd.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
238cms_sd.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
239cms_sd.o: ../../include/openssl/err.h ../../include/openssl/evp.h
240cms_sd.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
241cms_sd.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
242cms_sd.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
243cms_sd.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
244cms_sd.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
245cms_sd.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
246cms_sd.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
247cms_sd.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
248cms_sd.o: ../asn1/asn1_locl.h ../cryptlib.h cms_lcl.h cms_sd.c
249cms_smime.o: ../../e_os.h ../../include/openssl/asn1.h
250cms_smime.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
251cms_smime.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h
252cms_smime.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
253cms_smime.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
254cms_smime.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
255cms_smime.o: ../../include/openssl/err.h ../../include/openssl/evp.h
256cms_smime.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
257cms_smime.o: ../../include/openssl/objects.h
258cms_smime.o: ../../include/openssl/opensslconf.h
259cms_smime.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
260cms_smime.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
261cms_smime.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
262cms_smime.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
263cms_smime.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
264cms_smime.o: ../cryptlib.h cms_lcl.h cms_smime.c
diff --git a/src/lib/libcrypto/cms/cms_smime.c b/src/lib/libcrypto/cms/cms_smime.c
index 8c56e3a852..4a799eb897 100644
--- a/src/lib/libcrypto/cms/cms_smime.c
+++ b/src/lib/libcrypto/cms/cms_smime.c
@@ -611,10 +611,7 @@ int CMS_decrypt_set1_pkey(CMS_ContentInfo *cms, EVP_PKEY *pk, X509 *cert)
611 STACK_OF(CMS_RecipientInfo) *ris; 611 STACK_OF(CMS_RecipientInfo) *ris;
612 CMS_RecipientInfo *ri; 612 CMS_RecipientInfo *ri;
613 int i, r; 613 int i, r;
614 int debug = 0;
615 ris = CMS_get0_RecipientInfos(cms); 614 ris = CMS_get0_RecipientInfos(cms);
616 if (ris)
617 debug = cms->d.envelopedData->encryptedContentInfo->debug;
618 for (i = 0; i < sk_CMS_RecipientInfo_num(ris); i++) 615 for (i = 0; i < sk_CMS_RecipientInfo_num(ris); i++)
619 { 616 {
620 ri = sk_CMS_RecipientInfo_value(ris, i); 617 ri = sk_CMS_RecipientInfo_value(ris, i);
@@ -628,38 +625,17 @@ int CMS_decrypt_set1_pkey(CMS_ContentInfo *cms, EVP_PKEY *pk, X509 *cert)
628 CMS_RecipientInfo_set0_pkey(ri, pk); 625 CMS_RecipientInfo_set0_pkey(ri, pk);
629 r = CMS_RecipientInfo_decrypt(cms, ri); 626 r = CMS_RecipientInfo_decrypt(cms, ri);
630 CMS_RecipientInfo_set0_pkey(ri, NULL); 627 CMS_RecipientInfo_set0_pkey(ri, NULL);
628 if (r > 0)
629 return 1;
631 if (cert) 630 if (cert)
632 { 631 {
633 /* If not debugging clear any error and
634 * return success to avoid leaking of
635 * information useful to MMA
636 */
637 if (!debug)
638 {
639 ERR_clear_error();
640 return 1;
641 }
642 if (r > 0)
643 return 1;
644 CMSerr(CMS_F_CMS_DECRYPT_SET1_PKEY, 632 CMSerr(CMS_F_CMS_DECRYPT_SET1_PKEY,
645 CMS_R_DECRYPT_ERROR); 633 CMS_R_DECRYPT_ERROR);
646 return 0; 634 return 0;
647 } 635 }
648 /* If no cert and not debugging don't leave loop 636 ERR_clear_error();
649 * after first successful decrypt. Always attempt
650 * to decrypt all recipients to avoid leaking timing
651 * of a successful decrypt.
652 */
653 else if (r > 0 && debug)
654 return 1;
655 } 637 }
656 } 638 }
657 /* If no cert and not debugging always return success */
658 if (!cert && !debug)
659 {
660 ERR_clear_error();
661 return 1;
662 }
663 639
664 CMSerr(CMS_F_CMS_DECRYPT_SET1_PKEY, CMS_R_NO_MATCHING_RECIPIENT); 640 CMSerr(CMS_F_CMS_DECRYPT_SET1_PKEY, CMS_R_NO_MATCHING_RECIPIENT);
665 return 0; 641 return 0;
@@ -704,30 +680,6 @@ int CMS_decrypt_set1_key(CMS_ContentInfo *cms,
704 return 0; 680 return 0;
705 681
706 } 682 }
707
708int CMS_decrypt_set1_password(CMS_ContentInfo *cms,
709 unsigned char *pass, ossl_ssize_t passlen)
710 {
711 STACK_OF(CMS_RecipientInfo) *ris;
712 CMS_RecipientInfo *ri;
713 int i, r;
714 ris = CMS_get0_RecipientInfos(cms);
715 for (i = 0; i < sk_CMS_RecipientInfo_num(ris); i++)
716 {
717 ri = sk_CMS_RecipientInfo_value(ris, i);
718 if (CMS_RecipientInfo_type(ri) != CMS_RECIPINFO_PASS)
719 continue;
720 CMS_RecipientInfo_set0_password(ri, pass, passlen);
721 r = CMS_RecipientInfo_decrypt(cms, ri);
722 CMS_RecipientInfo_set0_password(ri, NULL, 0);
723 if (r > 0)
724 return 1;
725 }
726
727 CMSerr(CMS_F_CMS_DECRYPT_SET1_PASSWORD, CMS_R_NO_MATCHING_RECIPIENT);
728 return 0;
729
730 }
731 683
732int CMS_decrypt(CMS_ContentInfo *cms, EVP_PKEY *pk, X509 *cert, 684int CMS_decrypt(CMS_ContentInfo *cms, EVP_PKEY *pk, X509 *cert,
733 BIO *dcont, BIO *out, 685 BIO *dcont, BIO *out,
@@ -742,14 +694,9 @@ int CMS_decrypt(CMS_ContentInfo *cms, EVP_PKEY *pk, X509 *cert,
742 } 694 }
743 if (!dcont && !check_content(cms)) 695 if (!dcont && !check_content(cms))
744 return 0; 696 return 0;
745 if (flags & CMS_DEBUG_DECRYPT)
746 cms->d.envelopedData->encryptedContentInfo->debug = 1;
747 else
748 cms->d.envelopedData->encryptedContentInfo->debug = 0;
749 if (!pk && !cert && !dcont && !out)
750 return 1;
751 if (pk && !CMS_decrypt_set1_pkey(cms, pk, cert)) 697 if (pk && !CMS_decrypt_set1_pkey(cms, pk, cert))
752 return 0; 698 return 0;
699
753 cont = CMS_dataInit(cms, dcont); 700 cont = CMS_dataInit(cms, dcont);
754 if (!cont) 701 if (!cont)
755 return 0; 702 return 0;
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-12-09 03:31:54 +0000