Move decl of OSSL_CRMF_CERTID_dup from {crmf,cmp}_local.h to include/openssl/crmf.h
authorDr. David von Oheimb <David.von.Oheimb@siemens.com>
Fri, 22 May 2020 12:42:21 +0000 (14:42 +0200)
committerDr. David von Oheimb <David.von.Oheimb@siemens.com>
Sun, 24 May 2020 15:39:37 +0000 (17:39 +0200)
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)

crypto/cmp/cmp_local.h
crypto/crmf/crmf_local.h
include/openssl/crmf.h
util/libcrypto.num

index 04abcf5..0c0ca34 100644 (file)
@@ -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
index a367d77..b4d6698 100644 (file)
@@ -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 {
index 28eb682..d262a9b 100644 (file)
@@ -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;
index b131f81..aea01e5 100644 (file)
@@ -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