Add support for shared libraries with OS/2.

[oweals/openssl.git] / crypto / asn1 / x_pubkey.c

diff --git a/crypto/asn1/x_pubkey.c b/crypto/asn1/x_pubkey.c
index a34f473cfee8d9a1103099b498c0c3020f1a4a8f..68ddeb43f20f94077683f4201adacf7d35e4c9d4 100644 (file)
--- a/crypto/asn1/x_pubkey.c
+++ b/crypto/asn1/x_pubkey.c
@@ -85,7 +85,7 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey)
        X509_PUBKEY *pk;
        X509_ALGOR *a;
        ASN1_OBJECT *o;
-       unsigned char *s,*p;
+       unsigned char *s,*p = NULL;
        int i;
 
        if (x == NULL) return(0);
@@ -119,7 +119,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();
@@ -142,11 +142,11 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey)
                if ((a->parameter = ASN1_TYPE_new()) == NULL)
                        {
                        X509err(X509_F_X509_PUBKEY_SET, ERR_R_ASN1_LIB);
-                       OPENSSL_free(p);
                        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(ecdsa->group)
+                     && (nid = EC_GROUP_get_nid(ecdsa->group)))
                        {
                        /* just set the OID */
                        a->parameter->type = V_ASN1_OBJECT;
@@ -190,7 +190,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;
@@ -299,13 +303,17 @@ EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key)
                        /* type == V_ASN1_OBJECT => the parameters are given
                         * by an asn1 OID
                         */
+                       ECDSA *ecdsa;
                        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)
+                       ecdsa = ret->pkey.ecdsa;
+                       if (ecdsa->group)
+                               EC_GROUP_free(ecdsa->group);
+                       if ((ecdsa->group = EC_GROUP_new_by_name(
+                             OBJ_obj2nid(a->parameter->value.object))) == NULL)
                                goto err;
+                       EC_GROUP_set_asn1_flag(ecdsa->group, 
+                                               OPENSSL_EC_NAMED_CURVE);
                        }
                        /* the case implicitlyCA is currently not implemented */
                ret->save_parameters = 1;