Commit dc423f89 authored Jun 12, 2016 by FdaSilvaYY Committed by Rich Salz Jun 15, 2016

Constify CMS_get0_type input



Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1215)

parent 472f727c

crypto/cms/cms_lib.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -19,7 +19,7 @@
	IMPLEMENT_ASN1_FUNCTIONS(CMS_ContentInfo)		IMPLEMENT_ASN1_FUNCTIONS(CMS_ContentInfo)
	IMPLEMENT_ASN1_PRINT_FUNCTION(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;		return cms->contentType;
	}		}

doc/crypto/CMS_get0_type.pod

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -8,7 +8,7 @@ CMS_get0_type, CMS_set1_eContentType, CMS_get0_eContentType, CMS_get0_content -

	#include <openssl/cms.h>		#include <openssl/cms.h>

	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);		int CMS_set1_eContentType(CMS_ContentInfo cms, const ASN1_OBJECT oid);
	const ASN1_OBJECT CMS_get0_eContentType(CMS_ContentInfo cms);		const ASN1_OBJECT CMS_get0_eContentType(CMS_ContentInfo cms);
	ASN1_OCTET_STRING *CMS_get0_content(CMS_ContentInfo cms);		ASN1_OCTET_STRING *CMS_get0_content(CMS_ContentInfo cms);

include/openssl/cms.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -73,7 +73,7 @@ DECLARE_ASN1_PRINT_FUNCTION(CMS_ContentInfo)
	# define CMS_KEY_PARAM 0x40000		# define CMS_KEY_PARAM 0x40000
	# define CMS_ASCIICRLF 0x80000		# 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);		BIO CMS_dataInit(CMS_ContentInfo cms, BIO *icont);
	int CMS_dataFinal(CMS_ContentInfo cms, BIO bio);		int CMS_dataFinal(CMS_ContentInfo cms, BIO bio);