projects / openssl.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
(oops) Apologies all, that last header-cleanup commit was from the wrong
[openssl.git] / crypto / asn1 / x_pubkey.c
diff --git a/crypto/asn1/x_pubkey.c b/crypto/asn1/x_pubkey.c
index f1ddbf044f51bef384d60fde877e915e83a2feb0..10b87def32aea6c7f8325fafc38911132597fd69 100644 (file)
--- a/crypto/asn1/x_pubkey.c
+++ b/crypto/asn1/x_pubkey.c
@@ -60,6 +60,8 @@
 #include "cryptlib.h"
 #include <openssl/asn1t.h>
 #include <openssl/x509.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
 
 /* Minor tweak to operation: free up EVP_PKEY */
 static int pubkey_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it)
@@ -119,7 +121,7 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey)
                dsa->write_params=0;
                ASN1_TYPE_free(a->parameter);
                i=i2d_DSAparams(dsa,NULL);
-               p=(unsigned char *)OPENSSL_malloc(i);
+               if ((p=(unsigned char *)OPENSSL_malloc(i)) == NULL) goto err;
                pp=p;
                i2d_DSAparams(dsa,&pp);
                a->parameter=ASN1_TYPE_new();
@@ -129,14 +131,14 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey)
                OPENSSL_free(p);
                }
 #endif
-#ifndef OPENSSL_NO_ECDSA
-       else if (pkey->type == EVP_PKEY_ECDSA)
+#ifndef OPENSSL_NO_EC
+       else if (pkey->type == EVP_PKEY_EC)
                {
                int nid=0;
                unsigned char *pp;
-               ECDSA *ecdsa;
+               EC_KEY *eckey;
                
-               ecdsa = pkey->pkey.ecdsa;
+               eckey = pkey->pkey.eckey;
                ASN1_TYPE_free(a->parameter);
 
                if ((a->parameter = ASN1_TYPE_new()) == NULL)
@@ -145,7 +147,8 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey)
                        goto err;
                        }
 
-               if ((ECDSA_get_parameter_flags(ecdsa) & ECDSA_FLAG_NAMED_CURVE) && (nid = EC_GROUP_get_nid(ecdsa->group)))
+               if (EC_GROUP_get_asn1_flag(eckey->group)
+                     && (nid = EC_GROUP_get_nid(eckey->group)))
                        {
                        /* just set the OID */
                        a->parameter->type = V_ASN1_OBJECT;
@@ -153,9 +156,9 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey)
                        }
                else /* explicit parameters */
                        {
-                       if ((i = i2d_ECDSAParameters(ecdsa, NULL)) == 0)
+                       if ((i = i2d_ECParameters(eckey, NULL)) == 0)
                                {
-                               X509err(X509_F_X509_PUBKEY_SET, ERR_R_ECDSA_LIB);
+                               X509err(X509_F_X509_PUBKEY_SET, ERR_R_EC_LIB);
                                goto err;
                                }
                        if ((p = (unsigned char *) OPENSSL_malloc(i)) == NULL)
@@ -164,9 +167,9 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey)
                                goto err;
                                }       
                        pp = p;
-                       if (!i2d_ECDSAParameters(ecdsa, &pp))
+                       if (!i2d_ECParameters(eckey, &pp))
                                {
-                               X509err(X509_F_X509_PUBKEY_SET, ERR_R_ECDSA_LIB);
+                               X509err(X509_F_X509_PUBKEY_SET, ERR_R_EC_LIB);
                                OPENSSL_free(p);
                                goto err;
                                }
@@ -189,7 +192,11 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey)
                }
 
        if ((i=i2d_PublicKey(pkey,NULL)) <= 0) goto err;
-       if ((s=(unsigned char *)OPENSSL_malloc(i+1)) == NULL) goto err;
+       if ((s=(unsigned char *)OPENSSL_malloc(i+1)) == NULL)
+               {
+               X509err(X509_F_X509_PUBKEY_SET,ERR_R_MALLOC_FAILURE);
+               goto err;
+               }
        p=s;
        i2d_PublicKey(pkey,&p);
        if (!M_ASN1_BIT_STRING_set(pk->public_key,s,i)) goto err;
@@ -221,7 +228,7 @@ EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key)
        EVP_PKEY *ret=NULL;
        long j;
        int type;
-       unsigned char *p;
+       const unsigned char *p;
 #if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_ECDSA)
        const unsigned char *cp;
        X509_ALGOR *a;
@@ -272,24 +279,25 @@ EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key)
                ret->save_parameters=1;
                }
 #endif
-#ifndef OPENSSL_NO_ECDSA
-       else if (ret->type == EVP_PKEY_ECDSA)
+#ifndef OPENSSL_NO_EC
+       else if (ret->type == EVP_PKEY_EC)
                {
                if (a->parameter && (a->parameter->type == V_ASN1_SEQUENCE))
                        {
                        /* type == V_ASN1_SEQUENCE => we have explicit parameters
                          * (e.g. parameters in the X9_62_EC_PARAMETERS-structure )
                         */
-                       if ((ret->pkey.ecdsa= ECDSA_new()) == NULL)
+                       if ((ret->pkey.eckey= EC_KEY_new()) == NULL)
                                {
-                               X509err(X509_F_X509_PUBKEY_GET, ERR_R_MALLOC_FAILURE);
+                               X509err(X509_F_X509_PUBKEY_GET, 
+                                       ERR_R_MALLOC_FAILURE);
                                goto err;
                                }
                        cp = p = a->parameter->value.sequence->data;
                        j = a->parameter->value.sequence->length;
-                       if (!d2i_ECDSAParameters(&ret->pkey.ecdsa, &cp, (long)j))
+                       if (!d2i_ECParameters(&ret->pkey.eckey, &cp, (long)j))
                                {
-                               X509err(X509_F_X509_PUBKEY_GET, ERR_R_ECDSA_LIB);
+                               X509err(X509_F_X509_PUBKEY_GET, ERR_R_EC_LIB);
                                goto err;
                                }
                        }
@@ -298,13 +306,17 @@ EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key)
                        /* type == V_ASN1_OBJECT => the parameters are given
                         * by an asn1 OID
                         */
-                       if (ret->pkey.ecdsa == NULL)
-                               ret->pkey.ecdsa = ECDSA_new();
-                       if (ret->pkey.ecdsa->group)
-                               EC_GROUP_free(ret->pkey.ecdsa->group);
-                       ret->pkey.ecdsa->parameter_flags |= ECDSA_FLAG_NAMED_CURVE;
-                       if ((ret->pkey.ecdsa->group = EC_GROUP_new_by_name(OBJ_obj2nid(a->parameter->value.object))) == NULL)
+                       EC_KEY *eckey;
+                       if (ret->pkey.eckey == NULL)
+                               ret->pkey.eckey = EC_KEY_new();
+                       eckey = ret->pkey.eckey;
+                       if (eckey->group)
+                               EC_GROUP_free(eckey->group);
+                       if ((eckey->group = EC_GROUP_new_by_nid(
+                             OBJ_obj2nid(a->parameter->value.object))) == NULL)
                                goto err;
+                       EC_GROUP_set_asn1_flag(eckey->group, 
+                                               OPENSSL_EC_NAMED_CURVE);
                        }
                        /* the case implicitlyCA is currently not implemented */
                ret->save_parameters = 1;
@@ -313,7 +325,7 @@ EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key)
 
        p=key->public_key->data;
         j=key->public_key->length;
-        if ((ret = d2i_PublicKey(type, &ret, &p, (long)j)) == NULL)
+        if (!d2i_PublicKey(type, &ret, &p, (long)j))
                {
                X509err(X509_F_X509_PUBKEY_GET, X509_R_ERR_ASN1_LIB);
                goto err;
@@ -332,7 +344,7 @@ err:
  * and encode or decode as X509_PUBKEY
  */
 
-EVP_PKEY *d2i_PUBKEY(EVP_PKEY **a, unsigned char **pp,
+EVP_PKEY *d2i_PUBKEY(EVP_PKEY **a, const unsigned char **pp,
             long length)
        {
        X509_PUBKEY *xpk;
@@ -365,12 +377,12 @@ int i2d_PUBKEY(EVP_PKEY *a, unsigned char **pp)
  * keys
  */
 #ifndef OPENSSL_NO_RSA
-RSA *d2i_RSA_PUBKEY(RSA **a, unsigned char **pp,
+RSA *d2i_RSA_PUBKEY(RSA **a, const unsigned char **pp,
             long length)
        {
        EVP_PKEY *pkey;
        RSA *key;
-       unsigned char *q;
+       const unsigned char *q;
        q = *pp;
        pkey = d2i_PUBKEY(NULL, &q, length);
        if (!pkey) return NULL;
@@ -405,12 +417,12 @@ int i2d_RSA_PUBKEY(RSA *a, unsigned char **pp)
 #endif
 
 #ifndef OPENSSL_NO_DSA
-DSA *d2i_DSA_PUBKEY(DSA **a, unsigned char **pp,
+DSA *d2i_DSA_PUBKEY(DSA **a, const unsigned char **pp,
             long length)
        {
        EVP_PKEY *pkey;
        DSA *key;
-       unsigned char *q;
+       const unsigned char *q;
        q = *pp;
        pkey = d2i_PUBKEY(NULL, &q, length);
        if (!pkey) return NULL;
@@ -444,38 +456,38 @@ int i2d_DSA_PUBKEY(DSA *a, unsigned char **pp)
        }
 #endif
 
-#ifndef OPENSSL_NO_ECDSA
-ECDSA *d2i_ECDSA_PUBKEY(ECDSA **a, unsigned char **pp, long length)
+#ifndef OPENSSL_NO_EC
+EC_KEY *d2i_EC_PUBKEY(EC_KEY **a, const unsigned char **pp, long length)
        {
        EVP_PKEY *pkey;
-       ECDSA *key;
-       unsigned char *q;
+       EC_KEY *key;
+       const unsigned char *q;
        q = *pp;
        pkey = d2i_PUBKEY(NULL, &q, length);
        if (!pkey) return(NULL);
-       key = EVP_PKEY_get1_ECDSA(pkey);
+       key = EVP_PKEY_get1_EC_KEY(pkey);
        EVP_PKEY_free(pkey);
        if (!key)  return(NULL);
        *pp = q;
        if (a)
                {
-               ECDSA_free(*a);
+               EC_KEY_free(*a);
                *a = key;
                }
        return(key);
        }
 
-int i2d_ECDSA_PUBKEY(ECDSA *a, unsigned char **pp)
+int i2d_EC_PUBKEY(EC_KEY *a, unsigned char **pp)
        {
        EVP_PKEY *pktmp;
        int ret;
        if (!a) return(0);
        if ((pktmp = EVP_PKEY_new()) == NULL)
                {
-               ASN1err(ASN1_F_I2D_ECDSA_PUBKEY, ERR_R_MALLOC_FAILURE);
+               ASN1err(ASN1_F_I2D_EC_PUBKEY, ERR_R_MALLOC_FAILURE);
                return(0);
                }
-       EVP_PKEY_set1_ECDSA(pktmp, a);
+       EVP_PKEY_set1_EC_KEY(pktmp, a);
        ret = i2d_PUBKEY(pktmp, pp);
        EVP_PKEY_free(pktmp);
        return(ret);
Unnamed repository; edit this file 'description' to name the repository.