X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fasn1%2Fameth_lib.c;h=af08defbe496d19e02ab428ef4e7fd886b44b3de;hp=8c33ca562587d691245a0270f0a868ffa0352355;hb=cddaba8ede007579e0f174275312a4c722afa82e;hpb=49c5f38d3dceda33dcbdc940079f6f86ff3d0c03 diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c index 8c33ca5625..af08defbe4 100644 --- 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; - 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; - ameth->pkey_flags |= ASN1_PKEY_ALIAS; 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; } -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; @@ -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_flags = ASN1_PKEY_DYNAMIC; + ameth->pkey_flags = flags | ASN1_PKEY_DYNAMIC; if (info) {