From: FdaSilvaYY Date: Sun, 12 Jun 2016 09:18:13 +0000 (+0200) Subject: Constify CMS_get0_type input X-Git-Tag: OpenSSL_1_1_0-pre6~431 X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=dc423f898e7d15913d31fee311502239d4167266 Constify CMS_get0_type input Reviewed-by: Kurt Roeckx Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/1215) --- diff --git a/crypto/cms/cms_lib.c b/crypto/cms/cms_lib.c index f9c73d1cbf..86d92996c6 100644 --- a/crypto/cms/cms_lib.c +++ b/crypto/cms/cms_lib.c @@ -19,7 +19,7 @@ IMPLEMENT_ASN1_FUNCTIONS(CMS_ContentInfo) IMPLEMENT_ASN1_PRINT_FUNCTION(CMS_ContentInfo) -const ASN1_OBJECT *CMS_get0_type(CMS_ContentInfo *cms) +const ASN1_OBJECT *CMS_get0_type(const CMS_ContentInfo *cms) { return cms->contentType; } diff --git a/doc/crypto/CMS_get0_type.pod b/doc/crypto/CMS_get0_type.pod index 06b06551be..cad8d3f662 100644 --- a/doc/crypto/CMS_get0_type.pod +++ b/doc/crypto/CMS_get0_type.pod @@ -8,7 +8,7 @@ CMS_get0_type, CMS_set1_eContentType, CMS_get0_eContentType, CMS_get0_content - #include - const ASN1_OBJECT *CMS_get0_type(CMS_ContentInfo *cms); + const ASN1_OBJECT *CMS_get0_type(const CMS_ContentInfo *cms); int CMS_set1_eContentType(CMS_ContentInfo *cms, const ASN1_OBJECT *oid); const ASN1_OBJECT *CMS_get0_eContentType(CMS_ContentInfo *cms); ASN1_OCTET_STRING **CMS_get0_content(CMS_ContentInfo *cms); diff --git a/include/openssl/cms.h b/include/openssl/cms.h index 57c877de98..b1252acd6e 100644 --- a/include/openssl/cms.h +++ b/include/openssl/cms.h @@ -73,7 +73,7 @@ DECLARE_ASN1_PRINT_FUNCTION(CMS_ContentInfo) # define CMS_KEY_PARAM 0x40000 # define CMS_ASCIICRLF 0x80000 -const ASN1_OBJECT *CMS_get0_type(CMS_ContentInfo *cms); +const ASN1_OBJECT *CMS_get0_type(const CMS_ContentInfo *cms); BIO *CMS_dataInit(CMS_ContentInfo *cms, BIO *icont); int CMS_dataFinal(CMS_ContentInfo *cms, BIO *bio);