long length)
{
EVP_PKEY *ret;
+ EVP_PKEY *copy = NULL;
if ((a == NULL) || (*a == NULL)) {
if ((ret = EVP_PKEY_new()) == NULL) {
ERR_raise(ERR_LIB_ASN1, ERR_R_EVP_LIB);
return NULL;
}
- } else
+ } else {
ret = *a;
- if (type != EVP_PKEY_get_id(ret) && !EVP_PKEY_set_type(ret, type)) {
+#ifndef OPENSSL_NO_EC
+ if (evp_pkey_is_provided(ret)
+ && EVP_PKEY_get_base_id(ret) == EVP_PKEY_EC) {
+ if (!evp_pkey_copy_downgraded(©, ret))
+ goto err;
+ }
+#endif
+ }
+
+ if ((type != EVP_PKEY_get_id(ret) || copy != NULL)
+ && !EVP_PKEY_set_type(ret, type)) {
ERR_raise(ERR_LIB_ASN1, ERR_R_EVP_LIB);
goto err;
}
break;
#ifndef OPENSSL_NO_DSA
case EVP_PKEY_DSA:
- /* TMP UGLY CAST */
if (!d2i_DSAPublicKey(&ret->pkey.dsa, pp, length)) {
ERR_raise(ERR_LIB_ASN1, ERR_R_ASN1_LIB);
goto err;
#endif
#ifndef OPENSSL_NO_EC
case EVP_PKEY_EC:
+ if (copy != NULL) {
+ /* use downgraded parameters from copy */
+ ret->pkey.ec = copy->pkey.ec;
+ copy->pkey.ec = NULL;
+ }
if (!o2i_ECPublicKey(&ret->pkey.ec, pp, length)) {
ERR_raise(ERR_LIB_ASN1, ERR_R_ASN1_LIB);
goto err;
}
if (a != NULL)
(*a) = ret;
+ EVP_PKEY_free(copy);
return ret;
err:
if (a == NULL || *a != ret)
EVP_PKEY_free(ret);
+ EVP_PKEY_free(copy);
return NULL;
}