summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/engine
diff options
context:
space:
mode:
authormarkus <>2002-09-10 16:31:57 +0000
committermarkus <>2002-09-10 16:31:57 +0000
commit7d038e9d4d83e7c7120e78418e108df70b9025d6 (patch)
treebaf775b286ff801a89f746b1938a3c700bba6822 /src/lib/libcrypto/engine
parent3bd21dd4c3a3e3106321a5f6b3641ab9f18a6e3b (diff)
downloadopenbsd-7d038e9d4d83e7c7120e78418e108df70b9025d6.tar.gz
openbsd-7d038e9d4d83e7c7120e78418e108df70b9025d6.tar.bz2
openbsd-7d038e9d4d83e7c7120e78418e108df70b9025d6.zip
merge openssl-0.9.7-beta3, tested on vax by miod@
Diffstat (limited to 'src/lib/libcrypto/engine')
-rw-r--r--src/lib/libcrypto/engine/Makefile.ssl351
-rw-r--r--src/lib/libcrypto/engine/eng_cnf.c2
-rw-r--r--src/lib/libcrypto/engine/eng_dyn.c24
-rw-r--r--src/lib/libcrypto/engine/eng_fat.c2
-rw-r--r--src/lib/libcrypto/engine/hw_4758_cca.c29
-rw-r--r--src/lib/libcrypto/engine/hw_aep.c28
-rw-r--r--src/lib/libcrypto/engine/hw_atalla.c27
-rw-r--r--src/lib/libcrypto/engine/hw_cswift.c27
-rw-r--r--src/lib/libcrypto/engine/hw_ncipher.c33
-rw-r--r--src/lib/libcrypto/engine/hw_nuron.c27
-rw-r--r--src/lib/libcrypto/engine/hw_ubsec.c26
11 files changed, 409 insertions, 167 deletions
diff --git a/src/lib/libcrypto/engine/Makefile.ssl b/src/lib/libcrypto/engine/Makefile.ssl
index 5172028f93..8bc8985e02 100644
--- a/src/lib/libcrypto/engine/Makefile.ssl
+++ b/src/lib/libcrypto/engine/Makefile.ssl
@@ -74,7 +74,7 @@ tags:
74 74
75errors: 75errors:
76 $(PERL) $(TOP)/util/mkerr.pl -conf hw.ec \ 76 $(PERL) $(TOP)/util/mkerr.pl -conf hw.ec \
77 -nostatic -staticloader -write hw_*.c; \ 77 -nostatic -staticloader -write hw_*.c
78 78
79tests: 79tests:
80 80
@@ -82,7 +82,7 @@ lint:
82 lint -DLINT $(INCLUDES) $(SRC)>fluff 82 lint -DLINT $(INCLUDES) $(SRC)>fluff
83 83
84depend: 84depend:
85 $(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC) 85 $(MAKEDEPEND) $(CFLAG) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
86 86
87dclean: 87dclean:
88 $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new 88 $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
@@ -196,22 +196,29 @@ eng_list.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
196eng_list.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 196eng_list.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
197eng_list.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 197eng_list.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
198eng_list.o: ../cryptlib.h eng_int.h eng_list.c 198eng_list.o: ../cryptlib.h eng_int.h eng_list.c
199eng_openssl.o: ../../e_os.h ../../include/openssl/asn1.h 199eng_openssl.o: ../../e_os.h ../../include/openssl/aes.h
200eng_openssl.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 200eng_openssl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
201eng_openssl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 201eng_openssl.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
202eng_openssl.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 202eng_openssl.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
203eng_openssl.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h 203eng_openssl.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
204eng_openssl.o: ../../include/openssl/engine.h ../../include/openssl/err.h 204eng_openssl.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
205eng_openssl.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h 205eng_openssl.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h
206eng_openssl.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
207eng_openssl.o: ../../include/openssl/err.h ../../include/openssl/evp.h
208eng_openssl.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
209eng_openssl.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
210eng_openssl.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
206eng_openssl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 211eng_openssl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
207eng_openssl.o: ../../include/openssl/opensslconf.h 212eng_openssl.o: ../../include/openssl/opensslconf.h
208eng_openssl.o: ../../include/openssl/opensslv.h 213eng_openssl.o: ../../include/openssl/opensslv.h
209eng_openssl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h 214eng_openssl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h
210eng_openssl.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h 215eng_openssl.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
211eng_openssl.o: ../../include/openssl/rand.h ../../include/openssl/rc4.h 216eng_openssl.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
212eng_openssl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 217eng_openssl.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
213eng_openssl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 218eng_openssl.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
214eng_openssl.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 219eng_openssl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
220eng_openssl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
221eng_openssl.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
215eng_openssl.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 222eng_openssl.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
216eng_openssl.o: ../cryptlib.h eng_openssl.c 223eng_openssl.o: ../cryptlib.h eng_openssl.c
217eng_pkey.o: ../../e_os.h ../../include/openssl/asn1.h 224eng_pkey.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -226,47 +233,64 @@ eng_pkey.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
226eng_pkey.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 233eng_pkey.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
227eng_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 234eng_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
228eng_pkey.o: ../cryptlib.h eng_int.h eng_pkey.c 235eng_pkey.o: ../cryptlib.h eng_int.h eng_pkey.c
229eng_table.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 236eng_table.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
230eng_table.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h 237eng_table.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
231eng_table.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 238eng_table.o: ../../include/openssl/bn.h ../../include/openssl/cast.h
232eng_table.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h 239eng_table.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
233eng_table.o: ../../include/openssl/err.h ../../include/openssl/evp.h 240eng_table.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
234eng_table.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h 241eng_table.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
242eng_table.o: ../../include/openssl/engine.h ../../include/openssl/err.h
243eng_table.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
244eng_table.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
245eng_table.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
246eng_table.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
235eng_table.o: ../../include/openssl/objects.h 247eng_table.o: ../../include/openssl/objects.h
236eng_table.o: ../../include/openssl/opensslconf.h 248eng_table.o: ../../include/openssl/opensslconf.h
237eng_table.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 249eng_table.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
238eng_table.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h 250eng_table.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
239eng_table.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 251eng_table.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
240eng_table.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 252eng_table.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
253eng_table.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
254eng_table.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
255eng_table.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
241eng_table.o: eng_int.h eng_table.c 256eng_table.o: eng_int.h eng_table.c
242hw_4758_cca.o: ../../e_os.h ../../include/openssl/asn1.h 257hw_4758_cca.o: ../../e_os.h ../../include/openssl/aes.h
243hw_4758_cca.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 258hw_4758_cca.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
244hw_4758_cca.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 259hw_4758_cca.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
245hw_4758_cca.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 260hw_4758_cca.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
246hw_4758_cca.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h 261hw_4758_cca.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
247hw_4758_cca.o: ../../include/openssl/engine.h ../../include/openssl/err.h 262hw_4758_cca.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
248hw_4758_cca.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h 263hw_4758_cca.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h
264hw_4758_cca.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
265hw_4758_cca.o: ../../include/openssl/err.h ../../include/openssl/evp.h
266hw_4758_cca.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
267hw_4758_cca.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
268hw_4758_cca.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
249hw_4758_cca.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 269hw_4758_cca.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
250hw_4758_cca.o: ../../include/openssl/opensslconf.h 270hw_4758_cca.o: ../../include/openssl/opensslconf.h
251hw_4758_cca.o: ../../include/openssl/opensslv.h 271hw_4758_cca.o: ../../include/openssl/opensslv.h
252hw_4758_cca.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h 272hw_4758_cca.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
253hw_4758_cca.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h 273hw_4758_cca.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
274hw_4758_cca.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
275hw_4758_cca.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
254hw_4758_cca.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 276hw_4758_cca.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
255hw_4758_cca.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 277hw_4758_cca.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
256hw_4758_cca.o: ../../include/openssl/ui.h ../../include/openssl/x509.h 278hw_4758_cca.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
257hw_4758_cca.o: ../../include/openssl/x509_vfy.h ../cryptlib.h hw_4758_cca.c 279hw_4758_cca.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
258hw_4758_cca.o: hw_4758_cca_err.c hw_4758_cca_err.h vendor_defns/hw_4758_cca.h 280hw_4758_cca.o: ../cryptlib.h hw_4758_cca.c hw_4758_cca_err.c hw_4758_cca_err.h
281hw_4758_cca.o: vendor_defns/hw_4758_cca.h
259hw_aep.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 282hw_aep.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
260hw_aep.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h 283hw_aep.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
261hw_aep.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 284hw_aep.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
262hw_aep.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h 285hw_aep.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h
263hw_aep.o: ../../include/openssl/engine.h ../../include/openssl/err.h 286hw_aep.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
264hw_aep.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 287hw_aep.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
265hw_aep.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 288hw_aep.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
266hw_aep.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h 289hw_aep.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
267hw_aep.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 290hw_aep.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
268hw_aep.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h hw_aep.c 291hw_aep.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
269hw_aep.o: hw_aep_err.c hw_aep_err.h vendor_defns/aep.h 292hw_aep.o: ../../include/openssl/ui.h hw_aep.c hw_aep_err.c hw_aep_err.h
293hw_aep.o: vendor_defns/aep.h
270hw_atalla.o: ../../e_os.h ../../include/openssl/asn1.h 294hw_atalla.o: ../../e_os.h ../../include/openssl/asn1.h
271hw_atalla.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 295hw_atalla.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
272hw_atalla.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 296hw_atalla.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -293,24 +317,31 @@ hw_cswift.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
293hw_cswift.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 317hw_cswift.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
294hw_cswift.o: ../cryptlib.h hw_cswift.c hw_cswift_err.c hw_cswift_err.h 318hw_cswift.o: ../cryptlib.h hw_cswift.c hw_cswift_err.c hw_cswift_err.h
295hw_cswift.o: vendor_defns/cswift.h 319hw_cswift.o: vendor_defns/cswift.h
296hw_ncipher.o: ../../e_os.h ../../include/openssl/asn1.h 320hw_ncipher.o: ../../e_os.h ../../include/openssl/aes.h
297hw_ncipher.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 321hw_ncipher.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
298hw_ncipher.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 322hw_ncipher.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
299hw_ncipher.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 323hw_ncipher.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
300hw_ncipher.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h 324hw_ncipher.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
301hw_ncipher.o: ../../include/openssl/engine.h ../../include/openssl/err.h 325hw_ncipher.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
302hw_ncipher.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h 326hw_ncipher.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h
327hw_ncipher.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
328hw_ncipher.o: ../../include/openssl/err.h ../../include/openssl/evp.h
329hw_ncipher.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
330hw_ncipher.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
331hw_ncipher.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
303hw_ncipher.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 332hw_ncipher.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
304hw_ncipher.o: ../../include/openssl/opensslconf.h 333hw_ncipher.o: ../../include/openssl/opensslconf.h
305hw_ncipher.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 334hw_ncipher.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
306hw_ncipher.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h 335hw_ncipher.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
307hw_ncipher.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h 336hw_ncipher.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
337hw_ncipher.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
338hw_ncipher.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
308hw_ncipher.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h 339hw_ncipher.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
309hw_ncipher.o: ../../include/openssl/sha.h ../../include/openssl/stack.h 340hw_ncipher.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
310hw_ncipher.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 341hw_ncipher.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
311hw_ncipher.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h 342hw_ncipher.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
312hw_ncipher.o: ../cryptlib.h hw_ncipher.c hw_ncipher_err.c hw_ncipher_err.h 343hw_ncipher.o: ../../include/openssl/x509_vfy.h ../cryptlib.h hw_ncipher.c
313hw_ncipher.o: vendor_defns/hwcryptohook.h 344hw_ncipher.o: hw_ncipher_err.c hw_ncipher_err.h vendor_defns/hwcryptohook.h
314hw_nuron.o: ../../e_os.h ../../include/openssl/asn1.h 345hw_nuron.o: ../../e_os.h ../../include/openssl/asn1.h
315hw_nuron.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 346hw_nuron.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
316hw_nuron.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 347hw_nuron.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -323,47 +354,71 @@ hw_nuron.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
323hw_nuron.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 354hw_nuron.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
324hw_nuron.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 355hw_nuron.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
325hw_nuron.o: ../cryptlib.h hw_nuron.c hw_nuron_err.c hw_nuron_err.h 356hw_nuron.o: ../cryptlib.h hw_nuron.c hw_nuron_err.c hw_nuron_err.h
357hw_cryptodev.o: ../../include/openssl/aes.h
326hw_cryptodev.o: ../../include/openssl/asn1.h 358hw_cryptodev.o: ../../include/openssl/asn1.h
327hw_cryptodev.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 359hw_cryptodev.o: ../../include/openssl/bio.h
360hw_cryptodev.o: ../../include/openssl/blowfish.h
361hw_cryptodev.o: ../../include/openssl/bn.h
362hw_cryptodev.o: ../../include/openssl/cast.h
328hw_cryptodev.o: ../../include/openssl/conf.h 363hw_cryptodev.o: ../../include/openssl/conf.h
329hw_cryptodev.o: ../../include/openssl/crypto.h 364hw_cryptodev.o: ../../include/openssl/crypto.h
365hw_cryptodev.o: ../../include/openssl/des.h
366hw_cryptodev.o: ../../include/openssl/des_old.h
330hw_cryptodev.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 367hw_cryptodev.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
331hw_cryptodev.o: ../../include/openssl/e_os2.h 368hw_cryptodev.o: ../../include/openssl/e_os2.h
332hw_cryptodev.o: ../../include/openssl/engine.h 369hw_cryptodev.o: ../../include/openssl/engine.h
333hw_cryptodev.o: ../../include/openssl/err.h 370hw_cryptodev.o: ../../include/openssl/err.h
334hw_cryptodev.o: ../../include/openssl/evp.h 371hw_cryptodev.o: ../../include/openssl/evp.h
372hw_cryptodev.o: ../../include/openssl/idea.h
335hw_cryptodev.o: ../../include/openssl/lhash.h 373hw_cryptodev.o: ../../include/openssl/lhash.h
374hw_cryptodev.o: ../../include/openssl/md2.h
375hw_cryptodev.o: ../../include/openssl/md4.h
376hw_cryptodev.o: ../../include/openssl/md5.h
377hw_cryptodev.o: ../../include/openssl/mdc2.h
336hw_cryptodev.o: ../../include/openssl/obj_mac.h 378hw_cryptodev.o: ../../include/openssl/obj_mac.h
337hw_cryptodev.o: ../../include/openssl/objects.h 379hw_cryptodev.o: ../../include/openssl/objects.h
338hw_cryptodev.o: ../../include/openssl/opensslconf.h 380hw_cryptodev.o: ../../include/openssl/opensslconf.h
339hw_cryptodev.o: ../../include/openssl/opensslv.h 381hw_cryptodev.o: ../../include/openssl/opensslv.h
340hw_cryptodev.o: ../../include/openssl/ossl_typ.h 382hw_cryptodev.o: ../../include/openssl/ossl_typ.h
341hw_cryptodev.o: ../../include/openssl/rand.h 383hw_cryptodev.o: ../../include/openssl/rand.h
384hw_cryptodev.o: ../../include/openssl/rc2.h
385hw_cryptodev.o: ../../include/openssl/rc4.h
386hw_cryptodev.o: ../../include/openssl/rc5.h
387hw_cryptodev.o: ../../include/openssl/ripemd.h
342hw_cryptodev.o: ../../include/openssl/rsa.h 388hw_cryptodev.o: ../../include/openssl/rsa.h
343hw_cryptodev.o: ../../include/openssl/safestack.h 389hw_cryptodev.o: ../../include/openssl/safestack.h
390hw_cryptodev.o: ../../include/openssl/sha.h
344hw_cryptodev.o: ../../include/openssl/stack.h 391hw_cryptodev.o: ../../include/openssl/stack.h
345hw_cryptodev.o: ../../include/openssl/symhacks.h 392hw_cryptodev.o: ../../include/openssl/symhacks.h
346hw_cryptodev.o: ../../include/openssl/ui.h ../evp/evp_locl.h eng_int.h 393hw_cryptodev.o: ../../include/openssl/ui.h
347hw_cryptodev.o: hw_cryptodev.c 394hw_cryptodev.o: ../../include/openssl/ui_compat.h ../evp/evp_locl.h
348hw_sureware.o: ../../e_os.h ../../include/openssl/asn1.h 395hw_cryptodev.o: eng_int.h hw_cryptodev.c
349hw_sureware.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 396hw_sureware.o: ../../e_os.h ../../include/openssl/aes.h
350hw_sureware.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 397hw_sureware.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
351hw_sureware.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 398hw_sureware.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
352hw_sureware.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h 399hw_sureware.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
353hw_sureware.o: ../../include/openssl/engine.h ../../include/openssl/err.h 400hw_sureware.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
354hw_sureware.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h 401hw_sureware.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
402hw_sureware.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h
403hw_sureware.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
404hw_sureware.o: ../../include/openssl/err.h ../../include/openssl/evp.h
405hw_sureware.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
406hw_sureware.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
407hw_sureware.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
355hw_sureware.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h 408hw_sureware.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
356hw_sureware.o: ../../include/openssl/opensslconf.h 409hw_sureware.o: ../../include/openssl/opensslconf.h
357hw_sureware.o: ../../include/openssl/opensslv.h 410hw_sureware.o: ../../include/openssl/opensslv.h
358hw_sureware.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h 411hw_sureware.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h
359hw_sureware.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h 412hw_sureware.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
360hw_sureware.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h 413hw_sureware.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
414hw_sureware.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
415hw_sureware.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
361hw_sureware.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 416hw_sureware.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
362hw_sureware.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h 417hw_sureware.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
363hw_sureware.o: ../../include/openssl/ui.h ../../include/openssl/x509.h 418hw_sureware.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
364hw_sureware.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h 419hw_sureware.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
365hw_sureware.o: engine.h hw_sureware.c hw_sureware_err.c hw_sureware_err.h 420hw_sureware.o: ../cryptlib.h eng_int.h engine.h hw_sureware.c hw_sureware_err.c
366hw_sureware.o: vendor_defns/sureware.h 421hw_sureware.o: hw_sureware_err.h vendor_defns/sureware.h
367hw_ubsec.o: ../../e_os.h ../../include/openssl/asn1.h 422hw_ubsec.o: ../../e_os.h ../../include/openssl/asn1.h
368hw_ubsec.o: ../../include/openssl/bio.h ../../include/openssl/bn.h 423hw_ubsec.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
369hw_ubsec.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h 424hw_ubsec.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -377,77 +432,125 @@ hw_ubsec.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
377hw_ubsec.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 432hw_ubsec.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
378hw_ubsec.o: ../cryptlib.h hw_ubsec.c hw_ubsec_err.c hw_ubsec_err.h 433hw_ubsec.o: ../cryptlib.h hw_ubsec.c hw_ubsec_err.c hw_ubsec_err.h
379hw_ubsec.o: vendor_defns/hw_ubsec.h 434hw_ubsec.o: vendor_defns/hw_ubsec.h
380tb_cipher.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 435tb_cipher.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
381tb_cipher.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h 436tb_cipher.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
382tb_cipher.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 437tb_cipher.o: ../../include/openssl/bn.h ../../include/openssl/cast.h
383tb_cipher.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h 438tb_cipher.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
384tb_cipher.o: ../../include/openssl/err.h ../../include/openssl/evp.h 439tb_cipher.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
385tb_cipher.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h 440tb_cipher.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
441tb_cipher.o: ../../include/openssl/engine.h ../../include/openssl/err.h
442tb_cipher.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
443tb_cipher.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
444tb_cipher.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
445tb_cipher.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
386tb_cipher.o: ../../include/openssl/objects.h 446tb_cipher.o: ../../include/openssl/objects.h
387tb_cipher.o: ../../include/openssl/opensslconf.h 447tb_cipher.o: ../../include/openssl/opensslconf.h
388tb_cipher.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 448tb_cipher.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
389tb_cipher.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h 449tb_cipher.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
390tb_cipher.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 450tb_cipher.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
391tb_cipher.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 451tb_cipher.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
452tb_cipher.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
453tb_cipher.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
454tb_cipher.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
392tb_cipher.o: eng_int.h tb_cipher.c 455tb_cipher.o: eng_int.h tb_cipher.c
393tb_dh.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 456tb_dh.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
394tb_dh.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h 457tb_dh.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
395tb_dh.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 458tb_dh.o: ../../include/openssl/bn.h ../../include/openssl/cast.h
396tb_dh.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h 459tb_dh.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
397tb_dh.o: ../../include/openssl/err.h ../../include/openssl/evp.h 460tb_dh.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
398tb_dh.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h 461tb_dh.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
462tb_dh.o: ../../include/openssl/engine.h ../../include/openssl/err.h
463tb_dh.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
464tb_dh.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
465tb_dh.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
466tb_dh.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
399tb_dh.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 467tb_dh.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
400tb_dh.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 468tb_dh.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
401tb_dh.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h 469tb_dh.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
402tb_dh.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 470tb_dh.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
403tb_dh.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h eng_int.h 471tb_dh.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
472tb_dh.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
473tb_dh.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
474tb_dh.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h eng_int.h
404tb_dh.o: tb_dh.c 475tb_dh.o: tb_dh.c
405tb_digest.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 476tb_digest.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
406tb_digest.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h 477tb_digest.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
407tb_digest.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 478tb_digest.o: ../../include/openssl/bn.h ../../include/openssl/cast.h
408tb_digest.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h 479tb_digest.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
409tb_digest.o: ../../include/openssl/err.h ../../include/openssl/evp.h 480tb_digest.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
410tb_digest.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h 481tb_digest.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
482tb_digest.o: ../../include/openssl/engine.h ../../include/openssl/err.h
483tb_digest.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
484tb_digest.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
485tb_digest.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
486tb_digest.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
411tb_digest.o: ../../include/openssl/objects.h 487tb_digest.o: ../../include/openssl/objects.h
412tb_digest.o: ../../include/openssl/opensslconf.h 488tb_digest.o: ../../include/openssl/opensslconf.h
413tb_digest.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 489tb_digest.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
414tb_digest.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h 490tb_digest.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
415tb_digest.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 491tb_digest.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
416tb_digest.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 492tb_digest.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
493tb_digest.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
494tb_digest.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
495tb_digest.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
417tb_digest.o: eng_int.h tb_digest.c 496tb_digest.o: eng_int.h tb_digest.c
418tb_dsa.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 497tb_dsa.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
419tb_dsa.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h 498tb_dsa.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
420tb_dsa.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 499tb_dsa.o: ../../include/openssl/bn.h ../../include/openssl/cast.h
421tb_dsa.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h 500tb_dsa.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
422tb_dsa.o: ../../include/openssl/err.h ../../include/openssl/evp.h 501tb_dsa.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
423tb_dsa.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h 502tb_dsa.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
503tb_dsa.o: ../../include/openssl/engine.h ../../include/openssl/err.h
504tb_dsa.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
505tb_dsa.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
506tb_dsa.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
507tb_dsa.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
424tb_dsa.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 508tb_dsa.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
425tb_dsa.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 509tb_dsa.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
426tb_dsa.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h 510tb_dsa.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
427tb_dsa.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 511tb_dsa.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
428tb_dsa.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h eng_int.h 512tb_dsa.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
429tb_dsa.o: tb_dsa.c 513tb_dsa.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
430tb_rand.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 514tb_dsa.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
431tb_rand.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h 515tb_dsa.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
432tb_rand.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 516tb_dsa.o: eng_int.h tb_dsa.c
433tb_rand.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h 517tb_rand.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
434tb_rand.o: ../../include/openssl/err.h ../../include/openssl/evp.h 518tb_rand.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
435tb_rand.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h 519tb_rand.o: ../../include/openssl/bn.h ../../include/openssl/cast.h
520tb_rand.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
521tb_rand.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
522tb_rand.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
523tb_rand.o: ../../include/openssl/engine.h ../../include/openssl/err.h
524tb_rand.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
525tb_rand.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
526tb_rand.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
527tb_rand.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
436tb_rand.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 528tb_rand.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
437tb_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 529tb_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
438tb_rand.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h 530tb_rand.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
439tb_rand.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 531tb_rand.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
440tb_rand.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h 532tb_rand.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
533tb_rand.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
534tb_rand.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
535tb_rand.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
441tb_rand.o: eng_int.h tb_rand.c 536tb_rand.o: eng_int.h tb_rand.c
442tb_rsa.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h 537tb_rsa.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
443tb_rsa.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h 538tb_rsa.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
444tb_rsa.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h 539tb_rsa.o: ../../include/openssl/bn.h ../../include/openssl/cast.h
445tb_rsa.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h 540tb_rsa.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
446tb_rsa.o: ../../include/openssl/err.h ../../include/openssl/evp.h 541tb_rsa.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
447tb_rsa.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h 542tb_rsa.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
543tb_rsa.o: ../../include/openssl/engine.h ../../include/openssl/err.h
544tb_rsa.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
545tb_rsa.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
546tb_rsa.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
547tb_rsa.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
448tb_rsa.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 548tb_rsa.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
449tb_rsa.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h 549tb_rsa.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
450tb_rsa.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h 550tb_rsa.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
451tb_rsa.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h 551tb_rsa.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
452tb_rsa.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h eng_int.h 552tb_rsa.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
453tb_rsa.o: tb_rsa.c 553tb_rsa.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
554tb_rsa.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
555tb_rsa.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
556tb_rsa.o: eng_int.h tb_rsa.c
diff --git a/src/lib/libcrypto/engine/eng_cnf.c b/src/lib/libcrypto/engine/eng_cnf.c
index 8c0ae8a1ad..cdf670901a 100644
--- a/src/lib/libcrypto/engine/eng_cnf.c
+++ b/src/lib/libcrypto/engine/eng_cnf.c
@@ -92,7 +92,7 @@ static int int_engine_init(ENGINE *e)
92 } 92 }
93 93
94 94
95int int_engine_configure(char *name, char *value, const CONF *cnf) 95static int int_engine_configure(char *name, char *value, const CONF *cnf)
96 { 96 {
97 int i; 97 int i;
98 int ret = 0; 98 int ret = 0;
diff --git a/src/lib/libcrypto/engine/eng_dyn.c b/src/lib/libcrypto/engine/eng_dyn.c
index 4fefcc0cae..4139a16e76 100644
--- a/src/lib/libcrypto/engine/eng_dyn.c
+++ b/src/lib/libcrypto/engine/eng_dyn.c
@@ -157,6 +157,10 @@ static void dynamic_data_ctx_free_func(void *parent, void *ptr,
157 dynamic_data_ctx *ctx = (dynamic_data_ctx *)ptr; 157 dynamic_data_ctx *ctx = (dynamic_data_ctx *)ptr;
158 if(ctx->dynamic_dso) 158 if(ctx->dynamic_dso)
159 DSO_free(ctx->dynamic_dso); 159 DSO_free(ctx->dynamic_dso);
160 if(ctx->DYNAMIC_LIBNAME)
161 OPENSSL_free((void*)ctx->DYNAMIC_LIBNAME);
162 if(ctx->engine_id)
163 OPENSSL_free((void*)ctx->engine_id);
160 OPENSSL_free(ctx); 164 OPENSSL_free(ctx);
161 } 165 }
162 } 166 }
@@ -169,7 +173,7 @@ static int dynamic_set_data_ctx(ENGINE *e, dynamic_data_ctx **ctx)
169 { 173 {
170 dynamic_data_ctx *c; 174 dynamic_data_ctx *c;
171 c = OPENSSL_malloc(sizeof(dynamic_data_ctx)); 175 c = OPENSSL_malloc(sizeof(dynamic_data_ctx));
172 if(!ctx) 176 if(!c)
173 { 177 {
174 ENGINEerr(ENGINE_F_SET_DATA_CTX,ERR_R_MALLOC_FAILURE); 178 ENGINEerr(ENGINE_F_SET_DATA_CTX,ERR_R_MALLOC_FAILURE);
175 return 0; 179 return 0;
@@ -310,8 +314,13 @@ static int dynamic_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
310 /* a NULL 'p' or a string of zero-length is the same thing */ 314 /* a NULL 'p' or a string of zero-length is the same thing */
311 if(p && (strlen((const char *)p) < 1)) 315 if(p && (strlen((const char *)p) < 1))
312 p = NULL; 316 p = NULL;
313 ctx->DYNAMIC_LIBNAME = (const char *)p; 317 if(ctx->DYNAMIC_LIBNAME)
314 return 1; 318 OPENSSL_free((void*)ctx->DYNAMIC_LIBNAME);
319 if(p)
320 ctx->DYNAMIC_LIBNAME = BUF_strdup(p);
321 else
322 ctx->DYNAMIC_LIBNAME = NULL;
323 return (ctx->DYNAMIC_LIBNAME ? 1 : 0);
315 case DYNAMIC_CMD_NO_VCHECK: 324 case DYNAMIC_CMD_NO_VCHECK:
316 ctx->no_vcheck = ((i == 0) ? 0 : 1); 325 ctx->no_vcheck = ((i == 0) ? 0 : 1);
317 return 1; 326 return 1;
@@ -319,8 +328,13 @@ static int dynamic_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
319 /* a NULL 'p' or a string of zero-length is the same thing */ 328 /* a NULL 'p' or a string of zero-length is the same thing */
320 if(p && (strlen((const char *)p) < 1)) 329 if(p && (strlen((const char *)p) < 1))
321 p = NULL; 330 p = NULL;
322 ctx->engine_id = (const char *)p; 331 if(ctx->engine_id)
323 return 1; 332 OPENSSL_free((void*)ctx->engine_id);
333 if(p)
334 ctx->engine_id = BUF_strdup(p);
335 else
336 ctx->engine_id = NULL;
337 return (ctx->engine_id ? 1 : 0);
324 case DYNAMIC_CMD_LIST_ADD: 338 case DYNAMIC_CMD_LIST_ADD:
325 if((i < 0) || (i > 2)) 339 if((i < 0) || (i > 2))
326 { 340 {
diff --git a/src/lib/libcrypto/engine/eng_fat.c b/src/lib/libcrypto/engine/eng_fat.c
index d49aa7ed40..f7edb5ad32 100644
--- a/src/lib/libcrypto/engine/eng_fat.c
+++ b/src/lib/libcrypto/engine/eng_fat.c
@@ -84,7 +84,7 @@ int ENGINE_set_default(ENGINE *e, unsigned int flags)
84 84
85/* Set default algorithms using a string */ 85/* Set default algorithms using a string */
86 86
87int int_def_cb(const char *alg, int len, void *arg) 87static int int_def_cb(const char *alg, int len, void *arg)
88 { 88 {
89 unsigned int *pflags = arg; 89 unsigned int *pflags = arg;
90 if (!strncmp(alg, "ALL", len)) 90 if (!strncmp(alg, "ALL", len))
diff --git a/src/lib/libcrypto/engine/hw_4758_cca.c b/src/lib/libcrypto/engine/hw_4758_cca.c
index 0ca2f920dc..f404b1a3b8 100644
--- a/src/lib/libcrypto/engine/hw_4758_cca.c
+++ b/src/lib/libcrypto/engine/hw_4758_cca.c
@@ -124,8 +124,24 @@ static F_RANDOMNUMBERGENERATE randomNumberGenerate;
124 124
125/* static variables */ 125/* static variables */
126/*------------------*/ 126/*------------------*/
127static const char def_CCA4758_LIB_NAME[] = CCA_LIB_NAME; 127static const char *CCA4758_LIB_NAME = NULL;
128static const char *CCA4758_LIB_NAME = def_CCA4758_LIB_NAME; 128static const char *get_CCA4758_LIB_NAME(void)
129 {
130 if(CCA4758_LIB_NAME)
131 return CCA4758_LIB_NAME;
132 return CCA_LIB_NAME;
133 }
134static void free_CCA4758_LIB_NAME(void)
135 {
136 if(CCA4758_LIB_NAME)
137 OPENSSL_free((void*)CCA4758_LIB_NAME);
138 CCA4758_LIB_NAME = NULL;
139 }
140static long set_CCA4758_LIB_NAME(const char *name)
141 {
142 free_CCA4758_LIB_NAME();
143 return (((CCA4758_LIB_NAME = BUF_strdup(name)) != NULL) ? 1 : 0);
144 }
129#ifndef OPENSSL_NO_RSA 145#ifndef OPENSSL_NO_RSA
130static const char* n_keyRecordRead = CSNDKRR; 146static const char* n_keyRecordRead = CSNDKRR;
131static const char* n_digitalSignatureGenerate = CSNDDSG; 147static const char* n_digitalSignatureGenerate = CSNDDSG;
@@ -232,6 +248,7 @@ void ENGINE_load_4758cca(void)
232static int ibm_4758_cca_destroy(ENGINE *e) 248static int ibm_4758_cca_destroy(ENGINE *e)
233 { 249 {
234 ERR_unload_CCA4758_strings(); 250 ERR_unload_CCA4758_strings();
251 free_CCA4758_LIB_NAME();
235 return 1; 252 return 1;
236 } 253 }
237 254
@@ -243,7 +260,7 @@ static int ibm_4758_cca_init(ENGINE *e)
243 goto err; 260 goto err;
244 } 261 }
245 262
246 dso = DSO_load(NULL, CCA4758_LIB_NAME , NULL, 0); 263 dso = DSO_load(NULL, get_CCA4758_LIB_NAME(), NULL, 0);
247 if(!dso) 264 if(!dso)
248 { 265 {
249 CCA4758err(CCA4758_F_IBM_4758_CCA_INIT,CCA4758_R_DSO_FAILURE); 266 CCA4758err(CCA4758_F_IBM_4758_CCA_INIT,CCA4758_R_DSO_FAILURE);
@@ -299,7 +316,8 @@ err:
299 316
300static int ibm_4758_cca_finish(ENGINE *e) 317static int ibm_4758_cca_finish(ENGINE *e)
301 { 318 {
302 if(dso) 319 free_CCA4758_LIB_NAME();
320 if(!dso)
303 { 321 {
304 CCA4758err(CCA4758_F_IBM_4758_CCA_FINISH, 322 CCA4758err(CCA4758_F_IBM_4758_CCA_FINISH,
305 CCA4758_R_NOT_LOADED); 323 CCA4758_R_NOT_LOADED);
@@ -340,8 +358,7 @@ static int ibm_4758_cca_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
340 CCA4758_R_ALREADY_LOADED); 358 CCA4758_R_ALREADY_LOADED);
341 return 0; 359 return 0;
342 } 360 }
343 CCA4758_LIB_NAME = (const char *)p; 361 return set_CCA4758_LIB_NAME((const char *)p);
344 return 1;
345 default: 362 default:
346 break; 363 break;
347 } 364 }
diff --git a/src/lib/libcrypto/engine/hw_aep.c b/src/lib/libcrypto/engine/hw_aep.c
index cf4507cff1..8b8380a582 100644
--- a/src/lib/libcrypto/engine/hw_aep.c
+++ b/src/lib/libcrypto/engine/hw_aep.c
@@ -60,7 +60,7 @@
60#include <string.h> 60#include <string.h>
61 61
62#include <openssl/e_os2.h> 62#include <openssl/e_os2.h>
63#ifndef OPENSSL_SYS_MSDOS 63#if !defined(OPENSSL_SYS_MSDOS) || defined(__DJGPP__)
64#include <sys/types.h> 64#include <sys/types.h>
65#include <unistd.h> 65#include <unistd.h>
66#else 66#else
@@ -71,6 +71,7 @@ typedef int pid_t;
71#include <openssl/crypto.h> 71#include <openssl/crypto.h>
72#include <openssl/dso.h> 72#include <openssl/dso.h>
73#include <openssl/engine.h> 73#include <openssl/engine.h>
74#include <openssl/buffer.h>
74 75
75#ifndef OPENSSL_NO_HW 76#ifndef OPENSSL_NO_HW
76#ifndef OPENSSL_NO_HW_AEP 77#ifndef OPENSSL_NO_HW_AEP
@@ -363,7 +364,24 @@ static DSO *aep_dso = NULL;
363/* These are the static string constants for the DSO file name and the function 364/* These are the static string constants for the DSO file name and the function
364 * symbol names to bind to. 365 * symbol names to bind to.
365*/ 366*/
366static const char *AEP_LIBNAME = "aep"; 367static const char *AEP_LIBNAME = NULL;
368static const char *get_AEP_LIBNAME(void)
369 {
370 if(AEP_LIBNAME)
371 return AEP_LIBNAME;
372 return "aep";
373 }
374static void free_AEP_LIBNAME(void)
375 {
376 if(AEP_LIBNAME)
377 OPENSSL_free((void*)AEP_LIBNAME);
378 AEP_LIBNAME = NULL;
379 }
380static long set_AEP_LIBNAME(const char *name)
381 {
382 free_AEP_LIBNAME();
383 return ((AEP_LIBNAME = BUF_strdup(name)) != NULL ? 1 : 0);
384 }
367 385
368static const char *AEP_F1 = "AEP_ModExp"; 386static const char *AEP_F1 = "AEP_ModExp";
369static const char *AEP_F2 = "AEP_ModExpCrt"; 387static const char *AEP_F2 = "AEP_ModExpCrt";
@@ -412,7 +430,7 @@ static int aep_init(ENGINE *e)
412 } 430 }
413 /* Attempt to load libaep.so. */ 431 /* Attempt to load libaep.so. */
414 432
415 aep_dso = DSO_load(NULL, AEP_LIBNAME, NULL, 0); 433 aep_dso = DSO_load(NULL, get_AEP_LIBNAME(), NULL, 0);
416 434
417 if(aep_dso == NULL) 435 if(aep_dso == NULL)
418 { 436 {
@@ -474,6 +492,7 @@ static int aep_init(ENGINE *e)
474/* Destructor (complements the "ENGINE_aep()" constructor) */ 492/* Destructor (complements the "ENGINE_aep()" constructor) */
475static int aep_destroy(ENGINE *e) 493static int aep_destroy(ENGINE *e)
476 { 494 {
495 free_AEP_LIBNAME();
477 ERR_unload_AEPHK_strings(); 496 ERR_unload_AEPHK_strings();
478 return 1; 497 return 1;
479 } 498 }
@@ -549,8 +568,7 @@ static int aep_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
549 AEPHK_R_ALREADY_LOADED); 568 AEPHK_R_ALREADY_LOADED);
550 return 0; 569 return 0;
551 } 570 }
552 AEP_LIBNAME = (const char *)p; 571 return set_AEP_LIBNAME((const char*)p);
553 return 1;
554 default: 572 default:
555 break; 573 break;
556 } 574 }
diff --git a/src/lib/libcrypto/engine/hw_atalla.c b/src/lib/libcrypto/engine/hw_atalla.c
index 696cfcf156..6151c46902 100644
--- a/src/lib/libcrypto/engine/hw_atalla.c
+++ b/src/lib/libcrypto/engine/hw_atalla.c
@@ -286,8 +286,24 @@ static tfnASI_GetPerformanceStatistics *p_Atalla_GetPerformanceStatistics = NULL
286 * atasi.dll on win32). For the purposes of testing, I have created a symbollic 286 * atasi.dll on win32). For the purposes of testing, I have created a symbollic
287 * link called "libatasi.so" so that we can use native name-translation - a 287 * link called "libatasi.so" so that we can use native name-translation - a
288 * better solution will be needed. */ 288 * better solution will be needed. */
289static const char def_ATALLA_LIBNAME[] = "atasi"; 289static const char *ATALLA_LIBNAME = NULL;
290static const char *ATALLA_LIBNAME = def_ATALLA_LIBNAME; 290static const char *get_ATALLA_LIBNAME(void)
291 {
292 if(ATALLA_LIBNAME)
293 return ATALLA_LIBNAME;
294 return "atasi";
295 }
296static void free_ATALLA_LIBNAME(void)
297 {
298 if(ATALLA_LIBNAME)
299 OPENSSL_free((void*)ATALLA_LIBNAME);
300 ATALLA_LIBNAME = NULL;
301 }
302static long set_ATALLA_LIBNAME(const char *name)
303 {
304 free_ATALLA_LIBNAME();
305 return (((ATALLA_LIBNAME = BUF_strdup(name)) != NULL) ? 1 : 0);
306 }
291static const char *ATALLA_F1 = "ASI_GetHardwareConfig"; 307static const char *ATALLA_F1 = "ASI_GetHardwareConfig";
292static const char *ATALLA_F2 = "ASI_RSAPrivateKeyOpFn"; 308static const char *ATALLA_F2 = "ASI_RSAPrivateKeyOpFn";
293static const char *ATALLA_F3 = "ASI_GetPerformanceStatistics"; 309static const char *ATALLA_F3 = "ASI_GetPerformanceStatistics";
@@ -295,6 +311,7 @@ static const char *ATALLA_F3 = "ASI_GetPerformanceStatistics";
295/* Destructor (complements the "ENGINE_atalla()" constructor) */ 311/* Destructor (complements the "ENGINE_atalla()" constructor) */
296static int atalla_destroy(ENGINE *e) 312static int atalla_destroy(ENGINE *e)
297 { 313 {
314 free_ATALLA_LIBNAME();
298 /* Unload the atalla error strings so any error state including our 315 /* Unload the atalla error strings so any error state including our
299 * functs or reasons won't lead to a segfault (they simply get displayed 316 * functs or reasons won't lead to a segfault (they simply get displayed
300 * without corresponding string data because none will be found). */ 317 * without corresponding string data because none will be found). */
@@ -324,7 +341,7 @@ static int atalla_init(ENGINE *e)
324 * drivers really use - for now a symbollic link needs to be 341 * drivers really use - for now a symbollic link needs to be
325 * created on the host system from libatasi.so to atasi.so on 342 * created on the host system from libatasi.so to atasi.so on
326 * unix variants. */ 343 * unix variants. */
327 atalla_dso = DSO_load(NULL, ATALLA_LIBNAME, NULL, 0); 344 atalla_dso = DSO_load(NULL, get_ATALLA_LIBNAME(), NULL, 0);
328 if(atalla_dso == NULL) 345 if(atalla_dso == NULL)
329 { 346 {
330 ATALLAerr(ATALLA_F_ATALLA_INIT,ATALLA_R_NOT_LOADED); 347 ATALLAerr(ATALLA_F_ATALLA_INIT,ATALLA_R_NOT_LOADED);
@@ -364,6 +381,7 @@ err:
364 381
365static int atalla_finish(ENGINE *e) 382static int atalla_finish(ENGINE *e)
366 { 383 {
384 free_ATALLA_LIBNAME();
367 if(atalla_dso == NULL) 385 if(atalla_dso == NULL)
368 { 386 {
369 ATALLAerr(ATALLA_F_ATALLA_FINISH,ATALLA_R_NOT_LOADED); 387 ATALLAerr(ATALLA_F_ATALLA_FINISH,ATALLA_R_NOT_LOADED);
@@ -397,8 +415,7 @@ static int atalla_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
397 ATALLAerr(ATALLA_F_ATALLA_CTRL,ATALLA_R_ALREADY_LOADED); 415 ATALLAerr(ATALLA_F_ATALLA_CTRL,ATALLA_R_ALREADY_LOADED);
398 return 0; 416 return 0;
399 } 417 }
400 ATALLA_LIBNAME = (const char *)p; 418 return set_ATALLA_LIBNAME((const char *)p);
401 return 1;
402 default: 419 default:
403 break; 420 break;
404 } 421 }
diff --git a/src/lib/libcrypto/engine/hw_cswift.c b/src/lib/libcrypto/engine/hw_cswift.c
index da732abce0..f5c897bdbb 100644
--- a/src/lib/libcrypto/engine/hw_cswift.c
+++ b/src/lib/libcrypto/engine/hw_cswift.c
@@ -280,8 +280,24 @@ t_swSimpleRequest *p_CSwift_SimpleRequest = NULL;
280t_swReleaseAccContext *p_CSwift_ReleaseAccContext = NULL; 280t_swReleaseAccContext *p_CSwift_ReleaseAccContext = NULL;
281 281
282/* Used in the DSO operations. */ 282/* Used in the DSO operations. */
283static const char def_CSWIFT_LIBNAME[] = "swift"; 283static const char *CSWIFT_LIBNAME = NULL;
284static const char *CSWIFT_LIBNAME = def_CSWIFT_LIBNAME; 284static const char *get_CSWIFT_LIBNAME(void)
285 {
286 if(CSWIFT_LIBNAME)
287 return CSWIFT_LIBNAME;
288 return "swift";
289 }
290static void free_CSWIFT_LIBNAME(void)
291 {
292 if(CSWIFT_LIBNAME)
293 OPENSSL_free((void*)CSWIFT_LIBNAME);
294 CSWIFT_LIBNAME = NULL;
295 }
296static long set_CSWIFT_LIBNAME(const char *name)
297 {
298 free_CSWIFT_LIBNAME();
299 return (((CSWIFT_LIBNAME = BUF_strdup(name)) != NULL) ? 1 : 0);
300 }
285static const char *CSWIFT_F1 = "swAcquireAccContext"; 301static const char *CSWIFT_F1 = "swAcquireAccContext";
286static const char *CSWIFT_F2 = "swAttachKeyParam"; 302static const char *CSWIFT_F2 = "swAttachKeyParam";
287static const char *CSWIFT_F3 = "swSimpleRequest"; 303static const char *CSWIFT_F3 = "swSimpleRequest";
@@ -313,6 +329,7 @@ static void release_context(SW_CONTEXT_HANDLE hac)
313/* Destructor (complements the "ENGINE_cswift()" constructor) */ 329/* Destructor (complements the "ENGINE_cswift()" constructor) */
314static int cswift_destroy(ENGINE *e) 330static int cswift_destroy(ENGINE *e)
315 { 331 {
332 free_CSWIFT_LIBNAME();
316 ERR_unload_CSWIFT_strings(); 333 ERR_unload_CSWIFT_strings();
317 return 1; 334 return 1;
318 } 335 }
@@ -332,7 +349,7 @@ static int cswift_init(ENGINE *e)
332 goto err; 349 goto err;
333 } 350 }
334 /* Attempt to load libswift.so/swift.dll/whatever. */ 351 /* Attempt to load libswift.so/swift.dll/whatever. */
335 cswift_dso = DSO_load(NULL, CSWIFT_LIBNAME, NULL, 0); 352 cswift_dso = DSO_load(NULL, get_CSWIFT_LIBNAME(), NULL, 0);
336 if(cswift_dso == NULL) 353 if(cswift_dso == NULL)
337 { 354 {
338 CSWIFTerr(CSWIFT_F_CSWIFT_INIT,CSWIFT_R_NOT_LOADED); 355 CSWIFTerr(CSWIFT_F_CSWIFT_INIT,CSWIFT_R_NOT_LOADED);
@@ -377,6 +394,7 @@ err:
377 394
378static int cswift_finish(ENGINE *e) 395static int cswift_finish(ENGINE *e)
379 { 396 {
397 free_CSWIFT_LIBNAME();
380 if(cswift_dso == NULL) 398 if(cswift_dso == NULL)
381 { 399 {
382 CSWIFTerr(CSWIFT_F_CSWIFT_FINISH,CSWIFT_R_NOT_LOADED); 400 CSWIFTerr(CSWIFT_F_CSWIFT_FINISH,CSWIFT_R_NOT_LOADED);
@@ -411,8 +429,7 @@ static int cswift_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
411 CSWIFTerr(CSWIFT_F_CSWIFT_CTRL,CSWIFT_R_ALREADY_LOADED); 429 CSWIFTerr(CSWIFT_F_CSWIFT_CTRL,CSWIFT_R_ALREADY_LOADED);
412 return 0; 430 return 0;
413 } 431 }
414 CSWIFT_LIBNAME = (const char *)p; 432 return set_CSWIFT_LIBNAME((const char *)p);
415 return 1;
416 default: 433 default:
417 break; 434 break;
418 } 435 }
diff --git a/src/lib/libcrypto/engine/hw_ncipher.c b/src/lib/libcrypto/engine/hw_ncipher.c
index 4762a54e3d..a43d4360f2 100644
--- a/src/lib/libcrypto/engine/hw_ncipher.c
+++ b/src/lib/libcrypto/engine/hw_ncipher.c
@@ -59,9 +59,9 @@
59 59
60#include <stdio.h> 60#include <stdio.h>
61#include <string.h> 61#include <string.h>
62#include "cryptlib.h"
62#include <openssl/crypto.h> 63#include <openssl/crypto.h>
63#include <openssl/pem.h> 64#include <openssl/pem.h>
64#include "cryptlib.h"
65#include <openssl/dso.h> 65#include <openssl/dso.h>
66#include <openssl/engine.h> 66#include <openssl/engine.h>
67#include <openssl/ui.h> 67#include <openssl/ui.h>
@@ -109,11 +109,13 @@ static int hwcrhk_rsa_mod_exp(BIGNUM *r, const BIGNUM *I, RSA *rsa);
109static int hwcrhk_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, 109static int hwcrhk_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
110 const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx); 110 const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
111 111
112#ifndef OPENSSL_NO_DH
112/* DH stuff */ 113/* DH stuff */
113/* This function is alised to mod_exp (with the DH and mont dropped). */ 114/* This function is alised to mod_exp (with the DH and mont dropped). */
114static int hwcrhk_mod_exp_dh(const DH *dh, BIGNUM *r, 115static int hwcrhk_mod_exp_dh(const DH *dh, BIGNUM *r,
115 const BIGNUM *a, const BIGNUM *p, 116 const BIGNUM *a, const BIGNUM *p,
116 const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx); 117 const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
118#endif
117 119
118/* RAND stuff */ 120/* RAND stuff */
119static int hwcrhk_rand_bytes(unsigned char *buf, int num); 121static int hwcrhk_rand_bytes(unsigned char *buf, int num);
@@ -422,8 +424,24 @@ static HWCryptoHook_RSAUnloadKey_t *p_hwcrhk_RSAUnloadKey = NULL;
422static HWCryptoHook_ModExpCRT_t *p_hwcrhk_ModExpCRT = NULL; 424static HWCryptoHook_ModExpCRT_t *p_hwcrhk_ModExpCRT = NULL;
423 425
424/* Used in the DSO operations. */ 426/* Used in the DSO operations. */
425static const char def_HWCRHK_LIBNAME[] = "nfhwcrhk"; 427static const char *HWCRHK_LIBNAME = NULL;
426static const char *HWCRHK_LIBNAME = def_HWCRHK_LIBNAME; 428static void free_HWCRHK_LIBNAME(void)
429 {
430 if(HWCRHK_LIBNAME)
431 OPENSSL_free((void*)HWCRHK_LIBNAME);
432 HWCRHK_LIBNAME = NULL;
433 }
434static const char *get_HWCRHK_LIBNAME(void)
435 {
436 if(HWCRHK_LIBNAME)
437 return HWCRHK_LIBNAME;
438 return "nfhwcrhk";
439 }
440static long set_HWCRHK_LIBNAME(const char *name)
441 {
442 free_HWCRHK_LIBNAME();
443 return (((HWCRHK_LIBNAME = BUF_strdup(name)) != NULL) ? 1 : 0);
444 }
427static const char *n_hwcrhk_Init = "HWCryptoHook_Init"; 445static const char *n_hwcrhk_Init = "HWCryptoHook_Init";
428static const char *n_hwcrhk_Finish = "HWCryptoHook_Finish"; 446static const char *n_hwcrhk_Finish = "HWCryptoHook_Finish";
429static const char *n_hwcrhk_ModExp = "HWCryptoHook_ModExp"; 447static const char *n_hwcrhk_ModExp = "HWCryptoHook_ModExp";
@@ -469,6 +487,7 @@ static void release_context(HWCryptoHook_ContextHandle hac)
469/* Destructor (complements the "ENGINE_ncipher()" constructor) */ 487/* Destructor (complements the "ENGINE_ncipher()" constructor) */
470static int hwcrhk_destroy(ENGINE *e) 488static int hwcrhk_destroy(ENGINE *e)
471 { 489 {
490 free_HWCRHK_LIBNAME();
472 ERR_unload_HWCRHK_strings(); 491 ERR_unload_HWCRHK_strings();
473 return 1; 492 return 1;
474 } 493 }
@@ -494,7 +513,7 @@ static int hwcrhk_init(ENGINE *e)
494 goto err; 513 goto err;
495 } 514 }
496 /* Attempt to load libnfhwcrhk.so/nfhwcrhk.dll/whatever. */ 515 /* Attempt to load libnfhwcrhk.so/nfhwcrhk.dll/whatever. */
497 hwcrhk_dso = DSO_load(NULL, HWCRHK_LIBNAME, NULL, 0); 516 hwcrhk_dso = DSO_load(NULL, get_HWCRHK_LIBNAME(), NULL, 0);
498 if(hwcrhk_dso == NULL) 517 if(hwcrhk_dso == NULL)
499 { 518 {
500 HWCRHKerr(HWCRHK_F_HWCRHK_INIT,HWCRHK_R_DSO_FAILURE); 519 HWCRHKerr(HWCRHK_F_HWCRHK_INIT,HWCRHK_R_DSO_FAILURE);
@@ -586,6 +605,7 @@ err:
586static int hwcrhk_finish(ENGINE *e) 605static int hwcrhk_finish(ENGINE *e)
587 { 606 {
588 int to_return = 1; 607 int to_return = 1;
608 free_HWCRHK_LIBNAME();
589 if(hwcrhk_dso == NULL) 609 if(hwcrhk_dso == NULL)
590 { 610 {
591 HWCRHKerr(HWCRHK_F_HWCRHK_FINISH,HWCRHK_R_NOT_LOADED); 611 HWCRHKerr(HWCRHK_F_HWCRHK_FINISH,HWCRHK_R_NOT_LOADED);
@@ -634,8 +654,7 @@ static int hwcrhk_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
634 HWCRHKerr(HWCRHK_F_HWCRHK_CTRL,ERR_R_PASSED_NULL_PARAMETER); 654 HWCRHKerr(HWCRHK_F_HWCRHK_CTRL,ERR_R_PASSED_NULL_PARAMETER);
635 return 0; 655 return 0;
636 } 656 }
637 HWCRHK_LIBNAME = (const char *)p; 657 return set_HWCRHK_LIBNAME((const char *)p);
638 return 1;
639 case ENGINE_CTRL_SET_LOGSTREAM: 658 case ENGINE_CTRL_SET_LOGSTREAM:
640 { 659 {
641 BIO *bio = (BIO *)p; 660 BIO *bio = (BIO *)p;
@@ -1040,6 +1059,7 @@ static int hwcrhk_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
1040 return hwcrhk_mod_exp(r, a, p, m, ctx); 1059 return hwcrhk_mod_exp(r, a, p, m, ctx);
1041 } 1060 }
1042 1061
1062#ifndef OPENSSL_NO_DH
1043/* This function is aliased to mod_exp (with the dh and mont dropped). */ 1063/* This function is aliased to mod_exp (with the dh and mont dropped). */
1044static int hwcrhk_mod_exp_dh(const DH *dh, BIGNUM *r, 1064static int hwcrhk_mod_exp_dh(const DH *dh, BIGNUM *r,
1045 const BIGNUM *a, const BIGNUM *p, 1065 const BIGNUM *a, const BIGNUM *p,
@@ -1047,6 +1067,7 @@ static int hwcrhk_mod_exp_dh(const DH *dh, BIGNUM *r,
1047 { 1067 {
1048 return hwcrhk_mod_exp(r, a, p, m, ctx); 1068 return hwcrhk_mod_exp(r, a, p, m, ctx);
1049 } 1069 }
1070#endif
1050 1071
1051/* Random bytes are good */ 1072/* Random bytes are good */
1052static int hwcrhk_rand_bytes(unsigned char *buf, int num) 1073static int hwcrhk_rand_bytes(unsigned char *buf, int num)
diff --git a/src/lib/libcrypto/engine/hw_nuron.c b/src/lib/libcrypto/engine/hw_nuron.c
index 2672012154..130b6d8b40 100644
--- a/src/lib/libcrypto/engine/hw_nuron.c
+++ b/src/lib/libcrypto/engine/hw_nuron.c
@@ -69,8 +69,24 @@
69#define NURON_LIB_NAME "nuron engine" 69#define NURON_LIB_NAME "nuron engine"
70#include "hw_nuron_err.c" 70#include "hw_nuron_err.c"
71 71
72static const char def_NURON_LIBNAME[] = "nuronssl"; 72static const char *NURON_LIBNAME = NULL;
73static const char *NURON_LIBNAME = def_NURON_LIBNAME; 73static const char *get_NURON_LIBNAME(void)
74 {
75 if(NURON_LIBNAME)
76 return NURON_LIBNAME;
77 return "nuronssl";
78 }
79static void free_NURON_LIBNAME(void)
80 {
81 if(NURON_LIBNAME)
82 OPENSSL_free((void*)NURON_LIBNAME);
83 NURON_LIBNAME = NULL;
84 }
85static long set_NURON_LIBNAME(const char *name)
86 {
87 free_NURON_LIBNAME();
88 return (((NURON_LIBNAME = BUF_strdup(name)) != NULL) ? 1 : 0);
89 }
74static const char *NURON_F1 = "nuron_mod_exp"; 90static const char *NURON_F1 = "nuron_mod_exp";
75 91
76/* The definitions for control commands specific to this engine */ 92/* The definitions for control commands specific to this engine */
@@ -90,6 +106,7 @@ static DSO *pvDSOHandle = NULL;
90 106
91static int nuron_destroy(ENGINE *e) 107static int nuron_destroy(ENGINE *e)
92 { 108 {
109 free_NURON_LIBNAME();
93 ERR_unload_NURON_strings(); 110 ERR_unload_NURON_strings();
94 return 1; 111 return 1;
95 } 112 }
@@ -102,7 +119,7 @@ static int nuron_init(ENGINE *e)
102 return 0; 119 return 0;
103 } 120 }
104 121
105 pvDSOHandle = DSO_load(NULL, NURON_LIBNAME, NULL, 122 pvDSOHandle = DSO_load(NULL, get_NURON_LIBNAME(), NULL,
106 DSO_FLAG_NAME_TRANSLATION_EXT_ONLY); 123 DSO_FLAG_NAME_TRANSLATION_EXT_ONLY);
107 if(!pvDSOHandle) 124 if(!pvDSOHandle)
108 { 125 {
@@ -122,6 +139,7 @@ static int nuron_init(ENGINE *e)
122 139
123static int nuron_finish(ENGINE *e) 140static int nuron_finish(ENGINE *e)
124 { 141 {
142 free_NURON_LIBNAME();
125 if(pvDSOHandle == NULL) 143 if(pvDSOHandle == NULL)
126 { 144 {
127 NURONerr(NURON_F_NURON_FINISH,NURON_R_NOT_LOADED); 145 NURONerr(NURON_F_NURON_FINISH,NURON_R_NOT_LOADED);
@@ -153,8 +171,7 @@ static int nuron_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
153 NURONerr(NURON_F_NURON_CTRL,NURON_R_ALREADY_LOADED); 171 NURONerr(NURON_F_NURON_CTRL,NURON_R_ALREADY_LOADED);
154 return 0; 172 return 0;
155 } 173 }
156 NURON_LIBNAME = (const char *)p; 174 return set_NURON_LIBNAME((const char *)p);
157 return 1;
158 default: 175 default:
159 break; 176 break;
160 } 177 }
diff --git a/src/lib/libcrypto/engine/hw_ubsec.c b/src/lib/libcrypto/engine/hw_ubsec.c
index 743c06043c..63397f868c 100644
--- a/src/lib/libcrypto/engine/hw_ubsec.c
+++ b/src/lib/libcrypto/engine/hw_ubsec.c
@@ -304,7 +304,24 @@ static int max_key_len = 1024; /* ??? */
304 * symbol names to bind to. 304 * symbol names to bind to.
305 */ 305 */
306 306
307static const char *UBSEC_LIBNAME = "ubsec"; 307static const char *UBSEC_LIBNAME = NULL;
308static const char *get_UBSEC_LIBNAME(void)
309 {
310 if(UBSEC_LIBNAME)
311 return UBSEC_LIBNAME;
312 return "ubsec";
313 }
314static void free_UBSEC_LIBNAME(void)
315 {
316 if(UBSEC_LIBNAME)
317 OPENSSL_free((void*)UBSEC_LIBNAME);
318 UBSEC_LIBNAME = NULL;
319 }
320static long set_UBSEC_LIBNAME(const char *name)
321 {
322 free_UBSEC_LIBNAME();
323 return (((UBSEC_LIBNAME = BUF_strdup(name)) != NULL) ? 1 : 0);
324 }
308static const char *UBSEC_F1 = "ubsec_bytes_to_bits"; 325static const char *UBSEC_F1 = "ubsec_bytes_to_bits";
309static const char *UBSEC_F2 = "ubsec_bits_to_bytes"; 326static const char *UBSEC_F2 = "ubsec_bits_to_bytes";
310static const char *UBSEC_F3 = "ubsec_open"; 327static const char *UBSEC_F3 = "ubsec_open";
@@ -328,6 +345,7 @@ static const char *UBSEC_F13 = "ubsec_max_key_len_ioctl";
328/* Destructor (complements the "ENGINE_ubsec()" constructor) */ 345/* Destructor (complements the "ENGINE_ubsec()" constructor) */
329static int ubsec_destroy(ENGINE *e) 346static int ubsec_destroy(ENGINE *e)
330 { 347 {
348 free_UBSEC_LIBNAME();
331 ERR_unload_UBSEC_strings(); 349 ERR_unload_UBSEC_strings();
332 return 1; 350 return 1;
333 } 351 }
@@ -364,7 +382,7 @@ static int ubsec_init(ENGINE *e)
364 /* 382 /*
365 * Attempt to load libubsec.so/ubsec.dll/whatever. 383 * Attempt to load libubsec.so/ubsec.dll/whatever.
366 */ 384 */
367 ubsec_dso = DSO_load(NULL, UBSEC_LIBNAME, NULL, 0); 385 ubsec_dso = DSO_load(NULL, get_UBSEC_LIBNAME(), NULL, 0);
368 if(ubsec_dso == NULL) 386 if(ubsec_dso == NULL)
369 { 387 {
370 UBSECerr(UBSEC_F_UBSEC_INIT, UBSEC_R_DSO_FAILURE); 388 UBSECerr(UBSEC_F_UBSEC_INIT, UBSEC_R_DSO_FAILURE);
@@ -459,6 +477,7 @@ err:
459 477
460static int ubsec_finish(ENGINE *e) 478static int ubsec_finish(ENGINE *e)
461 { 479 {
480 free_UBSEC_LIBNAME();
462 if(ubsec_dso == NULL) 481 if(ubsec_dso == NULL)
463 { 482 {
464 UBSECerr(UBSEC_F_UBSEC_FINISH, UBSEC_R_NOT_LOADED); 483 UBSECerr(UBSEC_F_UBSEC_FINISH, UBSEC_R_NOT_LOADED);
@@ -508,8 +527,7 @@ static int ubsec_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
508 UBSECerr(UBSEC_F_UBSEC_CTRL,UBSEC_R_ALREADY_LOADED); 527 UBSECerr(UBSEC_F_UBSEC_CTRL,UBSEC_R_ALREADY_LOADED);
509 return 0; 528 return 0;
510 } 529 }
511 UBSEC_LIBNAME = (const char *)p; 530 return set_UBSEC_LIBNAME((const char *)p);
512 return 1;
513 default: 531 default:
514 break; 532 break;
515 } 533 }