summaryrefslogtreecommitdiffstats
path: root/crypto/pem/pem_all.c
diff options
context:
space:
mode:
authorBodo Möller <bodo@openssl.org>2002-07-14 16:54:31 +0000
committerBodo Möller <bodo@openssl.org>2002-07-14 16:54:31 +0000
commit5dbd3efce784cb5621de8402430eda23d1762568 (patch)
treeb9fec0675747eaab2d8a5539d3def0c16aabad3d /crypto/pem/pem_all.c
parent876811e2af12fe7f5b05104ad2187516cff2aee2 (diff)
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
Diffstat (limited to 'crypto/pem/pem_all.c')
-rw-r--r--crypto/pem/pem_all.c4
1 files changed, 3 insertions, 1 deletions
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