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

3 files changed, 184 insertions, 93 deletions

diff --git a/crypto/pem/Makefile.ssl b/crypto/pem/Makefile.ssl
index fe04acc0be..4120171898 100644
--- a/crypto/pem/Makefile.ssl
+++ b/crypto/pem/Makefile.ssl
@@ -82,183 +82,269 @@ clean:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-pem_all.o: ../../e_os.h ../../include/openssl/asn1.h
-pem_all.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+pem_all.o: ../../e_os.h ../../include/openssl/aes.h
+pem_all.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
+pem_all.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 pem_all.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-pem_all.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
-pem_all.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-pem_all.o: ../../include/openssl/ec.h ../../include/openssl/ecdsa.h
-pem_all.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-pem_all.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+pem_all.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+pem_all.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+pem_all.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+pem_all.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+pem_all.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
+pem_all.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+pem_all.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+pem_all.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
+pem_all.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 pem_all.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 pem_all.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 pem_all.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
-pem_all.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+pem_all.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
+pem_all.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+pem_all.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
 pem_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 pem_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+pem_all.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
 pem_all.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
 pem_all.o: ../cryptlib.h pem_all.c
-pem_err.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
-pem_err.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-pem_err.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
-pem_err.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-pem_err.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
-pem_err.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
-pem_err.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+pem_err.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
+pem_err.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+pem_err.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
+pem_err.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
+pem_err.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+pem_err.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
+pem_err.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+pem_err.o: ../../include/openssl/ec.h ../../include/openssl/ecdsa.h
+pem_err.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+pem_err.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+pem_err.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+pem_err.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 pem_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 pem_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 pem_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h
 pem_err.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
+pem_err.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+pem_err.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
 pem_err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 pem_err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-pem_err.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+pem_err.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+pem_err.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
 pem_err.o: ../../include/openssl/x509_vfy.h pem_err.c
-pem_info.o: ../../e_os.h ../../include/openssl/asn1.h
-pem_info.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+pem_info.o: ../../e_os.h ../../include/openssl/aes.h
+pem_info.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
+pem_info.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 pem_info.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-pem_info.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
-pem_info.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-pem_info.o: ../../include/openssl/ec.h ../../include/openssl/ecdsa.h
-pem_info.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-pem_info.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+pem_info.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+pem_info.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+pem_info.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+pem_info.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+pem_info.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
+pem_info.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+pem_info.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+pem_info.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
+pem_info.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 pem_info.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 pem_info.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 pem_info.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
-pem_info.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+pem_info.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
+pem_info.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+pem_info.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
 pem_info.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 pem_info.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+pem_info.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
 pem_info.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
 pem_info.o: ../cryptlib.h pem_info.c
-pem_lib.o: ../../e_os.h ../../include/openssl/asn1.h
-pem_lib.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+pem_lib.o: ../../e_os.h ../../include/openssl/aes.h
+pem_lib.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
+pem_lib.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 pem_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-pem_lib.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-pem_lib.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
-pem_lib.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-pem_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdsa.h
-pem_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-pem_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+pem_lib.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+pem_lib.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+pem_lib.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+pem_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+pem_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
+pem_lib.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+pem_lib.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+pem_lib.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
+pem_lib.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 pem_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 pem_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 pem_lib.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
 pem_lib.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
-pem_lib.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+pem_lib.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
+pem_lib.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+pem_lib.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
 pem_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 pem_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 pem_lib.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
 pem_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
 pem_lib.o: ../cryptlib.h pem_lib.c
-pem_oth.o: ../../e_os.h ../../include/openssl/asn1.h
-pem_oth.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+pem_oth.o: ../../e_os.h ../../include/openssl/aes.h
+pem_oth.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
+pem_oth.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 pem_oth.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-pem_oth.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
-pem_oth.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-pem_oth.o: ../../include/openssl/ec.h ../../include/openssl/ecdsa.h
-pem_oth.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-pem_oth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+pem_oth.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+pem_oth.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+pem_oth.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+pem_oth.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+pem_oth.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
+pem_oth.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+pem_oth.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+pem_oth.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
+pem_oth.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 pem_oth.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 pem_oth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 pem_oth.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
 pem_oth.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+pem_oth.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+pem_oth.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
 pem_oth.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 pem_oth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-pem_oth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+pem_oth.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+pem_oth.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
 pem_oth.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pem_oth.c
-pem_pk8.o: ../../e_os.h ../../include/openssl/asn1.h
-pem_pk8.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+pem_pk8.o: ../../e_os.h ../../include/openssl/aes.h
+pem_pk8.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
+pem_pk8.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 pem_pk8.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-pem_pk8.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
-pem_pk8.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-pem_pk8.o: ../../include/openssl/ec.h ../../include/openssl/ecdsa.h
-pem_pk8.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-pem_pk8.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+pem_pk8.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+pem_pk8.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+pem_pk8.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+pem_pk8.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+pem_pk8.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
+pem_pk8.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+pem_pk8.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+pem_pk8.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
+pem_pk8.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 pem_pk8.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 pem_pk8.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 pem_pk8.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
 pem_pk8.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
-pem_pk8.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+pem_pk8.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
+pem_pk8.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+pem_pk8.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
 pem_pk8.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 pem_pk8.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+pem_pk8.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
 pem_pk8.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
 pem_pk8.o: ../cryptlib.h pem_pk8.c
-pem_pkey.o: ../../e_os.h ../../include/openssl/asn1.h
-pem_pkey.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+pem_pkey.o: ../../e_os.h ../../include/openssl/aes.h
+pem_pkey.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
+pem_pkey.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 pem_pkey.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-pem_pkey.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
-pem_pkey.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-pem_pkey.o: ../../include/openssl/ec.h ../../include/openssl/ecdsa.h
-pem_pkey.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-pem_pkey.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+pem_pkey.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+pem_pkey.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+pem_pkey.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+pem_pkey.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+pem_pkey.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
+pem_pkey.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+pem_pkey.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+pem_pkey.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
+pem_pkey.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 pem_pkey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 pem_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 pem_pkey.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
 pem_pkey.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
-pem_pkey.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+pem_pkey.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
+pem_pkey.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+pem_pkey.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
 pem_pkey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 pem_pkey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+pem_pkey.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
 pem_pkey.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
 pem_pkey.o: ../cryptlib.h pem_pkey.c
-pem_seal.o: ../../e_os.h ../../include/openssl/asn1.h
-pem_seal.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+pem_seal.o: ../../e_os.h ../../include/openssl/aes.h
+pem_seal.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
+pem_seal.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 pem_seal.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-pem_seal.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
-pem_seal.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-pem_seal.o: ../../include/openssl/ec.h ../../include/openssl/ecdsa.h
-pem_seal.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-pem_seal.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+pem_seal.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+pem_seal.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+pem_seal.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+pem_seal.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+pem_seal.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
+pem_seal.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+pem_seal.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+pem_seal.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
+pem_seal.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 pem_seal.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 pem_seal.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 pem_seal.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
 pem_seal.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+pem_seal.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+pem_seal.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
 pem_seal.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 pem_seal.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-pem_seal.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+pem_seal.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+pem_seal.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
 pem_seal.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pem_seal.c
-pem_sign.o: ../../e_os.h ../../include/openssl/asn1.h
-pem_sign.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+pem_sign.o: ../../e_os.h ../../include/openssl/aes.h
+pem_sign.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
+pem_sign.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 pem_sign.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-pem_sign.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
-pem_sign.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-pem_sign.o: ../../include/openssl/ec.h ../../include/openssl/ecdsa.h
-pem_sign.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-pem_sign.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+pem_sign.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+pem_sign.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+pem_sign.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+pem_sign.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+pem_sign.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
+pem_sign.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+pem_sign.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+pem_sign.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
+pem_sign.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 pem_sign.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 pem_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 pem_sign.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
 pem_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+pem_sign.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+pem_sign.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
 pem_sign.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 pem_sign.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-pem_sign.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+pem_sign.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+pem_sign.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
 pem_sign.o: ../../include/openssl/x509_vfy.h ../cryptlib.h pem_sign.c
-pem_x509.o: ../../e_os.h ../../include/openssl/asn1.h
-pem_x509.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+pem_x509.o: ../../e_os.h ../../include/openssl/aes.h
+pem_x509.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
+pem_x509.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 pem_x509.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-pem_x509.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
-pem_x509.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-pem_x509.o: ../../include/openssl/ec.h ../../include/openssl/ecdsa.h
-pem_x509.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-pem_x509.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+pem_x509.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+pem_x509.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+pem_x509.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+pem_x509.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+pem_x509.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
+pem_x509.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+pem_x509.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+pem_x509.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
+pem_x509.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 pem_x509.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 pem_x509.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 pem_x509.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
-pem_x509.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+pem_x509.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
+pem_x509.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+pem_x509.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
 pem_x509.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 pem_x509.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+pem_x509.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
 pem_x509.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
 pem_x509.o: ../cryptlib.h pem_x509.c
-pem_xaux.o: ../../e_os.h ../../include/openssl/asn1.h
-pem_xaux.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+pem_xaux.o: ../../e_os.h ../../include/openssl/aes.h
+pem_xaux.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
+pem_xaux.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 pem_xaux.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-pem_xaux.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
-pem_xaux.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-pem_xaux.o: ../../include/openssl/ec.h ../../include/openssl/ecdsa.h
-pem_xaux.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-pem_xaux.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+pem_xaux.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+pem_xaux.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
+pem_xaux.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+pem_xaux.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+pem_xaux.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
+pem_xaux.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+pem_xaux.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+pem_xaux.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
+pem_xaux.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 pem_xaux.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 pem_xaux.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 pem_xaux.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
-pem_xaux.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+pem_xaux.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
+pem_xaux.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+pem_xaux.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
 pem_xaux.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 pem_xaux.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+pem_xaux.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
 pem_xaux.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
 pem_xaux.o: ../cryptlib.h pem_xaux.c
diff --git a/crypto/pem/pem.h b/crypto/pem/pem.h
index a0feea36c5..3e8c37b25c 100644
--- a/crypto/pem/pem.h
+++ b/crypto/pem/pem.h
@@ -93,7 +93,7 @@ extern "C" {
 #define PEM_OBJ_PRIV_RSA_PUBLIC	19
 #define PEM_OBJ_PRIV_ECDSA	20
 #define PEM_OBJ_PUB_ECDSA	21
-#define PEM_OBJ_ECDSAPARAMS	22
+#define PEM_OBJ_ECPARAMETERS	22
 
 #define PEM_ERROR		30
 #define PEM_DEK_DES_CBC         40
@@ -131,7 +131,7 @@ extern "C" {
 #define PEM_STRING_DSAPARAMS	"DSA PARAMETERS"
 #define PEM_STRING_ECDSA	"ECDSA PRIVATE KEY"
 #define PEM_STRING_ECDSA_PUBLIC "ECDSA PUBLIC KEY"
-#define PEM_STRING_ECDSAPARAMS	"ECDSA PARAMETERS"
+#define PEM_STRING_ECPARAMETERS "EC PARAMETERS"
 
   /* Note that this structure is initialised by PEM_SealInit and cleaned up
      by PEM_SealFinal (at least for now) */
@@ -581,7 +581,10 @@ DECLARE_PEM_rw(DSAparams, DSA)
 #ifndef OPENSSL_NO_ECDSA
 DECLARE_PEM_rw_cb(ECDSAPrivateKey, ECDSA)
 DECLARE_PEM_rw(ECDSA_PUBKEY, ECDSA)
-DECLARE_PEM_rw(ECDSAParameters, ECDSA)
+#endif
+
+#ifndef OPENSSL_NO_EC
+DECLARE_PEM_rw(ECPKParameters, EC_GROUP)
 #endif
 
 #ifndef OPENSSL_NO_DH
diff --git a/crypto/pem/pem_all.c b/crypto/pem/pem_all.c
index 2a4b865a50..897c4329f3 100644
--- a/crypto/pem/pem_all.c
+++ b/crypto/pem/pem_all.c
@@ -274,8 +274,10 @@ ECDSA *PEM_read_ECDSAPrivateKey(FILE *fp, ECDSA **ecdsa, pem_password_cb *cb,
 
 #endif
 
-IMPLEMENT_PEM_rw(ECDSAParameters, ECDSA, PEM_STRING_ECDSAPARAMS, ECDSAParameters)
+#endif
 
+#ifndef OPENSSL_NO_EC
+IMPLEMENT_PEM_rw(ECPKParameters, EC_GROUP, PEM_STRING_ECPARAMETERS, ECPKParameters)
 #endif
 
 #ifndef OPENSSL_NO_DH