diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/Symbols.list | 5 | ||||
| -rw-r--r-- | src/lib/libcrypto/asn1/x_crl.c | 35 | ||||
| -rw-r--r-- | src/lib/libcrypto/x509/x509.h | 14 |
3 files changed, 2 insertions, 52 deletions
diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list index 2c411b3565..608291d954 100644 --- a/src/lib/libcrypto/Symbols.list +++ b/src/lib/libcrypto/Symbols.list | |||
| @@ -2556,8 +2556,6 @@ X509_CINF_new | |||
| 2556 | X509_CRL_INFO_free | 2556 | X509_CRL_INFO_free |
| 2557 | X509_CRL_INFO_it | 2557 | X509_CRL_INFO_it |
| 2558 | X509_CRL_INFO_new | 2558 | X509_CRL_INFO_new |
| 2559 | X509_CRL_METHOD_free | ||
| 2560 | X509_CRL_METHOD_new | ||
| 2561 | X509_CRL_add0_revoked | 2559 | X509_CRL_add0_revoked |
| 2562 | X509_CRL_add1_ext_i2d | 2560 | X509_CRL_add1_ext_i2d |
| 2563 | X509_CRL_add_ext | 2561 | X509_CRL_add_ext |
| @@ -2582,7 +2580,6 @@ X509_CRL_get_ext_count | |||
| 2582 | X509_CRL_get_ext_d2i | 2580 | X509_CRL_get_ext_d2i |
| 2583 | X509_CRL_get_issuer | 2581 | X509_CRL_get_issuer |
| 2584 | X509_CRL_get_lastUpdate | 2582 | X509_CRL_get_lastUpdate |
| 2585 | X509_CRL_get_meth_data | ||
| 2586 | X509_CRL_get_nextUpdate | 2583 | X509_CRL_get_nextUpdate |
| 2587 | X509_CRL_get_signature_nid | 2584 | X509_CRL_get_signature_nid |
| 2588 | X509_CRL_get_version | 2585 | X509_CRL_get_version |
| @@ -2593,10 +2590,8 @@ X509_CRL_print | |||
| 2593 | X509_CRL_print_fp | 2590 | X509_CRL_print_fp |
| 2594 | X509_CRL_set1_lastUpdate | 2591 | X509_CRL_set1_lastUpdate |
| 2595 | X509_CRL_set1_nextUpdate | 2592 | X509_CRL_set1_nextUpdate |
| 2596 | X509_CRL_set_default_method | ||
| 2597 | X509_CRL_set_issuer_name | 2593 | X509_CRL_set_issuer_name |
| 2598 | X509_CRL_set_lastUpdate | 2594 | X509_CRL_set_lastUpdate |
| 2599 | X509_CRL_set_meth_data | ||
| 2600 | X509_CRL_set_nextUpdate | 2595 | X509_CRL_set_nextUpdate |
| 2601 | X509_CRL_set_version | 2596 | X509_CRL_set_version |
| 2602 | X509_CRL_sign | 2597 | X509_CRL_sign |
diff --git a/src/lib/libcrypto/asn1/x_crl.c b/src/lib/libcrypto/asn1/x_crl.c index b58d88833c..e3d16352a7 100644 --- a/src/lib/libcrypto/asn1/x_crl.c +++ b/src/lib/libcrypto/asn1/x_crl.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x_crl.c,v 1.42 2024/01/06 17:37:23 tb Exp $ */ | 1 | /* $OpenBSD: x_crl.c,v 1.43 2024/03/02 10:59:41 tb Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -603,39 +603,6 @@ X509_CRL_get0_by_cert(X509_CRL *crl, X509_REVOKED **ret, X509 *x) | |||
| 603 | X509_get_issuer_name(x)); | 603 | X509_get_issuer_name(x)); |
| 604 | } | 604 | } |
| 605 | 605 | ||
| 606 | void | ||
| 607 | X509_CRL_set_default_method(const X509_CRL_METHOD *meth) | ||
| 608 | { | ||
| 609 | } | ||
| 610 | |||
| 611 | X509_CRL_METHOD * | ||
| 612 | X509_CRL_METHOD_new(int (*crl_init)(X509_CRL *crl), | ||
| 613 | int (*crl_free)(X509_CRL *crl), | ||
| 614 | int (*crl_lookup)(X509_CRL *crl, X509_REVOKED **ret, | ||
| 615 | ASN1_INTEGER *ser, X509_NAME *issuer), | ||
| 616 | int (*crl_verify)(X509_CRL *crl, EVP_PKEY *pk)) | ||
| 617 | { | ||
| 618 | X509error(ERR_R_DISABLED); | ||
| 619 | return NULL; | ||
| 620 | } | ||
| 621 | |||
| 622 | void | ||
| 623 | X509_CRL_METHOD_free(X509_CRL_METHOD *m) | ||
| 624 | { | ||
| 625 | } | ||
| 626 | |||
| 627 | void | ||
| 628 | X509_CRL_set_meth_data(X509_CRL *crl, void *dat) | ||
| 629 | { | ||
| 630 | } | ||
| 631 | |||
| 632 | void * | ||
| 633 | X509_CRL_get_meth_data(X509_CRL *crl) | ||
| 634 | { | ||
| 635 | X509error(ERR_R_DISABLED); | ||
| 636 | return NULL; | ||
| 637 | } | ||
| 638 | |||
| 639 | int | 606 | int |
| 640 | X509_CRL_get_signature_nid(const X509_CRL *crl) | 607 | X509_CRL_get_signature_nid(const X509_CRL *crl) |
| 641 | { | 608 | { |
diff --git a/src/lib/libcrypto/x509/x509.h b/src/lib/libcrypto/x509/x509.h index 98a0bcb201..59c5f16108 100644 --- a/src/lib/libcrypto/x509/x509.h +++ b/src/lib/libcrypto/x509/x509.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509.h,v 1.110 2024/03/02 10:52:24 tb Exp $ */ | 1 | /* $OpenBSD: x509.h,v 1.111 2024/03/02 10:59:41 tb Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -356,18 +356,6 @@ int X509_REQ_get_signature_nid(const X509_REQ *req); | |||
| 356 | void X509_REQ_get0_signature(const X509_REQ *req, const ASN1_BIT_STRING **psig, | 356 | void X509_REQ_get0_signature(const X509_REQ *req, const ASN1_BIT_STRING **psig, |
| 357 | const X509_ALGOR **palg); | 357 | const X509_ALGOR **palg); |
| 358 | 358 | ||
| 359 | void X509_CRL_set_default_method(const X509_CRL_METHOD *meth); | ||
| 360 | X509_CRL_METHOD *X509_CRL_METHOD_new( | ||
| 361 | int (*crl_init)(X509_CRL *crl), | ||
| 362 | int (*crl_free)(X509_CRL *crl), | ||
| 363 | int (*crl_lookup)(X509_CRL *crl, X509_REVOKED **ret, | ||
| 364 | ASN1_INTEGER *ser, X509_NAME *issuer), | ||
| 365 | int (*crl_verify)(X509_CRL *crl, EVP_PKEY *pk)); | ||
| 366 | void X509_CRL_METHOD_free(X509_CRL_METHOD *m); | ||
| 367 | |||
| 368 | void X509_CRL_set_meth_data(X509_CRL *crl, void *dat); | ||
| 369 | void *X509_CRL_get_meth_data(X509_CRL *crl); | ||
| 370 | |||
| 371 | X509_PUBKEY *X509_get_X509_PUBKEY(const X509 *x); | 359 | X509_PUBKEY *X509_get_X509_PUBKEY(const X509 *x); |
| 372 | 360 | ||
| 373 | const char *X509_verify_cert_error_string(long n); | 361 | const char *X509_verify_cert_error_string(long n); |
