diff options
Diffstat (limited to 'src/lib/libcrypto/asn1/ameth_lib.c')
-rw-r--r-- | src/lib/libcrypto/asn1/ameth_lib.c | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/src/lib/libcrypto/asn1/ameth_lib.c b/src/lib/libcrypto/asn1/ameth_lib.c index 656d9036f8..f9ddf5dcd1 100644 --- a/src/lib/libcrypto/asn1/ameth_lib.c +++ b/src/lib/libcrypto/asn1/ameth_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ameth_lib.c,v 1.37 2023/12/15 21:55:47 tb Exp $ */ | 1 | /* $OpenBSD: ameth_lib.c,v 1.38 2023/12/29 10:08:44 tb Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2006. | 3 | * project 2006. |
4 | */ | 4 | */ |
@@ -177,20 +177,6 @@ EVP_PKEY_asn1_find_str(ENGINE **pe, const char *str, int len) | |||
177 | } | 177 | } |
178 | 178 | ||
179 | int | 179 | int |
180 | EVP_PKEY_asn1_add0(const EVP_PKEY_ASN1_METHOD *ameth) | ||
181 | { | ||
182 | EVPerror(ERR_R_DISABLED); | ||
183 | return 0; | ||
184 | } | ||
185 | |||
186 | int | ||
187 | EVP_PKEY_asn1_add_alias(int to, int from) | ||
188 | { | ||
189 | EVPerror(ERR_R_DISABLED); | ||
190 | return 0; | ||
191 | } | ||
192 | |||
193 | int | ||
194 | EVP_PKEY_asn1_get0_info(int *ppkey_id, int *ppkey_base_id, int *ppkey_flags, | 180 | EVP_PKEY_asn1_get0_info(int *ppkey_id, int *ppkey_base_id, int *ppkey_flags, |
195 | const char **pinfo, const char **ppem_str, | 181 | const char **pinfo, const char **ppem_str, |
196 | const EVP_PKEY_ASN1_METHOD *ameth) | 182 | const EVP_PKEY_ASN1_METHOD *ameth) |
@@ -216,6 +202,10 @@ EVP_PKEY_get0_asn1(const EVP_PKEY *pkey) | |||
216 | return pkey->ameth; | 202 | return pkey->ameth; |
217 | } | 203 | } |
218 | 204 | ||
205 | /* | ||
206 | * XXX - remove all the API below here in the next major bump. | ||
207 | */ | ||
208 | |||
219 | EVP_PKEY_ASN1_METHOD* | 209 | EVP_PKEY_ASN1_METHOD* |
220 | EVP_PKEY_asn1_new(int id, int flags, const char *pem_str, const char *info) | 210 | EVP_PKEY_asn1_new(int id, int flags, const char *pem_str, const char *info) |
221 | { | 211 | { |
@@ -364,3 +354,18 @@ EVP_PKEY_asn1_set_param_check(EVP_PKEY_ASN1_METHOD *ameth, | |||
364 | { | 354 | { |
365 | ameth->pkey_param_check = pkey_param_check; | 355 | ameth->pkey_param_check = pkey_param_check; |
366 | } | 356 | } |
357 | |||
358 | int | ||
359 | EVP_PKEY_asn1_add0(const EVP_PKEY_ASN1_METHOD *ameth) | ||
360 | { | ||
361 | EVPerror(ERR_R_DISABLED); | ||
362 | return 0; | ||
363 | } | ||
364 | |||
365 | int | ||
366 | EVP_PKEY_asn1_add_alias(int to, int from) | ||
367 | { | ||
368 | EVPerror(ERR_R_DISABLED); | ||
369 | return 0; | ||
370 | } | ||
371 | |||