summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pkcs7
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/pkcs7')
-rw-r--r--src/lib/libcrypto/pkcs7/Makefile188
-rw-r--r--src/lib/libcrypto/pkcs7/bio_ber.c2
-rw-r--r--src/lib/libcrypto/pkcs7/example.c8
3 files changed, 72 insertions, 126 deletions
diff --git a/src/lib/libcrypto/pkcs7/Makefile b/src/lib/libcrypto/pkcs7/Makefile
index a213ae2227..3f7e88b40f 100644
--- a/src/lib/libcrypto/pkcs7/Makefile
+++ b/src/lib/libcrypto/pkcs7/Makefile
@@ -7,11 +7,6 @@ TOP= ../..
7CC= cc 7CC= cc
8INCLUDES= -I.. -I$(TOP) -I../../include 8INCLUDES= -I.. -I$(TOP) -I../../include
9CFLAG=-g 9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKEDEPPROG= makedepend
14MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
15MAKEFILE= Makefile 10MAKEFILE= Makefile
16AR= ar r 11AR= ar r
17 12
@@ -72,6 +67,7 @@ links:
72 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) 67 @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
73 68
74install: 69install:
70 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
75 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ 71 @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
76 do \ 72 do \
77 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 73 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -87,6 +83,7 @@ lint:
87 lint -DLINT $(INCLUDES) $(SRC)>fluff 83 lint -DLINT $(INCLUDES) $(SRC)>fluff
88 84
89depend: 85depend:
86 @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
90 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) 87 $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
91 88
92dclean: 89dclean:
@@ -98,143 +95,92 @@ clean:
98 95
99# DO NOT DELETE THIS LINE -- make depend depends on it. 96# DO NOT DELETE THIS LINE -- make depend depends on it.
100 97
101pk7_asn1.o: ../../e_os.h ../../include/openssl/aes.h 98pk7_asn1.o: ../../e_os.h ../../include/openssl/asn1.h
102pk7_asn1.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h 99pk7_asn1.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
103pk7_asn1.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 100pk7_asn1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
104pk7_asn1.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h 101pk7_asn1.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
105pk7_asn1.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h 102pk7_asn1.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
106pk7_asn1.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 103pk7_asn1.o: ../../include/openssl/err.h ../../include/openssl/evp.h
107pk7_asn1.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 104pk7_asn1.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
108pk7_asn1.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
109pk7_asn1.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
110pk7_asn1.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
111pk7_asn1.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
112pk7_asn1.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
113pk7_asn1.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 105pk7_asn1.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
114pk7_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 106pk7_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
115pk7_asn1.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 107pk7_asn1.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
116pk7_asn1.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 108pk7_asn1.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
117pk7_asn1.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 109pk7_asn1.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
118pk7_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 110pk7_asn1.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pk7_asn1.c
119pk7_asn1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 111pk7_attr.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
120pk7_asn1.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 112pk7_attr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
121pk7_asn1.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 113pk7_attr.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
122pk7_asn1.o: ../cryptlib.h pk7_asn1.c 114pk7_attr.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
123pk7_attr.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h 115pk7_attr.o: ../../include/openssl/err.h ../../include/openssl/evp.h
124pk7_attr.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h 116pk7_attr.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
125pk7_attr.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
126pk7_attr.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
127pk7_attr.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
128pk7_attr.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
129pk7_attr.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
130pk7_attr.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
131pk7_attr.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
132pk7_attr.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
133pk7_attr.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
134pk7_attr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 117pk7_attr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
135pk7_attr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 118pk7_attr.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
136pk7_attr.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h 119pk7_attr.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
137pk7_attr.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 120pk7_attr.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
138pk7_attr.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 121pk7_attr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
139pk7_attr.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 122pk7_attr.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
140pk7_attr.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 123pk7_attr.o: ../../include/openssl/x509_vfy.h pk7_attr.c
141pk7_attr.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 124pk7_doit.o: ../../e_os.h ../../include/openssl/asn1.h
142pk7_attr.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h 125pk7_doit.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
143pk7_attr.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
144pk7_attr.o: pk7_attr.c
145pk7_doit.o: ../../e_os.h ../../include/openssl/aes.h
146pk7_doit.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
147pk7_doit.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
148pk7_doit.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
149pk7_doit.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h 126pk7_doit.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
150pk7_doit.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 127pk7_doit.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
151pk7_doit.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 128pk7_doit.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
152pk7_doit.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 129pk7_doit.o: ../../include/openssl/err.h ../../include/openssl/evp.h
153pk7_doit.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 130pk7_doit.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
154pk7_doit.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
155pk7_doit.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
156pk7_doit.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
157pk7_doit.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 131pk7_doit.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
158pk7_doit.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 132pk7_doit.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
159pk7_doit.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h 133pk7_doit.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
160pk7_doit.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 134pk7_doit.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
161pk7_doit.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 135pk7_doit.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
162pk7_doit.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 136pk7_doit.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
163pk7_doit.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 137pk7_doit.o: ../../include/openssl/x509v3.h ../cryptlib.h pk7_doit.c
164pk7_doit.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 138pk7_lib.o: ../../e_os.h ../../include/openssl/asn1.h
165pk7_doit.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 139pk7_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
166pk7_doit.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h 140pk7_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
167pk7_doit.o: ../cryptlib.h pk7_doit.c 141pk7_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
168pk7_lib.o: ../../e_os.h ../../include/openssl/aes.h 142pk7_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
169pk7_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 143pk7_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
170pk7_lib.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
171pk7_lib.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
172pk7_lib.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
173pk7_lib.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
174pk7_lib.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
175pk7_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h
176pk7_lib.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
177pk7_lib.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
178pk7_lib.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
179pk7_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 144pk7_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
180pk7_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h 145pk7_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
181pk7_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h 146pk7_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
182pk7_lib.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 147pk7_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
183pk7_lib.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 148pk7_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
184pk7_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 149pk7_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
185pk7_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 150pk7_lib.o: ../cryptlib.h pk7_lib.c
186pk7_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 151pk7_mime.o: ../../e_os.h ../../include/openssl/asn1.h
187pk7_lib.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 152pk7_mime.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
188pk7_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pk7_lib.c 153pk7_mime.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
189pk7_mime.o: ../../e_os.h ../../include/openssl/aes.h 154pk7_mime.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
190pk7_mime.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 155pk7_mime.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
191pk7_mime.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 156pk7_mime.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
192pk7_mime.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
193pk7_mime.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
194pk7_mime.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
195pk7_mime.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
196pk7_mime.o: ../../include/openssl/err.h ../../include/openssl/evp.h
197pk7_mime.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
198pk7_mime.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
199pk7_mime.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
200pk7_mime.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 157pk7_mime.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
201pk7_mime.o: ../../include/openssl/opensslconf.h 158pk7_mime.o: ../../include/openssl/opensslconf.h
202pk7_mime.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 159pk7_mime.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
203pk7_mime.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h 160pk7_mime.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
204pk7_mime.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h 161pk7_mime.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
205pk7_mime.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 162pk7_mime.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
206pk7_mime.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 163pk7_mime.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
207pk7_mime.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 164pk7_mime.o: ../cryptlib.h pk7_mime.c
208pk7_mime.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 165pk7_smime.o: ../../e_os.h ../../include/openssl/asn1.h
209pk7_mime.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h 166pk7_smime.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
210pk7_mime.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pk7_mime.c
211pk7_smime.o: ../../e_os.h ../../include/openssl/aes.h
212pk7_smime.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
213pk7_smime.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
214pk7_smime.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
215pk7_smime.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h 167pk7_smime.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
216pk7_smime.o: ../../include/openssl/des.h ../../include/openssl/des_old.h 168pk7_smime.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
217pk7_smime.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 169pk7_smime.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
218pk7_smime.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 170pk7_smime.o: ../../include/openssl/err.h ../../include/openssl/evp.h
219pk7_smime.o: ../../include/openssl/evp.h ../../include/openssl/idea.h 171pk7_smime.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
220pk7_smime.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
221pk7_smime.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
222pk7_smime.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
223pk7_smime.o: ../../include/openssl/objects.h 172pk7_smime.o: ../../include/openssl/objects.h
224pk7_smime.o: ../../include/openssl/opensslconf.h 173pk7_smime.o: ../../include/openssl/opensslconf.h
225pk7_smime.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 174pk7_smime.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
226pk7_smime.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h 175pk7_smime.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
227pk7_smime.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h 176pk7_smime.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
228pk7_smime.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h 177pk7_smime.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
229pk7_smime.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 178pk7_smime.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
230pk7_smime.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 179pk7_smime.o: ../cryptlib.h pk7_smime.c
231pk7_smime.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
232pk7_smime.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
233pk7_smime.o: ../../include/openssl/x509v3.h ../cryptlib.h pk7_smime.c
234pkcs7err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 180pkcs7err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
235pkcs7err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h 181pkcs7err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
236pkcs7err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h 182pkcs7err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
237pkcs7err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 183pkcs7err.o: ../../include/openssl/opensslconf.h
238pkcs7err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 184pkcs7err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
239pkcs7err.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h 185pkcs7err.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
240pkcs7err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 186pkcs7err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
diff --git a/src/lib/libcrypto/pkcs7/bio_ber.c b/src/lib/libcrypto/pkcs7/bio_ber.c
index 895a91177b..31973fcd1f 100644
--- a/src/lib/libcrypto/pkcs7/bio_ber.c
+++ b/src/lib/libcrypto/pkcs7/bio_ber.c
@@ -204,7 +204,7 @@ int bio_ber_get_header(BIO *bio, BIO_BER_CTX *ctx)
204 if ((ctx->buf_len < BER_BUF_SIZE) && 204 if ((ctx->buf_len < BER_BUF_SIZE) &&
205 (ERR_GET_REASON(ERR_peek_error()) == ASN1_R_TOO_LONG)) 205 (ERR_GET_REASON(ERR_peek_error()) == ASN1_R_TOO_LONG))
206 { 206 {
207 ERR_get_error(); /* clear the error */ 207 ERR_clear_error(); /* clear the error */
208 BIO_set_retry_read(b); 208 BIO_set_retry_read(b);
209 } 209 }
210 return(-1); 210 return(-1);
diff --git a/src/lib/libcrypto/pkcs7/example.c b/src/lib/libcrypto/pkcs7/example.c
index c993947cc3..2953d04b5c 100644
--- a/src/lib/libcrypto/pkcs7/example.c
+++ b/src/lib/libcrypto/pkcs7/example.c
@@ -123,7 +123,7 @@ int get_signed_seq2string(PKCS7_SIGNER_INFO *si, char **str1, char **str2)
123 so=PKCS7_get_signed_attribute(si,signed_seq2string_nid); 123 so=PKCS7_get_signed_attribute(si,signed_seq2string_nid);
124 if (so && (so->type == V_ASN1_SEQUENCE)) 124 if (so && (so->type == V_ASN1_SEQUENCE))
125 { 125 {
126 ASN1_CTX c; 126 ASN1_const_CTX c;
127 ASN1_STRING *s; 127 ASN1_STRING *s;
128 long length; 128 long length;
129 ASN1_OCTET_STRING *os1,*os2; 129 ASN1_OCTET_STRING *os1,*os2;
@@ -144,7 +144,7 @@ int get_signed_seq2string(PKCS7_SIGNER_INFO *si, char **str1, char **str2)
144 goto err; 144 goto err;
145 c.slen-=(c.p-c.q); 145 c.slen-=(c.p-c.q);
146 146
147 if (!asn1_Finish(&c)) goto err; 147 if (!asn1_const_Finish(&c)) goto err;
148 *str1=malloc(os1->length+1); 148 *str1=malloc(os1->length+1);
149 *str2=malloc(os2->length+1); 149 *str2=malloc(os2->length+1);
150 memcpy(*str1,os1->data,os1->length); 150 memcpy(*str1,os1->data,os1->length);
@@ -290,7 +290,7 @@ int sk_get_seq2string(STACK_OF(X509_ATTRIBUTE) *sk, char **str1, char **str2)
290 so=PKCS7_get_signed_attribute(&si,signed_seq2string_nid); 290 so=PKCS7_get_signed_attribute(&si,signed_seq2string_nid);
291 if (so->type == V_ASN1_SEQUENCE) 291 if (so->type == V_ASN1_SEQUENCE)
292 { 292 {
293 ASN1_CTX c; 293 ASN1_const_CTX c;
294 ASN1_STRING *s; 294 ASN1_STRING *s;
295 long length; 295 long length;
296 ASN1_OCTET_STRING *os1,*os2; 296 ASN1_OCTET_STRING *os1,*os2;
@@ -311,7 +311,7 @@ int sk_get_seq2string(STACK_OF(X509_ATTRIBUTE) *sk, char **str1, char **str2)
311 goto err; 311 goto err;
312 c.slen-=(c.p-c.q); 312 c.slen-=(c.p-c.q);
313 313
314 if (!asn1_Finish(&c)) goto err; 314 if (!asn1_const_Finish(&c)) goto err;
315 *str1=malloc(os1->length+1); 315 *str1=malloc(os1->length+1);
316 *str2=malloc(os2->length+1); 316 *str2=malloc(os2->length+1);
317 memcpy(*str1,os1->data,os1->length); 317 memcpy(*str1,os1->data,os1->length);
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-08-03 22:35:12 +0000