use a generic EC_KEY structure (EC keys are not ECDSA specific)

[openssl.git] / crypto / pem / pem_all.c

diff --git a/crypto/pem/pem_all.c b/crypto/pem/pem_all.c
index 0b818d2e87490c707bbf479a481304e03c9ae63d..60f5188f309e5af482ca9f2a7788b0bfaabb7909 100644 (file)
--- a/crypto/pem/pem_all.c
+++ b/crypto/pem/pem_all.c
@@ -125,8 +125,8 @@ static RSA *pkey_get_rsa(EVP_PKEY *key, RSA **rsa);
 static DSA *pkey_get_dsa(EVP_PKEY *key, DSA **dsa);
 #endif
 
 static DSA *pkey_get_dsa(EVP_PKEY *key, DSA **dsa);
 #endif
 

-#ifndef OPENSSL_NO_ECDSA
-static ECDSA *pkey_get_ecdsa(EVP_PKEY *key, ECDSA **ecdsa);
+#ifndef OPENSSL_NO_EC
+static EC_KEY *pkey_get_eckey(EVP_PKEY *key, EC_KEY **eckey);

 #endif
 
 IMPLEMENT_PEM_rw(X509_REQ, X509_REQ, PEM_STRING_X509_REQ, X509_REQ)
 #endif
 
 IMPLEMENT_PEM_rw(X509_REQ, X509_REQ, PEM_STRING_X509_REQ, X509_REQ)


@@ -234,52 +234,51 @@ IMPLEMENT_PEM_rw(DSAparams, DSA, PEM_STRING_DSAPARAMS, DSAparams)
 
 #endif
 
 
 #endif
 

-#ifndef OPENSSL_NO_ECDSA

 
 

-static ECDSA *pkey_get_ecdsa(EVP_PKEY *key, ECDSA **ecdsa)
+#ifndef OPENSSL_NO_EC
+static EC_KEY *pkey_get_eckey(EVP_PKEY *key, EC_KEY **eckey)

 {
 {

-       ECDSA *dtmp;
+       EC_KEY *dtmp;

        if(!key) return NULL;
        if(!key) return NULL;

-       dtmp = EVP_PKEY_get1_ECDSA(key);
+       dtmp = EVP_PKEY_get1_EC_KEY(key);

        EVP_PKEY_free(key);
        if(!dtmp) return NULL;
        EVP_PKEY_free(key);
        if(!dtmp) return NULL;

-       if(ecdsa) 
+       if(eckey) 

        {
        {

-               ECDSA_free(*ecdsa);
-               *ecdsa = dtmp;
+               EC_KEY_free(*eckey);
+               *eckey = dtmp;

        }
        return dtmp;
 }
 
        }
        return dtmp;
 }
 

-ECDSA *PEM_read_bio_ECDSAPrivateKey(BIO *bp, ECDSA **ecdsa, pem_password_cb *cb,
+EC_KEY *PEM_read_bio_ECPrivateKey(BIO *bp, EC_KEY **key, pem_password_cb *cb,

                                                        void *u)
 {
        EVP_PKEY *pktmp;
        pktmp = PEM_read_bio_PrivateKey(bp, NULL, cb, u);
                                                        void *u)
 {
        EVP_PKEY *pktmp;
        pktmp = PEM_read_bio_PrivateKey(bp, NULL, cb, u);

-       return pkey_get_ecdsa(pktmp, ecdsa);
+       return pkey_get_eckey(pktmp, key);

 }
 
 }
 

-IMPLEMENT_PEM_write_cb(ECDSAPrivateKey, ECDSA, PEM_STRING_ECPRIVATEKEY, ECDSAPrivateKey)
-IMPLEMENT_PEM_rw(ECDSA_PUBKEY, ECDSA, PEM_STRING_PUBLIC, ECDSA_PUBKEY)
+IMPLEMENT_PEM_rw(ECPKParameters, EC_GROUP, PEM_STRING_ECPARAMETERS, ECPKParameters)
+
+IMPLEMENT_PEM_write_cb(ECPrivateKey, EC_KEY, PEM_STRING_ECPRIVATEKEY, ECPrivateKey)
+
+IMPLEMENT_PEM_rw(EC_PUBKEY, EC_KEY, PEM_STRING_PUBLIC, EC_PUBKEY)

 
 #ifndef OPENSSL_NO_FP_API
  
 
 #ifndef OPENSSL_NO_FP_API
  

-ECDSA *PEM_read_ECDSAPrivateKey(FILE *fp, ECDSA **ecdsa, pem_password_cb *cb,
+EC_KEY *PEM_read_ECPrivateKey(FILE *fp, EC_KEY **eckey, pem_password_cb *cb,

                                                                void *u)
 {
        EVP_PKEY *pktmp;
        pktmp = PEM_read_PrivateKey(fp, NULL, cb, u);
                                                                void *u)
 {
        EVP_PKEY *pktmp;
        pktmp = PEM_read_PrivateKey(fp, NULL, cb, u);

-       return pkey_get_ecdsa(pktmp, ecdsa);
+       return pkey_get_eckey(pktmp, eckey);

 }
 
 #endif
 
 #endif
 
 }
 
 #endif
 
 #endif
 

-#ifndef OPENSSL_NO_EC
-IMPLEMENT_PEM_rw(ECPKParameters, EC_GROUP, PEM_STRING_ECPARAMETERS, ECPKParameters)
-#endif
-

 #ifndef OPENSSL_NO_DH
 
 IMPLEMENT_PEM_rw(DHparams, DH, PEM_STRING_DHPARAMS, DHparams)
 #ifndef OPENSSL_NO_DH
 
 IMPLEMENT_PEM_rw(DHparams, DH, PEM_STRING_DHPARAMS, DHparams)