Add 'flags' parameter to EVP_PKEY_asn1_meth_new() to set algorithm flags.

diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c
index 8c33ca562587d691245a0270f0a868ffa0352355..af08defbe496d19e02ab428ef4e7fd886b44b3de 100644 (file)
--- a/crypto/asn1/ameth_lib.c
+++ b/crypto/asn1/ameth_lib.c
@@ -191,11 +191,10 @@ int EVP_PKEY_asn1_add0(const EVP_PKEY_ASN1_METHOD *ameth)
 int EVP_PKEY_asn1_add_alias(int to, int from)
        {
        EVP_PKEY_ASN1_METHOD *ameth;
 int EVP_PKEY_asn1_add_alias(int to, int from)
        {
        EVP_PKEY_ASN1_METHOD *ameth;

-       ameth = EVP_PKEY_asn1_new(from, NULL, NULL);
+       ameth = EVP_PKEY_asn1_new(from, ASN1_PKEY_ALIAS, NULL, NULL);

        if (!ameth)
                return 0;
        ameth->pkey_base_id = to;
        if (!ameth)
                return 0;
        ameth->pkey_base_id = to;

-       ameth->pkey_flags |= ASN1_PKEY_ALIAS;

        return EVP_PKEY_asn1_add0(ameth);
        }
 
        return EVP_PKEY_asn1_add0(ameth);
        }
 


@@ -218,7 +217,7 @@ int EVP_PKEY_asn1_get0_info(int *ppkey_id, int *ppkey_base_id, int *ppkey_flags,
        return 1;
        }
 
        return 1;
        }
 

-EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id,
+EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id, int flags,

                                        const char *pem_str, const char *info)
        {
        EVP_PKEY_ASN1_METHOD *ameth;
                                        const char *pem_str, const char *info)
        {
        EVP_PKEY_ASN1_METHOD *ameth;


@@ -228,7 +227,7 @@ EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id,
 
        ameth->pkey_id = id;
        ameth->pkey_base_id = id;
 
        ameth->pkey_id = id;
        ameth->pkey_base_id = id;

-       ameth->pkey_flags = ASN1_PKEY_DYNAMIC;
+       ameth->pkey_flags = flags | ASN1_PKEY_DYNAMIC;

 
        if (info)
                {
 
        if (info)
                {

diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index 6ec2fa798a8176a8efdcbd2371a11d5549d8fd4a..cff40ab99a99e85e92d94e918145b2f7b96824e1 100644 (file)
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -815,7 +815,7 @@ int EVP_PKEY_asn1_get0_info(int *ppkey_id, int *pkey_base_id, int *ppkey_flags,
                                const char **pinfo, const char **ppem_str,
                                        const EVP_PKEY_ASN1_METHOD *ameth);
 
                                const char **pinfo, const char **ppem_str,
                                        const EVP_PKEY_ASN1_METHOD *ameth);
 

-EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id,
+EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id, int flags,

                                        const char *pem_str, const char *info);
 void EVP_PKEY_asn1_free(EVP_PKEY_ASN1_METHOD *ameth);
 void EVP_PKEY_asn1_set_public(EVP_PKEY_ASN1_METHOD *ameth,
                                        const char *pem_str, const char *info);
 void EVP_PKEY_asn1_free(EVP_PKEY_ASN1_METHOD *ameth);
 void EVP_PKEY_asn1_set_public(EVP_PKEY_ASN1_METHOD *ameth,