remove unused OSSL_CMP_ITAV_new0_crls()

siemens · Feb 23, 2024 · 3db3b6b · 3db3b6b
1 parent 330ec6b
commit 3db3b6b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 20 deletions.
diff --git a/crypto/cmp/cmp_asn.c b/crypto/cmp/cmp_asn.c
@@ -574,17 +574,6 @@ OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_crls(const X509_CRL *crl)
     return NULL;
 }
 
-OSSL_CMP_ITAV *OSSL_CMP_ITAV_new0_crls(STACK_OF(X509_CRL) *crls)
-{
-    OSSL_CMP_ITAV *itav;
-
-    if ((itav = OSSL_CMP_ITAV_new()) == NULL)
-        return NULL;
-    itav->infoType = OBJ_nid2obj(NID_id_it_crls);
-    itav->infoValue.crls = crls;
-    return itav;
-}
-
 int OSSL_CMP_ITAV_get0_crls(const OSSL_CMP_ITAV *itav, STACK_OF(X509_CRL) **out)
 {
     if (itav == NULL || out == NULL) {

diff --git a/doc/man3/OSSL_CMP_ITAV_new_caCerts.pod b/doc/man3/OSSL_CMP_ITAV_new_caCerts.pod
@@ -15,7 +15,7 @@ OSSL_CMP_CRLSTATUS_create,
 OSSL_CMP_CRLSTATUS_get0,
 OSSL_CMP_ITAV_new0_crlStatusList,
 OSSL_CMP_ITAV_get0_crlStatusList,
-OSSL_CMP_ITAV_new0_crls,
+OSSL_CMP_ITAV_new_crls,
 OSSL_CMP_ITAV_get0_crls
 - CMP utility functions for handling specific genm and genp messages
 
@@ -46,8 +46,7 @@ OSSL_CMP_ITAV_get0_crls
  *OSSL_CMP_ITAV_new0_crlStatusList(STACK_OF(OSSL_CMP_CRLSTATUS) *crlStatusList);
  int OSSL_CMP_ITAV_get0_crlStatusList(const OSSL_CMP_ITAV *itav,
                                       STACK_OF(OSSL_CMP_CRLSTATUS) **out);
- OSSL_CMP_ITAV
- *OSSL_CMP_ITAV_new0_crls(STACK_OF(X509_CRL) *crls);
+ OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_crls(const X509_CRL *crl);
  int OSSL_CMP_ITAV_get0_crls(const OSSL_CMP_ITAV *itav, STACK_OF(X509_CRL) **out);
 
 =head1 DESCRIPTION
@@ -132,8 +131,9 @@ pointer to the list of CRL status data in the infoValue field of I<itav>.
 The pointer may be NULL if no CRL status data is included.
 It is an error if the infoType of I<itav> is not B<crlStatusList>.
 
-OSSL_CMP_ITAV_new0_crls() creates a new B<OSSL_CMP_ITAV> structure
-of type B<crls> that includes the optionally given list of CRLs.
+OSSL_CMP_ITAV_new_crls() creates a new B<OSSL_CMP_ITAV> structure
+of type B<crls> and fills it with a copy of the provided CRL.
+The I<crl> argument may be NULL.
 
 OSSL_CMP_ITAV_get0_crls() on success assigns to I<*out> an internal pointer to
 the list of CRLs contained in the infoValue field of I<itav>.
@@ -149,7 +149,7 @@ CMP is defined in RFC 4210.
 OSSL_CMP_ITAV_new_caCerts(), OSSL_CMP_ITAV_new_rootCaCert(),
 OSSL_CMP_ITAV_new_rootCaKeyUpdate(), OSSL_CMP_CRLSTATUS_new1(),
 OSSL_CMP_CRLSTATUS_create(), OSSL_CMP_ITAV_new0_crlStatusList()
-and OSSL_CMP_ITAV_new0_crls()
+and OSSL_CMP_ITAV_new_crls()
 return a pointer to the new ITAV structure on success, or NULL on error.
 
 OSSL_CMP_ITAV_get0_caCerts(), OSSL_CMP_ITAV_get0_rootCaCert(),

diff --git a/include/openssl/cmp.h.in b/include/openssl/cmp.h.in
@@ -347,8 +347,6 @@ OSSL_CMP_ITAV
 int OSSL_CMP_ITAV_get0_crlStatusList(const OSSL_CMP_ITAV *itav,
                                      STACK_OF(OSSL_CMP_CRLSTATUS) **out);
 OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_crls(const X509_CRL *crls);
-OSSL_CMP_ITAV
-*OSSL_CMP_ITAV_new0_crls(STACK_OF(X509_CRL) *crls);
 int OSSL_CMP_ITAV_get0_crls(const OSSL_CMP_ITAV *it, STACK_OF(X509_CRL) **out);
 
 void OSSL_CMP_MSG_free(OSSL_CMP_MSG *msg);

diff --git a/util/libcrypto.num b/util/libcrypto.num
@@ -5553,7 +5553,6 @@ OSSL_CMP_CRLSTATUS_get0                 ?	3_3_0	EXIST::FUNCTION:CMP
 OSSL_CMP_CRLSTATUS_free                 ?	3_3_0	EXIST::FUNCTION:CMP
 OSSL_CMP_ITAV_new0_crlStatusList        ?	3_3_0	EXIST::FUNCTION:CMP
 OSSL_CMP_ITAV_get0_crlStatusList        ?	3_3_0	EXIST::FUNCTION:CMP
-OSSL_CMP_ITAV_new0_crls                 ?	3_3_0	EXIST::FUNCTION:CMP
 OSSL_CMP_ITAV_get0_crls                 ?	3_3_0	EXIST::FUNCTION:CMP
 OSSL_CMP_get1_crlUpdate                 ?	3_3_0	EXIST::FUNCTION:CMP
 OSSL_CMP_ITAV_new_crls                  ?	3_3_0	EXIST::FUNCTION:CMP