diff options
| author | markus <> | 2002-09-10 16:31:57 +0000 |
|---|---|---|
| committer | markus <> | 2002-09-10 16:31:57 +0000 |
| commit | 7d038e9d4d83e7c7120e78418e108df70b9025d6 (patch) | |
| tree | baf775b286ff801a89f746b1938a3c700bba6822 /src/lib/libcrypto/engine | |
| parent | 3bd21dd4c3a3e3106321a5f6b3641ab9f18a6e3b (diff) | |
| download | openbsd-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.ssl | 351 | ||||
| -rw-r--r-- | src/lib/libcrypto/engine/eng_cnf.c | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/engine/eng_dyn.c | 24 | ||||
| -rw-r--r-- | src/lib/libcrypto/engine/eng_fat.c | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/engine/hw_4758_cca.c | 29 | ||||
| -rw-r--r-- | src/lib/libcrypto/engine/hw_aep.c | 28 | ||||
| -rw-r--r-- | src/lib/libcrypto/engine/hw_atalla.c | 27 | ||||
| -rw-r--r-- | src/lib/libcrypto/engine/hw_cswift.c | 27 | ||||
| -rw-r--r-- | src/lib/libcrypto/engine/hw_ncipher.c | 33 | ||||
| -rw-r--r-- | src/lib/libcrypto/engine/hw_nuron.c | 27 | ||||
| -rw-r--r-- | src/lib/libcrypto/engine/hw_ubsec.c | 26 |
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 | ||
| 75 | errors: | 75 | errors: |
| 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 | ||
| 79 | tests: | 79 | tests: |
| 80 | 80 | ||
| @@ -82,7 +82,7 @@ lint: | |||
| 82 | lint -DLINT $(INCLUDES) $(SRC)>fluff | 82 | lint -DLINT $(INCLUDES) $(SRC)>fluff |
| 83 | 83 | ||
| 84 | depend: | 84 | depend: |
| 85 | $(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC) | 85 | $(MAKEDEPEND) $(CFLAG) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC) |
| 86 | 86 | ||
| 87 | dclean: | 87 | dclean: |
| 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 | |||
| 196 | eng_list.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | 196 | eng_list.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h |
| 197 | eng_list.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h | 197 | eng_list.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h |
| 198 | eng_list.o: ../cryptlib.h eng_int.h eng_list.c | 198 | eng_list.o: ../cryptlib.h eng_int.h eng_list.c |
| 199 | eng_openssl.o: ../../e_os.h ../../include/openssl/asn1.h | 199 | eng_openssl.o: ../../e_os.h ../../include/openssl/aes.h |
| 200 | eng_openssl.o: ../../include/openssl/bio.h ../../include/openssl/bn.h | 200 | eng_openssl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h |
| 201 | eng_openssl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h | 201 | eng_openssl.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h |
| 202 | eng_openssl.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h | 202 | eng_openssl.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h |
| 203 | eng_openssl.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h | 203 | eng_openssl.o: ../../include/openssl/crypto.h ../../include/openssl/des.h |
| 204 | eng_openssl.o: ../../include/openssl/engine.h ../../include/openssl/err.h | 204 | eng_openssl.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h |
| 205 | eng_openssl.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h | 205 | eng_openssl.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h |
| 206 | eng_openssl.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h | ||
| 207 | eng_openssl.o: ../../include/openssl/err.h ../../include/openssl/evp.h | ||
| 208 | eng_openssl.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h | ||
| 209 | eng_openssl.o: ../../include/openssl/md2.h ../../include/openssl/md4.h | ||
| 210 | eng_openssl.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h | ||
| 206 | eng_openssl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h | 211 | eng_openssl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h |
| 207 | eng_openssl.o: ../../include/openssl/opensslconf.h | 212 | eng_openssl.o: ../../include/openssl/opensslconf.h |
| 208 | eng_openssl.o: ../../include/openssl/opensslv.h | 213 | eng_openssl.o: ../../include/openssl/opensslv.h |
| 209 | eng_openssl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h | 214 | eng_openssl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h |
| 210 | eng_openssl.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h | 215 | eng_openssl.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h |
| 211 | eng_openssl.o: ../../include/openssl/rand.h ../../include/openssl/rc4.h | 216 | eng_openssl.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h |
| 212 | eng_openssl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h | 217 | eng_openssl.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h |
| 213 | eng_openssl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h | 218 | eng_openssl.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h |
| 214 | eng_openssl.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h | 219 | eng_openssl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h |
| 220 | eng_openssl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
| 221 | eng_openssl.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | ||
| 215 | eng_openssl.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h | 222 | eng_openssl.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h |
| 216 | eng_openssl.o: ../cryptlib.h eng_openssl.c | 223 | eng_openssl.o: ../cryptlib.h eng_openssl.c |
| 217 | eng_pkey.o: ../../e_os.h ../../include/openssl/asn1.h | 224 | eng_pkey.o: ../../e_os.h ../../include/openssl/asn1.h |
| @@ -226,47 +233,64 @@ eng_pkey.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h | |||
| 226 | eng_pkey.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | 233 | eng_pkey.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h |
| 227 | eng_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h | 234 | eng_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h |
| 228 | eng_pkey.o: ../cryptlib.h eng_int.h eng_pkey.c | 235 | eng_pkey.o: ../cryptlib.h eng_int.h eng_pkey.c |
| 229 | eng_table.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h | 236 | eng_table.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h |
| 230 | eng_table.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h | 237 | eng_table.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h |
| 231 | eng_table.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h | 238 | eng_table.o: ../../include/openssl/bn.h ../../include/openssl/cast.h |
| 232 | eng_table.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h | 239 | eng_table.o: ../../include/openssl/crypto.h ../../include/openssl/des.h |
| 233 | eng_table.o: ../../include/openssl/err.h ../../include/openssl/evp.h | 240 | eng_table.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h |
| 234 | eng_table.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h | 241 | eng_table.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h |
| 242 | eng_table.o: ../../include/openssl/engine.h ../../include/openssl/err.h | ||
| 243 | eng_table.o: ../../include/openssl/evp.h ../../include/openssl/idea.h | ||
| 244 | eng_table.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h | ||
| 245 | eng_table.o: ../../include/openssl/md4.h ../../include/openssl/md5.h | ||
| 246 | eng_table.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h | ||
| 235 | eng_table.o: ../../include/openssl/objects.h | 247 | eng_table.o: ../../include/openssl/objects.h |
| 236 | eng_table.o: ../../include/openssl/opensslconf.h | 248 | eng_table.o: ../../include/openssl/opensslconf.h |
| 237 | eng_table.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | 249 | eng_table.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h |
| 238 | eng_table.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h | 250 | eng_table.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h |
| 239 | eng_table.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | 251 | eng_table.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h |
| 240 | eng_table.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h | 252 | eng_table.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h |
| 253 | eng_table.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h | ||
| 254 | eng_table.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
| 255 | eng_table.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | ||
| 241 | eng_table.o: eng_int.h eng_table.c | 256 | eng_table.o: eng_int.h eng_table.c |
| 242 | hw_4758_cca.o: ../../e_os.h ../../include/openssl/asn1.h | 257 | hw_4758_cca.o: ../../e_os.h ../../include/openssl/aes.h |
| 243 | hw_4758_cca.o: ../../include/openssl/bio.h ../../include/openssl/bn.h | 258 | hw_4758_cca.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h |
| 244 | hw_4758_cca.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h | 259 | hw_4758_cca.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h |
| 245 | hw_4758_cca.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h | 260 | hw_4758_cca.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h |
| 246 | hw_4758_cca.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h | 261 | hw_4758_cca.o: ../../include/openssl/crypto.h ../../include/openssl/des.h |
| 247 | hw_4758_cca.o: ../../include/openssl/engine.h ../../include/openssl/err.h | 262 | hw_4758_cca.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h |
| 248 | hw_4758_cca.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h | 263 | hw_4758_cca.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h |
| 264 | hw_4758_cca.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h | ||
| 265 | hw_4758_cca.o: ../../include/openssl/err.h ../../include/openssl/evp.h | ||
| 266 | hw_4758_cca.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h | ||
| 267 | hw_4758_cca.o: ../../include/openssl/md2.h ../../include/openssl/md4.h | ||
| 268 | hw_4758_cca.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h | ||
| 249 | hw_4758_cca.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h | 269 | hw_4758_cca.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h |
| 250 | hw_4758_cca.o: ../../include/openssl/opensslconf.h | 270 | hw_4758_cca.o: ../../include/openssl/opensslconf.h |
| 251 | hw_4758_cca.o: ../../include/openssl/opensslv.h | 271 | hw_4758_cca.o: ../../include/openssl/opensslv.h |
| 252 | hw_4758_cca.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h | 272 | hw_4758_cca.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h |
| 253 | hw_4758_cca.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h | 273 | hw_4758_cca.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h |
| 274 | hw_4758_cca.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h | ||
| 275 | hw_4758_cca.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h | ||
| 254 | hw_4758_cca.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h | 276 | hw_4758_cca.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h |
| 255 | hw_4758_cca.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | 277 | hw_4758_cca.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h |
| 256 | hw_4758_cca.o: ../../include/openssl/ui.h ../../include/openssl/x509.h | 278 | hw_4758_cca.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h |
| 257 | hw_4758_cca.o: ../../include/openssl/x509_vfy.h ../cryptlib.h hw_4758_cca.c | 279 | hw_4758_cca.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h |
| 258 | hw_4758_cca.o: hw_4758_cca_err.c hw_4758_cca_err.h vendor_defns/hw_4758_cca.h | 280 | hw_4758_cca.o: ../cryptlib.h hw_4758_cca.c hw_4758_cca_err.c hw_4758_cca_err.h |
| 281 | hw_4758_cca.o: vendor_defns/hw_4758_cca.h | ||
| 259 | hw_aep.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h | 282 | hw_aep.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h |
| 260 | hw_aep.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h | 283 | hw_aep.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h |
| 261 | hw_aep.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h | 284 | hw_aep.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h |
| 262 | hw_aep.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h | 285 | hw_aep.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h |
| 263 | hw_aep.o: ../../include/openssl/engine.h ../../include/openssl/err.h | 286 | hw_aep.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h |
| 264 | hw_aep.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h | 287 | hw_aep.o: ../../include/openssl/err.h ../../include/openssl/lhash.h |
| 265 | hw_aep.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | 288 | hw_aep.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h |
| 266 | hw_aep.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h | 289 | hw_aep.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h |
| 267 | hw_aep.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | 290 | hw_aep.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h |
| 268 | hw_aep.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h hw_aep.c | 291 | hw_aep.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h |
| 269 | hw_aep.o: hw_aep_err.c hw_aep_err.h vendor_defns/aep.h | 292 | hw_aep.o: ../../include/openssl/ui.h hw_aep.c hw_aep_err.c hw_aep_err.h |
| 293 | hw_aep.o: vendor_defns/aep.h | ||
| 270 | hw_atalla.o: ../../e_os.h ../../include/openssl/asn1.h | 294 | hw_atalla.o: ../../e_os.h ../../include/openssl/asn1.h |
| 271 | hw_atalla.o: ../../include/openssl/bio.h ../../include/openssl/bn.h | 295 | hw_atalla.o: ../../include/openssl/bio.h ../../include/openssl/bn.h |
| 272 | hw_atalla.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h | 296 | hw_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 | |||
| 293 | hw_cswift.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h | 317 | hw_cswift.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h |
| 294 | hw_cswift.o: ../cryptlib.h hw_cswift.c hw_cswift_err.c hw_cswift_err.h | 318 | hw_cswift.o: ../cryptlib.h hw_cswift.c hw_cswift_err.c hw_cswift_err.h |
| 295 | hw_cswift.o: vendor_defns/cswift.h | 319 | hw_cswift.o: vendor_defns/cswift.h |
| 296 | hw_ncipher.o: ../../e_os.h ../../include/openssl/asn1.h | 320 | hw_ncipher.o: ../../e_os.h ../../include/openssl/aes.h |
| 297 | hw_ncipher.o: ../../include/openssl/bio.h ../../include/openssl/bn.h | 321 | hw_ncipher.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h |
| 298 | hw_ncipher.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h | 322 | hw_ncipher.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h |
| 299 | hw_ncipher.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h | 323 | hw_ncipher.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h |
| 300 | hw_ncipher.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h | 324 | hw_ncipher.o: ../../include/openssl/crypto.h ../../include/openssl/des.h |
| 301 | hw_ncipher.o: ../../include/openssl/engine.h ../../include/openssl/err.h | 325 | hw_ncipher.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h |
| 302 | hw_ncipher.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h | 326 | hw_ncipher.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h |
| 327 | hw_ncipher.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h | ||
| 328 | hw_ncipher.o: ../../include/openssl/err.h ../../include/openssl/evp.h | ||
| 329 | hw_ncipher.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h | ||
| 330 | hw_ncipher.o: ../../include/openssl/md2.h ../../include/openssl/md4.h | ||
| 331 | hw_ncipher.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h | ||
| 303 | hw_ncipher.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h | 332 | hw_ncipher.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h |
| 304 | hw_ncipher.o: ../../include/openssl/opensslconf.h | 333 | hw_ncipher.o: ../../include/openssl/opensslconf.h |
| 305 | hw_ncipher.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | 334 | hw_ncipher.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h |
| 306 | hw_ncipher.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h | 335 | hw_ncipher.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h |
| 307 | hw_ncipher.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h | 336 | hw_ncipher.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h |
| 337 | hw_ncipher.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h | ||
| 338 | hw_ncipher.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h | ||
| 308 | hw_ncipher.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h | 339 | hw_ncipher.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h |
| 309 | hw_ncipher.o: ../../include/openssl/sha.h ../../include/openssl/stack.h | 340 | hw_ncipher.o: ../../include/openssl/sha.h ../../include/openssl/stack.h |
| 310 | hw_ncipher.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h | 341 | hw_ncipher.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h |
| 311 | hw_ncipher.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h | 342 | hw_ncipher.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h |
| 312 | hw_ncipher.o: ../cryptlib.h hw_ncipher.c hw_ncipher_err.c hw_ncipher_err.h | 343 | hw_ncipher.o: ../../include/openssl/x509_vfy.h ../cryptlib.h hw_ncipher.c |
| 313 | hw_ncipher.o: vendor_defns/hwcryptohook.h | 344 | hw_ncipher.o: hw_ncipher_err.c hw_ncipher_err.h vendor_defns/hwcryptohook.h |
| 314 | hw_nuron.o: ../../e_os.h ../../include/openssl/asn1.h | 345 | hw_nuron.o: ../../e_os.h ../../include/openssl/asn1.h |
| 315 | hw_nuron.o: ../../include/openssl/bio.h ../../include/openssl/bn.h | 346 | hw_nuron.o: ../../include/openssl/bio.h ../../include/openssl/bn.h |
| 316 | hw_nuron.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h | 347 | hw_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 | |||
| 323 | hw_nuron.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | 354 | hw_nuron.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h |
| 324 | hw_nuron.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h | 355 | hw_nuron.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h |
| 325 | hw_nuron.o: ../cryptlib.h hw_nuron.c hw_nuron_err.c hw_nuron_err.h | 356 | hw_nuron.o: ../cryptlib.h hw_nuron.c hw_nuron_err.c hw_nuron_err.h |
| 357 | hw_cryptodev.o: ../../include/openssl/aes.h | ||
| 326 | hw_cryptodev.o: ../../include/openssl/asn1.h | 358 | hw_cryptodev.o: ../../include/openssl/asn1.h |
| 327 | hw_cryptodev.o: ../../include/openssl/bio.h ../../include/openssl/bn.h | 359 | hw_cryptodev.o: ../../include/openssl/bio.h |
| 360 | hw_cryptodev.o: ../../include/openssl/blowfish.h | ||
| 361 | hw_cryptodev.o: ../../include/openssl/bn.h | ||
| 362 | hw_cryptodev.o: ../../include/openssl/cast.h | ||
| 328 | hw_cryptodev.o: ../../include/openssl/conf.h | 363 | hw_cryptodev.o: ../../include/openssl/conf.h |
| 329 | hw_cryptodev.o: ../../include/openssl/crypto.h | 364 | hw_cryptodev.o: ../../include/openssl/crypto.h |
| 365 | hw_cryptodev.o: ../../include/openssl/des.h | ||
| 366 | hw_cryptodev.o: ../../include/openssl/des_old.h | ||
| 330 | hw_cryptodev.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h | 367 | hw_cryptodev.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h |
| 331 | hw_cryptodev.o: ../../include/openssl/e_os2.h | 368 | hw_cryptodev.o: ../../include/openssl/e_os2.h |
| 332 | hw_cryptodev.o: ../../include/openssl/engine.h | 369 | hw_cryptodev.o: ../../include/openssl/engine.h |
| 333 | hw_cryptodev.o: ../../include/openssl/err.h | 370 | hw_cryptodev.o: ../../include/openssl/err.h |
| 334 | hw_cryptodev.o: ../../include/openssl/evp.h | 371 | hw_cryptodev.o: ../../include/openssl/evp.h |
| 372 | hw_cryptodev.o: ../../include/openssl/idea.h | ||
| 335 | hw_cryptodev.o: ../../include/openssl/lhash.h | 373 | hw_cryptodev.o: ../../include/openssl/lhash.h |
| 374 | hw_cryptodev.o: ../../include/openssl/md2.h | ||
| 375 | hw_cryptodev.o: ../../include/openssl/md4.h | ||
| 376 | hw_cryptodev.o: ../../include/openssl/md5.h | ||
| 377 | hw_cryptodev.o: ../../include/openssl/mdc2.h | ||
| 336 | hw_cryptodev.o: ../../include/openssl/obj_mac.h | 378 | hw_cryptodev.o: ../../include/openssl/obj_mac.h |
| 337 | hw_cryptodev.o: ../../include/openssl/objects.h | 379 | hw_cryptodev.o: ../../include/openssl/objects.h |
| 338 | hw_cryptodev.o: ../../include/openssl/opensslconf.h | 380 | hw_cryptodev.o: ../../include/openssl/opensslconf.h |
| 339 | hw_cryptodev.o: ../../include/openssl/opensslv.h | 381 | hw_cryptodev.o: ../../include/openssl/opensslv.h |
| 340 | hw_cryptodev.o: ../../include/openssl/ossl_typ.h | 382 | hw_cryptodev.o: ../../include/openssl/ossl_typ.h |
| 341 | hw_cryptodev.o: ../../include/openssl/rand.h | 383 | hw_cryptodev.o: ../../include/openssl/rand.h |
| 384 | hw_cryptodev.o: ../../include/openssl/rc2.h | ||
| 385 | hw_cryptodev.o: ../../include/openssl/rc4.h | ||
| 386 | hw_cryptodev.o: ../../include/openssl/rc5.h | ||
| 387 | hw_cryptodev.o: ../../include/openssl/ripemd.h | ||
| 342 | hw_cryptodev.o: ../../include/openssl/rsa.h | 388 | hw_cryptodev.o: ../../include/openssl/rsa.h |
| 343 | hw_cryptodev.o: ../../include/openssl/safestack.h | 389 | hw_cryptodev.o: ../../include/openssl/safestack.h |
| 390 | hw_cryptodev.o: ../../include/openssl/sha.h | ||
| 344 | hw_cryptodev.o: ../../include/openssl/stack.h | 391 | hw_cryptodev.o: ../../include/openssl/stack.h |
| 345 | hw_cryptodev.o: ../../include/openssl/symhacks.h | 392 | hw_cryptodev.o: ../../include/openssl/symhacks.h |
| 346 | hw_cryptodev.o: ../../include/openssl/ui.h ../evp/evp_locl.h eng_int.h | 393 | hw_cryptodev.o: ../../include/openssl/ui.h |
| 347 | hw_cryptodev.o: hw_cryptodev.c | 394 | hw_cryptodev.o: ../../include/openssl/ui_compat.h ../evp/evp_locl.h |
| 348 | hw_sureware.o: ../../e_os.h ../../include/openssl/asn1.h | 395 | hw_cryptodev.o: eng_int.h hw_cryptodev.c |
| 349 | hw_sureware.o: ../../include/openssl/bio.h ../../include/openssl/bn.h | 396 | hw_sureware.o: ../../e_os.h ../../include/openssl/aes.h |
| 350 | hw_sureware.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h | 397 | hw_sureware.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h |
| 351 | hw_sureware.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h | 398 | hw_sureware.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h |
| 352 | hw_sureware.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h | 399 | hw_sureware.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h |
| 353 | hw_sureware.o: ../../include/openssl/engine.h ../../include/openssl/err.h | 400 | hw_sureware.o: ../../include/openssl/crypto.h ../../include/openssl/des.h |
| 354 | hw_sureware.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h | 401 | hw_sureware.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h |
| 402 | hw_sureware.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h | ||
| 403 | hw_sureware.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h | ||
| 404 | hw_sureware.o: ../../include/openssl/err.h ../../include/openssl/evp.h | ||
| 405 | hw_sureware.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h | ||
| 406 | hw_sureware.o: ../../include/openssl/md2.h ../../include/openssl/md4.h | ||
| 407 | hw_sureware.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h | ||
| 355 | hw_sureware.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h | 408 | hw_sureware.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h |
| 356 | hw_sureware.o: ../../include/openssl/opensslconf.h | 409 | hw_sureware.o: ../../include/openssl/opensslconf.h |
| 357 | hw_sureware.o: ../../include/openssl/opensslv.h | 410 | hw_sureware.o: ../../include/openssl/opensslv.h |
| 358 | hw_sureware.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h | 411 | hw_sureware.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h |
| 359 | hw_sureware.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h | 412 | hw_sureware.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h |
| 360 | hw_sureware.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h | 413 | hw_sureware.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h |
| 414 | hw_sureware.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h | ||
| 415 | hw_sureware.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h | ||
| 361 | hw_sureware.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h | 416 | hw_sureware.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h |
| 362 | hw_sureware.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | 417 | hw_sureware.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h |
| 363 | hw_sureware.o: ../../include/openssl/ui.h ../../include/openssl/x509.h | 418 | hw_sureware.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h |
| 364 | hw_sureware.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h | 419 | hw_sureware.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h |
| 365 | hw_sureware.o: engine.h hw_sureware.c hw_sureware_err.c hw_sureware_err.h | 420 | hw_sureware.o: ../cryptlib.h eng_int.h engine.h hw_sureware.c hw_sureware_err.c |
| 366 | hw_sureware.o: vendor_defns/sureware.h | 421 | hw_sureware.o: hw_sureware_err.h vendor_defns/sureware.h |
| 367 | hw_ubsec.o: ../../e_os.h ../../include/openssl/asn1.h | 422 | hw_ubsec.o: ../../e_os.h ../../include/openssl/asn1.h |
| 368 | hw_ubsec.o: ../../include/openssl/bio.h ../../include/openssl/bn.h | 423 | hw_ubsec.o: ../../include/openssl/bio.h ../../include/openssl/bn.h |
| 369 | hw_ubsec.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h | 424 | hw_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 | |||
| 377 | hw_ubsec.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h | 432 | hw_ubsec.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h |
| 378 | hw_ubsec.o: ../cryptlib.h hw_ubsec.c hw_ubsec_err.c hw_ubsec_err.h | 433 | hw_ubsec.o: ../cryptlib.h hw_ubsec.c hw_ubsec_err.c hw_ubsec_err.h |
| 379 | hw_ubsec.o: vendor_defns/hw_ubsec.h | 434 | hw_ubsec.o: vendor_defns/hw_ubsec.h |
| 380 | tb_cipher.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h | 435 | tb_cipher.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h |
| 381 | tb_cipher.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h | 436 | tb_cipher.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h |
| 382 | tb_cipher.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h | 437 | tb_cipher.o: ../../include/openssl/bn.h ../../include/openssl/cast.h |
| 383 | tb_cipher.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h | 438 | tb_cipher.o: ../../include/openssl/crypto.h ../../include/openssl/des.h |
| 384 | tb_cipher.o: ../../include/openssl/err.h ../../include/openssl/evp.h | 439 | tb_cipher.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h |
| 385 | tb_cipher.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h | 440 | tb_cipher.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h |
| 441 | tb_cipher.o: ../../include/openssl/engine.h ../../include/openssl/err.h | ||
| 442 | tb_cipher.o: ../../include/openssl/evp.h ../../include/openssl/idea.h | ||
| 443 | tb_cipher.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h | ||
| 444 | tb_cipher.o: ../../include/openssl/md4.h ../../include/openssl/md5.h | ||
| 445 | tb_cipher.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h | ||
| 386 | tb_cipher.o: ../../include/openssl/objects.h | 446 | tb_cipher.o: ../../include/openssl/objects.h |
| 387 | tb_cipher.o: ../../include/openssl/opensslconf.h | 447 | tb_cipher.o: ../../include/openssl/opensslconf.h |
| 388 | tb_cipher.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | 448 | tb_cipher.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h |
| 389 | tb_cipher.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h | 449 | tb_cipher.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h |
| 390 | tb_cipher.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | 450 | tb_cipher.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h |
| 391 | tb_cipher.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h | 451 | tb_cipher.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h |
| 452 | tb_cipher.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h | ||
| 453 | tb_cipher.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
| 454 | tb_cipher.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | ||
| 392 | tb_cipher.o: eng_int.h tb_cipher.c | 455 | tb_cipher.o: eng_int.h tb_cipher.c |
| 393 | tb_dh.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h | 456 | tb_dh.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h |
| 394 | tb_dh.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h | 457 | tb_dh.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h |
| 395 | tb_dh.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h | 458 | tb_dh.o: ../../include/openssl/bn.h ../../include/openssl/cast.h |
| 396 | tb_dh.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h | 459 | tb_dh.o: ../../include/openssl/crypto.h ../../include/openssl/des.h |
| 397 | tb_dh.o: ../../include/openssl/err.h ../../include/openssl/evp.h | 460 | tb_dh.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h |
| 398 | tb_dh.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h | 461 | tb_dh.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h |
| 462 | tb_dh.o: ../../include/openssl/engine.h ../../include/openssl/err.h | ||
| 463 | tb_dh.o: ../../include/openssl/evp.h ../../include/openssl/idea.h | ||
| 464 | tb_dh.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h | ||
| 465 | tb_dh.o: ../../include/openssl/md4.h ../../include/openssl/md5.h | ||
| 466 | tb_dh.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h | ||
| 399 | tb_dh.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h | 467 | tb_dh.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h |
| 400 | tb_dh.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | 468 | tb_dh.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h |
| 401 | tb_dh.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h | 469 | tb_dh.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h |
| 402 | tb_dh.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | 470 | tb_dh.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h |
| 403 | tb_dh.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h eng_int.h | 471 | tb_dh.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h |
| 472 | tb_dh.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h | ||
| 473 | tb_dh.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
| 474 | tb_dh.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h eng_int.h | ||
| 404 | tb_dh.o: tb_dh.c | 475 | tb_dh.o: tb_dh.c |
| 405 | tb_digest.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h | 476 | tb_digest.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h |
| 406 | tb_digest.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h | 477 | tb_digest.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h |
| 407 | tb_digest.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h | 478 | tb_digest.o: ../../include/openssl/bn.h ../../include/openssl/cast.h |
| 408 | tb_digest.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h | 479 | tb_digest.o: ../../include/openssl/crypto.h ../../include/openssl/des.h |
| 409 | tb_digest.o: ../../include/openssl/err.h ../../include/openssl/evp.h | 480 | tb_digest.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h |
| 410 | tb_digest.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h | 481 | tb_digest.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h |
| 482 | tb_digest.o: ../../include/openssl/engine.h ../../include/openssl/err.h | ||
| 483 | tb_digest.o: ../../include/openssl/evp.h ../../include/openssl/idea.h | ||
| 484 | tb_digest.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h | ||
| 485 | tb_digest.o: ../../include/openssl/md4.h ../../include/openssl/md5.h | ||
| 486 | tb_digest.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h | ||
| 411 | tb_digest.o: ../../include/openssl/objects.h | 487 | tb_digest.o: ../../include/openssl/objects.h |
| 412 | tb_digest.o: ../../include/openssl/opensslconf.h | 488 | tb_digest.o: ../../include/openssl/opensslconf.h |
| 413 | tb_digest.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | 489 | tb_digest.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h |
| 414 | tb_digest.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h | 490 | tb_digest.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h |
| 415 | tb_digest.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | 491 | tb_digest.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h |
| 416 | tb_digest.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h | 492 | tb_digest.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h |
| 493 | tb_digest.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h | ||
| 494 | tb_digest.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
| 495 | tb_digest.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | ||
| 417 | tb_digest.o: eng_int.h tb_digest.c | 496 | tb_digest.o: eng_int.h tb_digest.c |
| 418 | tb_dsa.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h | 497 | tb_dsa.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h |
| 419 | tb_dsa.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h | 498 | tb_dsa.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h |
| 420 | tb_dsa.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h | 499 | tb_dsa.o: ../../include/openssl/bn.h ../../include/openssl/cast.h |
| 421 | tb_dsa.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h | 500 | tb_dsa.o: ../../include/openssl/crypto.h ../../include/openssl/des.h |
| 422 | tb_dsa.o: ../../include/openssl/err.h ../../include/openssl/evp.h | 501 | tb_dsa.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h |
| 423 | tb_dsa.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h | 502 | tb_dsa.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h |
| 503 | tb_dsa.o: ../../include/openssl/engine.h ../../include/openssl/err.h | ||
| 504 | tb_dsa.o: ../../include/openssl/evp.h ../../include/openssl/idea.h | ||
| 505 | tb_dsa.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h | ||
| 506 | tb_dsa.o: ../../include/openssl/md4.h ../../include/openssl/md5.h | ||
| 507 | tb_dsa.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h | ||
| 424 | tb_dsa.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h | 508 | tb_dsa.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h |
| 425 | tb_dsa.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | 509 | tb_dsa.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h |
| 426 | tb_dsa.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h | 510 | tb_dsa.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h |
| 427 | tb_dsa.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | 511 | tb_dsa.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h |
| 428 | tb_dsa.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h eng_int.h | 512 | tb_dsa.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h |
| 429 | tb_dsa.o: tb_dsa.c | 513 | tb_dsa.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h |
| 430 | tb_rand.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h | 514 | tb_dsa.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h |
| 431 | tb_rand.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h | 515 | tb_dsa.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h |
| 432 | tb_rand.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h | 516 | tb_dsa.o: eng_int.h tb_dsa.c |
| 433 | tb_rand.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h | 517 | tb_rand.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h |
| 434 | tb_rand.o: ../../include/openssl/err.h ../../include/openssl/evp.h | 518 | tb_rand.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h |
| 435 | tb_rand.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h | 519 | tb_rand.o: ../../include/openssl/bn.h ../../include/openssl/cast.h |
| 520 | tb_rand.o: ../../include/openssl/crypto.h ../../include/openssl/des.h | ||
| 521 | tb_rand.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h | ||
| 522 | tb_rand.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h | ||
| 523 | tb_rand.o: ../../include/openssl/engine.h ../../include/openssl/err.h | ||
| 524 | tb_rand.o: ../../include/openssl/evp.h ../../include/openssl/idea.h | ||
| 525 | tb_rand.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h | ||
| 526 | tb_rand.o: ../../include/openssl/md4.h ../../include/openssl/md5.h | ||
| 527 | tb_rand.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h | ||
| 436 | tb_rand.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h | 528 | tb_rand.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h |
| 437 | tb_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | 529 | tb_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h |
| 438 | tb_rand.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h | 530 | tb_rand.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h |
| 439 | tb_rand.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | 531 | tb_rand.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h |
| 440 | tb_rand.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h | 532 | tb_rand.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h |
| 533 | tb_rand.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h | ||
| 534 | tb_rand.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
| 535 | tb_rand.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | ||
| 441 | tb_rand.o: eng_int.h tb_rand.c | 536 | tb_rand.o: eng_int.h tb_rand.c |
| 442 | tb_rsa.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h | 537 | tb_rsa.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h |
| 443 | tb_rsa.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h | 538 | tb_rsa.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h |
| 444 | tb_rsa.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h | 539 | tb_rsa.o: ../../include/openssl/bn.h ../../include/openssl/cast.h |
| 445 | tb_rsa.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h | 540 | tb_rsa.o: ../../include/openssl/crypto.h ../../include/openssl/des.h |
| 446 | tb_rsa.o: ../../include/openssl/err.h ../../include/openssl/evp.h | 541 | tb_rsa.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h |
| 447 | tb_rsa.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h | 542 | tb_rsa.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h |
| 543 | tb_rsa.o: ../../include/openssl/engine.h ../../include/openssl/err.h | ||
| 544 | tb_rsa.o: ../../include/openssl/evp.h ../../include/openssl/idea.h | ||
| 545 | tb_rsa.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h | ||
| 546 | tb_rsa.o: ../../include/openssl/md4.h ../../include/openssl/md5.h | ||
| 547 | tb_rsa.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h | ||
| 448 | tb_rsa.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h | 548 | tb_rsa.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h |
| 449 | tb_rsa.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | 549 | tb_rsa.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h |
| 450 | tb_rsa.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h | 550 | tb_rsa.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h |
| 451 | tb_rsa.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | 551 | tb_rsa.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h |
| 452 | tb_rsa.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h eng_int.h | 552 | tb_rsa.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h |
| 453 | tb_rsa.o: tb_rsa.c | 553 | tb_rsa.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h |
| 554 | tb_rsa.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
| 555 | tb_rsa.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | ||
| 556 | tb_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 | ||
| 95 | int int_engine_configure(char *name, char *value, const CONF *cnf) | 95 | static 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 | ||
| 87 | int int_def_cb(const char *alg, int len, void *arg) | 87 | static 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 | /*------------------*/ |
| 127 | static const char def_CCA4758_LIB_NAME[] = CCA_LIB_NAME; | 127 | static const char *CCA4758_LIB_NAME = NULL; |
| 128 | static const char *CCA4758_LIB_NAME = def_CCA4758_LIB_NAME; | 128 | static const char *get_CCA4758_LIB_NAME(void) |
| 129 | { | ||
| 130 | if(CCA4758_LIB_NAME) | ||
| 131 | return CCA4758_LIB_NAME; | ||
| 132 | return CCA_LIB_NAME; | ||
| 133 | } | ||
| 134 | static 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 | } | ||
| 140 | static 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 |
| 130 | static const char* n_keyRecordRead = CSNDKRR; | 146 | static const char* n_keyRecordRead = CSNDKRR; |
| 131 | static const char* n_digitalSignatureGenerate = CSNDDSG; | 147 | static const char* n_digitalSignatureGenerate = CSNDDSG; |
| @@ -232,6 +248,7 @@ void ENGINE_load_4758cca(void) | |||
| 232 | static int ibm_4758_cca_destroy(ENGINE *e) | 248 | static 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 | ||
| 300 | static int ibm_4758_cca_finish(ENGINE *e) | 317 | static 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 | */ |
| 366 | static const char *AEP_LIBNAME = "aep"; | 367 | static const char *AEP_LIBNAME = NULL; |
| 368 | static const char *get_AEP_LIBNAME(void) | ||
| 369 | { | ||
| 370 | if(AEP_LIBNAME) | ||
| 371 | return AEP_LIBNAME; | ||
| 372 | return "aep"; | ||
| 373 | } | ||
| 374 | static void free_AEP_LIBNAME(void) | ||
| 375 | { | ||
| 376 | if(AEP_LIBNAME) | ||
| 377 | OPENSSL_free((void*)AEP_LIBNAME); | ||
| 378 | AEP_LIBNAME = NULL; | ||
| 379 | } | ||
| 380 | static 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 | ||
| 368 | static const char *AEP_F1 = "AEP_ModExp"; | 386 | static const char *AEP_F1 = "AEP_ModExp"; |
| 369 | static const char *AEP_F2 = "AEP_ModExpCrt"; | 387 | static 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) */ |
| 475 | static int aep_destroy(ENGINE *e) | 493 | static 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. */ |
| 289 | static const char def_ATALLA_LIBNAME[] = "atasi"; | 289 | static const char *ATALLA_LIBNAME = NULL; |
| 290 | static const char *ATALLA_LIBNAME = def_ATALLA_LIBNAME; | 290 | static const char *get_ATALLA_LIBNAME(void) |
| 291 | { | ||
| 292 | if(ATALLA_LIBNAME) | ||
| 293 | return ATALLA_LIBNAME; | ||
| 294 | return "atasi"; | ||
| 295 | } | ||
| 296 | static void free_ATALLA_LIBNAME(void) | ||
| 297 | { | ||
| 298 | if(ATALLA_LIBNAME) | ||
| 299 | OPENSSL_free((void*)ATALLA_LIBNAME); | ||
| 300 | ATALLA_LIBNAME = NULL; | ||
| 301 | } | ||
| 302 | static long set_ATALLA_LIBNAME(const char *name) | ||
| 303 | { | ||
| 304 | free_ATALLA_LIBNAME(); | ||
| 305 | return (((ATALLA_LIBNAME = BUF_strdup(name)) != NULL) ? 1 : 0); | ||
| 306 | } | ||
| 291 | static const char *ATALLA_F1 = "ASI_GetHardwareConfig"; | 307 | static const char *ATALLA_F1 = "ASI_GetHardwareConfig"; |
| 292 | static const char *ATALLA_F2 = "ASI_RSAPrivateKeyOpFn"; | 308 | static const char *ATALLA_F2 = "ASI_RSAPrivateKeyOpFn"; |
| 293 | static const char *ATALLA_F3 = "ASI_GetPerformanceStatistics"; | 309 | static 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) */ |
| 296 | static int atalla_destroy(ENGINE *e) | 312 | static 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 | ||
| 365 | static int atalla_finish(ENGINE *e) | 382 | static 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; | |||
| 280 | t_swReleaseAccContext *p_CSwift_ReleaseAccContext = NULL; | 280 | t_swReleaseAccContext *p_CSwift_ReleaseAccContext = NULL; |
| 281 | 281 | ||
| 282 | /* Used in the DSO operations. */ | 282 | /* Used in the DSO operations. */ |
| 283 | static const char def_CSWIFT_LIBNAME[] = "swift"; | 283 | static const char *CSWIFT_LIBNAME = NULL; |
| 284 | static const char *CSWIFT_LIBNAME = def_CSWIFT_LIBNAME; | 284 | static const char *get_CSWIFT_LIBNAME(void) |
| 285 | { | ||
| 286 | if(CSWIFT_LIBNAME) | ||
| 287 | return CSWIFT_LIBNAME; | ||
| 288 | return "swift"; | ||
| 289 | } | ||
| 290 | static void free_CSWIFT_LIBNAME(void) | ||
| 291 | { | ||
| 292 | if(CSWIFT_LIBNAME) | ||
| 293 | OPENSSL_free((void*)CSWIFT_LIBNAME); | ||
| 294 | CSWIFT_LIBNAME = NULL; | ||
| 295 | } | ||
| 296 | static long set_CSWIFT_LIBNAME(const char *name) | ||
| 297 | { | ||
| 298 | free_CSWIFT_LIBNAME(); | ||
| 299 | return (((CSWIFT_LIBNAME = BUF_strdup(name)) != NULL) ? 1 : 0); | ||
| 300 | } | ||
| 285 | static const char *CSWIFT_F1 = "swAcquireAccContext"; | 301 | static const char *CSWIFT_F1 = "swAcquireAccContext"; |
| 286 | static const char *CSWIFT_F2 = "swAttachKeyParam"; | 302 | static const char *CSWIFT_F2 = "swAttachKeyParam"; |
| 287 | static const char *CSWIFT_F3 = "swSimpleRequest"; | 303 | static 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) */ |
| 314 | static int cswift_destroy(ENGINE *e) | 330 | static 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 | ||
| 378 | static int cswift_finish(ENGINE *e) | 395 | static 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); | |||
| 109 | static int hwcrhk_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, | 109 | static 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). */ |
| 114 | static int hwcrhk_mod_exp_dh(const DH *dh, BIGNUM *r, | 115 | static 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 */ |
| 119 | static int hwcrhk_rand_bytes(unsigned char *buf, int num); | 121 | static int hwcrhk_rand_bytes(unsigned char *buf, int num); |
| @@ -422,8 +424,24 @@ static HWCryptoHook_RSAUnloadKey_t *p_hwcrhk_RSAUnloadKey = NULL; | |||
| 422 | static HWCryptoHook_ModExpCRT_t *p_hwcrhk_ModExpCRT = NULL; | 424 | static HWCryptoHook_ModExpCRT_t *p_hwcrhk_ModExpCRT = NULL; |
| 423 | 425 | ||
| 424 | /* Used in the DSO operations. */ | 426 | /* Used in the DSO operations. */ |
| 425 | static const char def_HWCRHK_LIBNAME[] = "nfhwcrhk"; | 427 | static const char *HWCRHK_LIBNAME = NULL; |
| 426 | static const char *HWCRHK_LIBNAME = def_HWCRHK_LIBNAME; | 428 | static void free_HWCRHK_LIBNAME(void) |
| 429 | { | ||
| 430 | if(HWCRHK_LIBNAME) | ||
| 431 | OPENSSL_free((void*)HWCRHK_LIBNAME); | ||
| 432 | HWCRHK_LIBNAME = NULL; | ||
| 433 | } | ||
| 434 | static const char *get_HWCRHK_LIBNAME(void) | ||
| 435 | { | ||
| 436 | if(HWCRHK_LIBNAME) | ||
| 437 | return HWCRHK_LIBNAME; | ||
| 438 | return "nfhwcrhk"; | ||
| 439 | } | ||
| 440 | static long set_HWCRHK_LIBNAME(const char *name) | ||
| 441 | { | ||
| 442 | free_HWCRHK_LIBNAME(); | ||
| 443 | return (((HWCRHK_LIBNAME = BUF_strdup(name)) != NULL) ? 1 : 0); | ||
| 444 | } | ||
| 427 | static const char *n_hwcrhk_Init = "HWCryptoHook_Init"; | 445 | static const char *n_hwcrhk_Init = "HWCryptoHook_Init"; |
| 428 | static const char *n_hwcrhk_Finish = "HWCryptoHook_Finish"; | 446 | static const char *n_hwcrhk_Finish = "HWCryptoHook_Finish"; |
| 429 | static const char *n_hwcrhk_ModExp = "HWCryptoHook_ModExp"; | 447 | static 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) */ |
| 470 | static int hwcrhk_destroy(ENGINE *e) | 488 | static 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: | |||
| 586 | static int hwcrhk_finish(ENGINE *e) | 605 | static 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). */ |
| 1044 | static int hwcrhk_mod_exp_dh(const DH *dh, BIGNUM *r, | 1064 | static 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 */ |
| 1052 | static int hwcrhk_rand_bytes(unsigned char *buf, int num) | 1073 | static 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 | ||
| 72 | static const char def_NURON_LIBNAME[] = "nuronssl"; | 72 | static const char *NURON_LIBNAME = NULL; |
| 73 | static const char *NURON_LIBNAME = def_NURON_LIBNAME; | 73 | static const char *get_NURON_LIBNAME(void) |
| 74 | { | ||
| 75 | if(NURON_LIBNAME) | ||
| 76 | return NURON_LIBNAME; | ||
| 77 | return "nuronssl"; | ||
| 78 | } | ||
| 79 | static void free_NURON_LIBNAME(void) | ||
| 80 | { | ||
| 81 | if(NURON_LIBNAME) | ||
| 82 | OPENSSL_free((void*)NURON_LIBNAME); | ||
| 83 | NURON_LIBNAME = NULL; | ||
| 84 | } | ||
| 85 | static long set_NURON_LIBNAME(const char *name) | ||
| 86 | { | ||
| 87 | free_NURON_LIBNAME(); | ||
| 88 | return (((NURON_LIBNAME = BUF_strdup(name)) != NULL) ? 1 : 0); | ||
| 89 | } | ||
| 74 | static const char *NURON_F1 = "nuron_mod_exp"; | 90 | static 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 | ||
| 91 | static int nuron_destroy(ENGINE *e) | 107 | static 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 | ||
| 123 | static int nuron_finish(ENGINE *e) | 140 | static 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 | ||
| 307 | static const char *UBSEC_LIBNAME = "ubsec"; | 307 | static const char *UBSEC_LIBNAME = NULL; |
| 308 | static const char *get_UBSEC_LIBNAME(void) | ||
| 309 | { | ||
| 310 | if(UBSEC_LIBNAME) | ||
| 311 | return UBSEC_LIBNAME; | ||
| 312 | return "ubsec"; | ||
| 313 | } | ||
| 314 | static void free_UBSEC_LIBNAME(void) | ||
| 315 | { | ||
| 316 | if(UBSEC_LIBNAME) | ||
| 317 | OPENSSL_free((void*)UBSEC_LIBNAME); | ||
| 318 | UBSEC_LIBNAME = NULL; | ||
| 319 | } | ||
| 320 | static long set_UBSEC_LIBNAME(const char *name) | ||
| 321 | { | ||
| 322 | free_UBSEC_LIBNAME(); | ||
| 323 | return (((UBSEC_LIBNAME = BUF_strdup(name)) != NULL) ? 1 : 0); | ||
| 324 | } | ||
| 308 | static const char *UBSEC_F1 = "ubsec_bytes_to_bits"; | 325 | static const char *UBSEC_F1 = "ubsec_bytes_to_bits"; |
| 309 | static const char *UBSEC_F2 = "ubsec_bits_to_bytes"; | 326 | static const char *UBSEC_F2 = "ubsec_bits_to_bytes"; |
| 310 | static const char *UBSEC_F3 = "ubsec_open"; | 327 | static 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) */ |
| 329 | static int ubsec_destroy(ENGINE *e) | 346 | static 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 | ||
| 460 | static int ubsec_finish(ENGINE *e) | 478 | static 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 | } |
