Remove X509_CRL_METHOD API

I would keep repeating myself... In the bit bucket you go.

ok jsing

diff --git a/lib/libcrypto/Symbols.list b/lib/libcrypto/Symbols.list
index 2c411b3..608291d 100644 (file)
--- a/lib/libcrypto/Symbols.list
+++ b/lib/libcrypto/Symbols.list
@@ -2556,8 +2556,6 @@ X509_CINF_new
 X509_CRL_INFO_free
 X509_CRL_INFO_it
 X509_CRL_INFO_new
-X509_CRL_METHOD_free
-X509_CRL_METHOD_new
 X509_CRL_add0_revoked
 X509_CRL_add1_ext_i2d
 X509_CRL_add_ext
@@ -2582,7 +2580,6 @@ X509_CRL_get_ext_count
 X509_CRL_get_ext_d2i
 X509_CRL_get_issuer
 X509_CRL_get_lastUpdate
-X509_CRL_get_meth_data
 X509_CRL_get_nextUpdate
 X509_CRL_get_signature_nid
 X509_CRL_get_version
@@ -2593,10 +2590,8 @@ X509_CRL_print
 X509_CRL_print_fp
 X509_CRL_set1_lastUpdate
 X509_CRL_set1_nextUpdate
-X509_CRL_set_default_method
 X509_CRL_set_issuer_name
 X509_CRL_set_lastUpdate
-X509_CRL_set_meth_data
 X509_CRL_set_nextUpdate
 X509_CRL_set_version
 X509_CRL_sign

diff --git a/lib/libcrypto/asn1/x_crl.c b/lib/libcrypto/asn1/x_crl.c
index b58d888..e3d1635 100644 (file)
--- a/lib/libcrypto/asn1/x_crl.c
+++ b/lib/libcrypto/asn1/x_crl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x_crl.c,v 1.42 2024/01/06 17:37:23 tb Exp $ */
+/* $OpenBSD: x_crl.c,v 1.43 2024/03/02 10:59:41 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -603,39 +603,6 @@ X509_CRL_get0_by_cert(X509_CRL *crl, X509_REVOKED **ret, X509 *x)
            X509_get_issuer_name(x));
 }
 
-void
-X509_CRL_set_default_method(const X509_CRL_METHOD *meth)
-{
-}
-
-X509_CRL_METHOD *
-X509_CRL_METHOD_new(int (*crl_init)(X509_CRL *crl),
-    int (*crl_free)(X509_CRL *crl),
-    int (*crl_lookup)(X509_CRL *crl, X509_REVOKED **ret,
-    ASN1_INTEGER *ser, X509_NAME *issuer),
-    int (*crl_verify)(X509_CRL *crl, EVP_PKEY *pk))
-{
-       X509error(ERR_R_DISABLED);
-       return NULL;
-}
-
-void
-X509_CRL_METHOD_free(X509_CRL_METHOD *m)
-{
-}
-
-void
-X509_CRL_set_meth_data(X509_CRL *crl, void *dat)
-{
-}
-
-void *
-X509_CRL_get_meth_data(X509_CRL *crl)
-{
-       X509error(ERR_R_DISABLED);
-       return NULL;
-}
-
 int
 X509_CRL_get_signature_nid(const X509_CRL *crl)
 {

diff --git a/lib/libcrypto/x509/x509.h b/lib/libcrypto/x509/x509.h
index 98a0bcb..59c5f16 100644 (file)
--- a/lib/libcrypto/x509/x509.h
+++ b/lib/libcrypto/x509/x509.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509.h,v 1.110 2024/03/02 10:52:24 tb Exp $ */
+/* $OpenBSD: x509.h,v 1.111 2024/03/02 10:59:41 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -356,18 +356,6 @@ int X509_REQ_get_signature_nid(const X509_REQ *req);
 void X509_REQ_get0_signature(const X509_REQ *req, const ASN1_BIT_STRING **psig,
     const X509_ALGOR **palg);
 
-void X509_CRL_set_default_method(const X509_CRL_METHOD *meth);
-X509_CRL_METHOD *X509_CRL_METHOD_new(
-       int (*crl_init)(X509_CRL *crl),
-       int (*crl_free)(X509_CRL *crl),
-       int (*crl_lookup)(X509_CRL *crl, X509_REVOKED **ret,
-                               ASN1_INTEGER *ser, X509_NAME *issuer),
-       int (*crl_verify)(X509_CRL *crl, EVP_PKEY *pk));
-void X509_CRL_METHOD_free(X509_CRL_METHOD *m);
-
-void X509_CRL_set_meth_data(X509_CRL *crl, void *dat);
-void *X509_CRL_get_meth_data(X509_CRL *crl);
-
 X509_PUBKEY    *X509_get_X509_PUBKEY(const X509 *x);
 
 const char *X509_verify_cert_error_string(long n);