Move decl of OSSL_CRMF_CERTID_dup from {crmf,cmp}_local.h to include/openssl/crmf.h

fixes #11818

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/11911)

diff --git a/crypto/cmp/cmp_local.h b/crypto/cmp/cmp_local.h
index 04abcf5084fbc5e4831b25e52f6036e4b99b5513..0c0ca3466a98031020248ea1ac12d8a51077e7ed 100644 (file)
--- a/crypto/cmp/cmp_local.h
+++ b/crypto/cmp/cmp_local.h
@@ -283,7 +283,6 @@ struct ossl_cmp_pkisi_st {
     OSSL_CMP_PKIFREETEXT *statusString;
     OSSL_CMP_PKIFAILUREINFO *failInfo;
 } /* OSSL_CMP_PKISI */;
-DECLARE_ASN1_DUP_FUNCTION(OSSL_CRMF_CERTID)
 
 /*-
  *  RevReqContent ::= SEQUENCE OF RevDetails

diff --git a/crypto/crmf/crmf_local.h b/crypto/crmf/crmf_local.h
index a367d777270b5cf63e965cb855488d7fe5fa2db0..b4d669875c1310a3de4a11ed615be3d8993f898c 100644 (file)
--- a/crypto/crmf/crmf_local.h
+++ b/crypto/crmf/crmf_local.h
@@ -108,7 +108,6 @@ struct ossl_crmf_certid_st {
     GENERAL_NAME *issuer;
     ASN1_INTEGER *serialNumber;
 } /* OSSL_CRMF_CERTID */;
-DECLARE_ASN1_DUP_FUNCTION(OSSL_CRMF_CERTID)
 
 /*-
  * SinglePubInfo ::= SEQUENCE {

diff --git a/include/openssl/crmf.h b/include/openssl/crmf.h
index 28eb68258f57aefd9f8b9049627657a4ea27c307..d262a9b759f3f75479154643ed04eab4f32f213b 100644 (file)
--- a/include/openssl/crmf.h
+++ b/include/openssl/crmf.h
@@ -51,6 +51,7 @@ typedef struct ossl_crmf_poposigningkey_st OSSL_CRMF_POPOSIGNINGKEY;
 typedef struct ossl_crmf_certrequest_st OSSL_CRMF_CERTREQUEST;
 typedef struct ossl_crmf_certid_st OSSL_CRMF_CERTID;
 DECLARE_ASN1_FUNCTIONS(OSSL_CRMF_CERTID)
+DECLARE_ASN1_DUP_FUNCTION(OSSL_CRMF_CERTID)
 DEFINE_OR_DECLARE_STACK_OF(OSSL_CRMF_CERTID)
 
 typedef struct ossl_crmf_pkipublicationinfo_st OSSL_CRMF_PKIPUBLICATIONINFO;

diff --git a/util/libcrypto.num b/util/libcrypto.num
index b131f81273898e9de47a330d6dd9dd9592f45fb5..aea01e55fa7d10ec00358d76a76fd88b1367320d 100644 (file)
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -4509,6 +4509,7 @@ OSSL_CRMF_PBMPARAMETER_new              ? 3_0_0   EXIST::FUNCTION:CRMF
 OSSL_CRMF_PBMPARAMETER_it               ?      3_0_0   EXIST::FUNCTION:CRMF
 d2i_OSSL_CRMF_CERTID                    ?      3_0_0   EXIST::FUNCTION:CRMF
 i2d_OSSL_CRMF_CERTID                    ?      3_0_0   EXIST::FUNCTION:CRMF
+OSSL_CRMF_CERTID_dup                    ?      3_0_0   EXIST::FUNCTION:CRMF
 OSSL_CRMF_CERTID_free                   ?      3_0_0   EXIST::FUNCTION:CRMF
 OSSL_CRMF_CERTID_new                    ?      3_0_0   EXIST::FUNCTION:CRMF
 OSSL_CRMF_CERTID_it                     ?      3_0_0   EXIST::FUNCTION:CRMF