Replace 'ecdsaparam' commandline utility by 'ecparam'

(the same keys can be used for ECC schemes other than ECDSA)
and add some new options.

Similarly, use string "EC PARAMETERS" instead of "ECDSA PARAMETERS"
in 'PEM' format.

Fix ec_asn1.c (take into account the desired conversion form).

'make update'.

Submitted by: Nils Larsch

1 files changed, 248 insertions, 138 deletions

diff --git a/crypto/engine/Makefile.ssl b/crypto/engine/Makefile.ssl
index dc0119146b..018c9f2a95 100644
--- a/crypto/engine/Makefile.ssl
+++ b/crypto/engine/Makefile.ssl
@@ -208,24 +208,31 @@ eng_list.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
 eng_list.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 eng_list.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
 eng_list.o: ../cryptlib.h eng_int.h eng_list.c
-eng_openssl.o: ../../e_os.h ../../include/openssl/asn1.h
-eng_openssl.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+eng_openssl.o: ../../e_os.h ../../include/openssl/aes.h
+eng_openssl.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
+eng_openssl.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 eng_openssl.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-eng_openssl.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
-eng_openssl.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h
-eng_openssl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
-eng_openssl.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
-eng_openssl.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-eng_openssl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+eng_openssl.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+eng_openssl.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+eng_openssl.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+eng_openssl.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
+eng_openssl.o: ../../include/openssl/ec.h ../../include/openssl/ecdsa.h
+eng_openssl.o: ../../include/openssl/engine.h ../../include/openssl/err.h
+eng_openssl.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+eng_openssl.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+eng_openssl.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
+eng_openssl.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 eng_openssl.o: ../../include/openssl/objects.h
 eng_openssl.o: ../../include/openssl/opensslconf.h
 eng_openssl.o: ../../include/openssl/opensslv.h
 eng_openssl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h
 eng_openssl.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
-eng_openssl.o: ../../include/openssl/rand.h ../../include/openssl/rc4.h
-eng_openssl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-eng_openssl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-eng_openssl.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+eng_openssl.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
+eng_openssl.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+eng_openssl.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+eng_openssl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+eng_openssl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+eng_openssl.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
 eng_openssl.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
 eng_openssl.o: ../cryptlib.h eng_openssl.c
 eng_pkey.o: ../../e_os.h ../../include/openssl/asn1.h
@@ -241,52 +248,68 @@ eng_pkey.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
 eng_pkey.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 eng_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
 eng_pkey.o: ../cryptlib.h eng_int.h eng_pkey.c
-eng_table.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
-eng_table.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-eng_table.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
-eng_table.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-eng_table.o: ../../include/openssl/ec.h ../../include/openssl/ecdsa.h
-eng_table.o: ../../include/openssl/engine.h ../../include/openssl/err.h
-eng_table.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+eng_table.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
+eng_table.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+eng_table.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
+eng_table.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+eng_table.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+eng_table.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+eng_table.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+eng_table.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+eng_table.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+eng_table.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+eng_table.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+eng_table.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 eng_table.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 eng_table.o: ../../include/openssl/opensslconf.h
 eng_table.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
-eng_table.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-eng_table.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-eng_table.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+eng_table.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
+eng_table.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+eng_table.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+eng_table.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+eng_table.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+eng_table.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
 eng_table.o: eng_int.h eng_table.c
-hw_4758_cca.o: ../../e_os.h ../../include/openssl/asn1.h
-hw_4758_cca.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+hw_4758_cca.o: ../../e_os.h ../../include/openssl/aes.h
+hw_4758_cca.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
+hw_4758_cca.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 hw_4758_cca.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-hw_4758_cca.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
-hw_4758_cca.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h
-hw_4758_cca.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
-hw_4758_cca.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
-hw_4758_cca.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-hw_4758_cca.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+hw_4758_cca.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+hw_4758_cca.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+hw_4758_cca.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+hw_4758_cca.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
+hw_4758_cca.o: ../../include/openssl/ec.h ../../include/openssl/ecdsa.h
+hw_4758_cca.o: ../../include/openssl/engine.h ../../include/openssl/err.h
+hw_4758_cca.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+hw_4758_cca.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+hw_4758_cca.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
+hw_4758_cca.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 hw_4758_cca.o: ../../include/openssl/objects.h
 hw_4758_cca.o: ../../include/openssl/opensslconf.h
 hw_4758_cca.o: ../../include/openssl/opensslv.h
 hw_4758_cca.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
-hw_4758_cca.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+hw_4758_cca.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
+hw_4758_cca.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+hw_4758_cca.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
 hw_4758_cca.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 hw_4758_cca.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-hw_4758_cca.o: ../../include/openssl/ui.h ../../include/openssl/x509.h
-hw_4758_cca.o: ../../include/openssl/x509_vfy.h ../cryptlib.h hw_4758_cca.c
-hw_4758_cca.o: hw_4758_cca_err.c hw_4758_cca_err.h vendor_defns/hw_4758_cca.h
+hw_4758_cca.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
+hw_4758_cca.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+hw_4758_cca.o: ../cryptlib.h hw_4758_cca.c hw_4758_cca_err.c hw_4758_cca_err.h
+hw_4758_cca.o: vendor_defns/hw_4758_cca.h
 hw_aep.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
 hw_aep.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-hw_aep.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
-hw_aep.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h
-hw_aep.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
-hw_aep.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
-hw_aep.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
-hw_aep.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-hw_aep.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
-hw_aep.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-hw_aep.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-hw_aep.o: ../../include/openssl/ui.h hw_aep.c hw_aep_err.c hw_aep_err.h
-hw_aep.o: vendor_defns/aep.h
+hw_aep.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+hw_aep.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+hw_aep.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
+hw_aep.o: ../../include/openssl/ec.h ../../include/openssl/ecdsa.h
+hw_aep.o: ../../include/openssl/engine.h ../../include/openssl/err.h
+hw_aep.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+hw_aep.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+hw_aep.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+hw_aep.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+hw_aep.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h hw_aep.c
+hw_aep.o: hw_aep_err.c hw_aep_err.h vendor_defns/aep.h
 hw_atalla.o: ../../e_os.h ../../include/openssl/asn1.h
 hw_atalla.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
 hw_atalla.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -317,26 +340,33 @@ hw_cswift.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 hw_cswift.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
 hw_cswift.o: ../cryptlib.h hw_cswift.c hw_cswift_err.c hw_cswift_err.h
 hw_cswift.o: vendor_defns/cswift.h
-hw_ncipher.o: ../../e_os.h ../../include/openssl/asn1.h
-hw_ncipher.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+hw_ncipher.o: ../../e_os.h ../../include/openssl/aes.h
+hw_ncipher.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
+hw_ncipher.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 hw_ncipher.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-hw_ncipher.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
-hw_ncipher.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h
-hw_ncipher.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
-hw_ncipher.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
-hw_ncipher.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-hw_ncipher.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+hw_ncipher.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+hw_ncipher.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+hw_ncipher.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+hw_ncipher.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
+hw_ncipher.o: ../../include/openssl/ec.h ../../include/openssl/ecdsa.h
+hw_ncipher.o: ../../include/openssl/engine.h ../../include/openssl/err.h
+hw_ncipher.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+hw_ncipher.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+hw_ncipher.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
+hw_ncipher.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 hw_ncipher.o: ../../include/openssl/objects.h
 hw_ncipher.o: ../../include/openssl/opensslconf.h
 hw_ncipher.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 hw_ncipher.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
 hw_ncipher.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+hw_ncipher.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+hw_ncipher.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
 hw_ncipher.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 hw_ncipher.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 hw_ncipher.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-hw_ncipher.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-hw_ncipher.o: ../cryptlib.h hw_ncipher.c hw_ncipher_err.c hw_ncipher_err.h
-hw_ncipher.o: vendor_defns/hwcryptohook.h
+hw_ncipher.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
+hw_ncipher.o: ../../include/openssl/x509_vfy.h ../cryptlib.h hw_ncipher.c
+hw_ncipher.o: hw_ncipher_err.c hw_ncipher_err.h vendor_defns/hwcryptohook.h
 hw_nuron.o: ../../e_os.h ../../include/openssl/asn1.h
 hw_nuron.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
 hw_nuron.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -351,11 +381,17 @@ hw_nuron.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
 hw_nuron.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 hw_nuron.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
 hw_nuron.o: ../cryptlib.h hw_nuron.c hw_nuron_err.c hw_nuron_err.h
+hw_openbsd_dev_crypto.o: ../../include/openssl/aes.h
 hw_openbsd_dev_crypto.o: ../../include/openssl/asn1.h
 hw_openbsd_dev_crypto.o: ../../include/openssl/asn1t.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+hw_openbsd_dev_crypto.o: ../../include/openssl/bio.h
+hw_openbsd_dev_crypto.o: ../../include/openssl/blowfish.h
+hw_openbsd_dev_crypto.o: ../../include/openssl/bn.h
+hw_openbsd_dev_crypto.o: ../../include/openssl/cast.h
 hw_openbsd_dev_crypto.o: ../../include/openssl/conf.h
 hw_openbsd_dev_crypto.o: ../../include/openssl/crypto.h
+hw_openbsd_dev_crypto.o: ../../include/openssl/des.h
+hw_openbsd_dev_crypto.o: ../../include/openssl/des_old.h
 hw_openbsd_dev_crypto.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
 hw_openbsd_dev_crypto.o: ../../include/openssl/e_os2.h
 hw_openbsd_dev_crypto.o: ../../include/openssl/ec.h
@@ -363,40 +399,58 @@ hw_openbsd_dev_crypto.o: ../../include/openssl/ecdsa.h
 hw_openbsd_dev_crypto.o: ../../include/openssl/engine.h
 hw_openbsd_dev_crypto.o: ../../include/openssl/err.h
 hw_openbsd_dev_crypto.o: ../../include/openssl/evp.h
+hw_openbsd_dev_crypto.o: ../../include/openssl/idea.h
 hw_openbsd_dev_crypto.o: ../../include/openssl/lhash.h
+hw_openbsd_dev_crypto.o: ../../include/openssl/md2.h
+hw_openbsd_dev_crypto.o: ../../include/openssl/md4.h
+hw_openbsd_dev_crypto.o: ../../include/openssl/md5.h
+hw_openbsd_dev_crypto.o: ../../include/openssl/mdc2.h
 hw_openbsd_dev_crypto.o: ../../include/openssl/obj_mac.h
 hw_openbsd_dev_crypto.o: ../../include/openssl/objects.h
 hw_openbsd_dev_crypto.o: ../../include/openssl/opensslconf.h
 hw_openbsd_dev_crypto.o: ../../include/openssl/opensslv.h
 hw_openbsd_dev_crypto.o: ../../include/openssl/ossl_typ.h
 hw_openbsd_dev_crypto.o: ../../include/openssl/rand.h
+hw_openbsd_dev_crypto.o: ../../include/openssl/rc2.h
+hw_openbsd_dev_crypto.o: ../../include/openssl/rc4.h
+hw_openbsd_dev_crypto.o: ../../include/openssl/rc5.h
+hw_openbsd_dev_crypto.o: ../../include/openssl/ripemd.h
 hw_openbsd_dev_crypto.o: ../../include/openssl/rsa.h
 hw_openbsd_dev_crypto.o: ../../include/openssl/safestack.h
+hw_openbsd_dev_crypto.o: ../../include/openssl/sha.h
 hw_openbsd_dev_crypto.o: ../../include/openssl/stack.h
 hw_openbsd_dev_crypto.o: ../../include/openssl/symhacks.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/ui.h ../evp/evp_locl.h eng_int.h
-hw_openbsd_dev_crypto.o: hw_openbsd_dev_crypto.c
-hw_sureware.o: ../../e_os.h ../../include/openssl/asn1.h
-hw_sureware.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+hw_openbsd_dev_crypto.o: ../../include/openssl/ui.h
+hw_openbsd_dev_crypto.o: ../../include/openssl/ui_compat.h ../evp/evp_locl.h
+hw_openbsd_dev_crypto.o: eng_int.h hw_openbsd_dev_crypto.c
+hw_sureware.o: ../../e_os.h ../../include/openssl/aes.h
+hw_sureware.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
+hw_sureware.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 hw_sureware.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-hw_sureware.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
-hw_sureware.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h
-hw_sureware.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
-hw_sureware.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
-hw_sureware.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-hw_sureware.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+hw_sureware.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+hw_sureware.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+hw_sureware.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+hw_sureware.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
+hw_sureware.o: ../../include/openssl/ec.h ../../include/openssl/ecdsa.h
+hw_sureware.o: ../../include/openssl/engine.h ../../include/openssl/err.h
+hw_sureware.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+hw_sureware.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+hw_sureware.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
+hw_sureware.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 hw_sureware.o: ../../include/openssl/objects.h
 hw_sureware.o: ../../include/openssl/opensslconf.h
 hw_sureware.o: ../../include/openssl/opensslv.h
 hw_sureware.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h
 hw_sureware.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
-hw_sureware.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+hw_sureware.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
+hw_sureware.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+hw_sureware.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
 hw_sureware.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 hw_sureware.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-hw_sureware.o: ../../include/openssl/ui.h ../../include/openssl/x509.h
-hw_sureware.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h
-hw_sureware.o: engine.h hw_sureware.c hw_sureware_err.c hw_sureware_err.h
-hw_sureware.o: vendor_defns/sureware.h
+hw_sureware.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
+hw_sureware.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+hw_sureware.o: ../cryptlib.h eng_int.h engine.h hw_sureware.c hw_sureware_err.c
+hw_sureware.o: hw_sureware_err.h vendor_defns/sureware.h
 hw_ubsec.o: ../../e_os.h ../../include/openssl/asn1.h
 hw_ubsec.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
 hw_ubsec.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -412,97 +466,153 @@ hw_ubsec.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 hw_ubsec.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
 hw_ubsec.o: ../cryptlib.h hw_ubsec.c hw_ubsec_err.c hw_ubsec_err.h
 hw_ubsec.o: vendor_defns/hw_ubsec.h
-tb_cipher.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
-tb_cipher.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-tb_cipher.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
-tb_cipher.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-tb_cipher.o: ../../include/openssl/ec.h ../../include/openssl/ecdsa.h
-tb_cipher.o: ../../include/openssl/engine.h ../../include/openssl/err.h
-tb_cipher.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+tb_cipher.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
+tb_cipher.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+tb_cipher.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
+tb_cipher.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+tb_cipher.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+tb_cipher.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+tb_cipher.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+tb_cipher.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+tb_cipher.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+tb_cipher.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+tb_cipher.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+tb_cipher.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 tb_cipher.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 tb_cipher.o: ../../include/openssl/opensslconf.h
 tb_cipher.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
-tb_cipher.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-tb_cipher.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-tb_cipher.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+tb_cipher.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
+tb_cipher.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+tb_cipher.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+tb_cipher.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+tb_cipher.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+tb_cipher.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
 tb_cipher.o: eng_int.h tb_cipher.c
-tb_dh.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
-tb_dh.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-tb_dh.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
-tb_dh.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-tb_dh.o: ../../include/openssl/ec.h ../../include/openssl/ecdsa.h
-tb_dh.o: ../../include/openssl/engine.h ../../include/openssl/err.h
-tb_dh.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+tb_dh.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
+tb_dh.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+tb_dh.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
+tb_dh.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+tb_dh.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+tb_dh.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+tb_dh.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+tb_dh.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+tb_dh.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+tb_dh.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+tb_dh.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+tb_dh.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 tb_dh.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 tb_dh.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 tb_dh.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
+tb_dh.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+tb_dh.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
 tb_dh.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-tb_dh.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-tb_dh.o: ../../include/openssl/ui.h eng_int.h tb_dh.c
-tb_digest.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
-tb_digest.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-tb_digest.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
-tb_digest.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-tb_digest.o: ../../include/openssl/ec.h ../../include/openssl/ecdsa.h
-tb_digest.o: ../../include/openssl/engine.h ../../include/openssl/err.h
-tb_digest.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+tb_dh.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+tb_dh.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+tb_dh.o: ../../include/openssl/ui_compat.h eng_int.h tb_dh.c
+tb_digest.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
+tb_digest.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+tb_digest.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
+tb_digest.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+tb_digest.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+tb_digest.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+tb_digest.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+tb_digest.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+tb_digest.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+tb_digest.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+tb_digest.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+tb_digest.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 tb_digest.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 tb_digest.o: ../../include/openssl/opensslconf.h
 tb_digest.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
-tb_digest.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-tb_digest.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-tb_digest.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+tb_digest.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
+tb_digest.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+tb_digest.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+tb_digest.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+tb_digest.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+tb_digest.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
 tb_digest.o: eng_int.h tb_digest.c
-tb_dsa.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
-tb_dsa.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-tb_dsa.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
-tb_dsa.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-tb_dsa.o: ../../include/openssl/ec.h ../../include/openssl/ecdsa.h
-tb_dsa.o: ../../include/openssl/engine.h ../../include/openssl/err.h
-tb_dsa.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+tb_dsa.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
+tb_dsa.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+tb_dsa.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
+tb_dsa.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+tb_dsa.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+tb_dsa.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+tb_dsa.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+tb_dsa.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+tb_dsa.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+tb_dsa.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+tb_dsa.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+tb_dsa.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 tb_dsa.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 tb_dsa.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 tb_dsa.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
+tb_dsa.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+tb_dsa.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
 tb_dsa.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-tb_dsa.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-tb_dsa.o: ../../include/openssl/ui.h eng_int.h tb_dsa.c
-tb_ecdsa.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
-tb_ecdsa.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-tb_ecdsa.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
-tb_ecdsa.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-tb_ecdsa.o: ../../include/openssl/ec.h ../../include/openssl/ecdsa.h
-tb_ecdsa.o: ../../include/openssl/engine.h ../../include/openssl/err.h
-tb_ecdsa.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+tb_dsa.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+tb_dsa.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+tb_dsa.o: ../../include/openssl/ui_compat.h eng_int.h tb_dsa.c
+tb_ecdsa.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
+tb_ecdsa.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+tb_ecdsa.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
+tb_ecdsa.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+tb_ecdsa.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+tb_ecdsa.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+tb_ecdsa.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+tb_ecdsa.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+tb_ecdsa.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+tb_ecdsa.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+tb_ecdsa.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+tb_ecdsa.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 tb_ecdsa.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 tb_ecdsa.o: ../../include/openssl/opensslconf.h
 tb_ecdsa.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
-tb_ecdsa.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-tb_ecdsa.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-tb_ecdsa.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+tb_ecdsa.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
+tb_ecdsa.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+tb_ecdsa.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+tb_ecdsa.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+tb_ecdsa.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+tb_ecdsa.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
 tb_ecdsa.o: eng_int.h tb_ecdsa.c
-tb_rand.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
-tb_rand.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-tb_rand.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
-tb_rand.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-tb_rand.o: ../../include/openssl/ec.h ../../include/openssl/ecdsa.h
-tb_rand.o: ../../include/openssl/engine.h ../../include/openssl/err.h
-tb_rand.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+tb_rand.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
+tb_rand.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+tb_rand.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
+tb_rand.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+tb_rand.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+tb_rand.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+tb_rand.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+tb_rand.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+tb_rand.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+tb_rand.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+tb_rand.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+tb_rand.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 tb_rand.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 tb_rand.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 tb_rand.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
+tb_rand.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+tb_rand.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
 tb_rand.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-tb_rand.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-tb_rand.o: ../../include/openssl/ui.h eng_int.h tb_rand.c
-tb_rsa.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
-tb_rsa.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-tb_rsa.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
-tb_rsa.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-tb_rsa.o: ../../include/openssl/ec.h ../../include/openssl/ecdsa.h
-tb_rsa.o: ../../include/openssl/engine.h ../../include/openssl/err.h
-tb_rsa.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+tb_rand.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+tb_rand.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+tb_rand.o: ../../include/openssl/ui_compat.h eng_int.h tb_rand.c
+tb_rsa.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
+tb_rsa.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+tb_rsa.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
+tb_rsa.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+tb_rsa.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+tb_rsa.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+tb_rsa.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+tb_rsa.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+tb_rsa.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+tb_rsa.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+tb_rsa.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+tb_rsa.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 tb_rsa.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 tb_rsa.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 tb_rsa.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
+tb_rsa.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+tb_rsa.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
 tb_rsa.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-tb_rsa.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-tb_rsa.o: ../../include/openssl/ui.h eng_int.h tb_rsa.c
+tb_rsa.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+tb_rsa.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+tb_rsa.o: ../../include/openssl/ui_compat.h eng_int.h tb_rsa.c