[openssl] master update

[dev at ddvo.net]

The branch master has been updated
       via  6e15b81c340e8124e45a92a2dbcd923c2ba4e79f (commit)
      from  5e5bc836fbc5b1c0af428864f5286bbb225f7baf (commit)


- Log -----------------------------------------------------------------
commit 6e15b81c340e8124e45a92a2dbcd923c2ba4e79f
Author: Dr. David von Oheimb <David.von.Oheimb at siemens.com>
Date:   Fri May 22 14:42:21 2020 +0200

    Move decl of OSSL_CRMF_CERTID_dup from {crmf,cmp}_local.h to include/openssl/crmf.h
    
    fixes #11818
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/11911)

-----------------------------------------------------------------------

Summary of changes:
 crypto/cmp/cmp_local.h   | 1 -
 crypto/crmf/crmf_local.h | 1 -
 include/openssl/crmf.h   | 1 +
 util/libcrypto.num       | 1 +
 4 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/cmp/cmp_local.h b/crypto/cmp/cmp_local.h
index 04abcf5084..0c0ca3466a 100644
--- 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 a367d77727..b4d669875c 100644
--- 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 28eb68258f..d262a9b759 100644
--- 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 b131f81273..aea01e55fa 100644
--- 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