projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add 'flags' parameter to EVP_PKEY_asn1_meth_new() to set algorithm flags.
[openssl.git]
/
crypto
/
asn1
/
ameth_lib.c
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)
{