diff options
Diffstat (limited to 'src/lib/libcrypto/x509')
-rw-r--r-- | src/lib/libcrypto/x509/x509_lib.c | 36 | ||||
-rw-r--r-- | src/lib/libcrypto/x509/x509v3.h | 6 |
2 files changed, 2 insertions, 40 deletions
diff --git a/src/lib/libcrypto/x509/x509_lib.c b/src/lib/libcrypto/x509/x509_lib.c index 5ddfc37619..c5151d407e 100644 --- a/src/lib/libcrypto/x509/x509_lib.c +++ b/src/lib/libcrypto/x509/x509_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509_lib.c,v 1.16 2024/01/25 15:09:22 tb Exp $ */ | 1 | /* $OpenBSD: x509_lib.c,v 1.17 2024/03/02 10:35:32 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 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -333,37 +333,3 @@ err: | |||
333 | return 0; | 333 | return 0; |
334 | } | 334 | } |
335 | LCRYPTO_ALIAS(X509V3_add1_i2d); | 335 | LCRYPTO_ALIAS(X509V3_add1_i2d); |
336 | |||
337 | /* | ||
338 | * XXX - remove all the functions below in the next major bump. | ||
339 | */ | ||
340 | |||
341 | int | ||
342 | X509V3_EXT_add(X509V3_EXT_METHOD *ext) | ||
343 | { | ||
344 | X509V3error(ERR_R_DISABLED); | ||
345 | return 0; | ||
346 | } | ||
347 | LCRYPTO_ALIAS(X509V3_EXT_add); | ||
348 | |||
349 | int | ||
350 | X509V3_EXT_add_list(X509V3_EXT_METHOD *extlist) | ||
351 | { | ||
352 | X509V3error(ERR_R_DISABLED); | ||
353 | return 0; | ||
354 | } | ||
355 | LCRYPTO_ALIAS(X509V3_EXT_add_list); | ||
356 | |||
357 | int | ||
358 | X509V3_EXT_add_alias(int nid_to, int nid_from) | ||
359 | { | ||
360 | X509V3error(ERR_R_DISABLED); | ||
361 | return 0; | ||
362 | } | ||
363 | LCRYPTO_ALIAS(X509V3_EXT_add_alias); | ||
364 | |||
365 | void | ||
366 | X509V3_EXT_cleanup(void) | ||
367 | { | ||
368 | } | ||
369 | LCRYPTO_ALIAS(X509V3_EXT_cleanup); | ||
diff --git a/src/lib/libcrypto/x509/x509v3.h b/src/lib/libcrypto/x509/x509v3.h index f867cc38c3..676fd62c27 100644 --- a/src/lib/libcrypto/x509/x509v3.h +++ b/src/lib/libcrypto/x509/x509v3.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509v3.h,v 1.25 2023/06/25 18:15:21 tb Exp $ */ | 1 | /* $OpenBSD: x509v3.h,v 1.26 2024/03/02 10:35:32 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 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -692,10 +692,6 @@ ASN1_INTEGER *s2i_ASN1_INTEGER(X509V3_EXT_METHOD *meth, const char *value); | |||
692 | char *i2s_ASN1_ENUMERATED(X509V3_EXT_METHOD *meth, const ASN1_ENUMERATED *aint); | 692 | char *i2s_ASN1_ENUMERATED(X509V3_EXT_METHOD *meth, const ASN1_ENUMERATED *aint); |
693 | char *i2s_ASN1_ENUMERATED_TABLE(X509V3_EXT_METHOD *meth, | 693 | char *i2s_ASN1_ENUMERATED_TABLE(X509V3_EXT_METHOD *meth, |
694 | const ASN1_ENUMERATED *aint); | 694 | const ASN1_ENUMERATED *aint); |
695 | int X509V3_EXT_add(X509V3_EXT_METHOD *ext); | ||
696 | int X509V3_EXT_add_list(X509V3_EXT_METHOD *extlist); | ||
697 | int X509V3_EXT_add_alias(int nid_to, int nid_from); | ||
698 | void X509V3_EXT_cleanup(void); | ||
699 | 695 | ||
700 | const X509V3_EXT_METHOD *X509V3_EXT_get(X509_EXTENSION *ext); | 696 | const X509V3_EXT_METHOD *X509V3_EXT_get(X509_EXTENSION *ext); |
701 | const X509V3_EXT_METHOD *X509V3_EXT_get_nid(int nid); | 697 | const X509V3_EXT_METHOD *X509V3_EXT_get_nid(int nid); |