[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  61e033308b1c004bd808352fb1d786547dcdf62b (commit)
      from  3d43f9c809e42b960be94f2f4490d6d14e063486 (commit)


- Log -----------------------------------------------------------------
commit 61e033308b1c004bd808352fb1d786547dcdf62b
Author: Michael Richardson <mcr at sandelman.ca>
Date:   Thu Dec 27 13:26:49 2018 -0500

    clarify which functions are the CMS functions which must have CMS_PARTIAL set
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7960)

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

Summary of changes:
 doc/man3/CMS_get0_type.pod | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/man3/CMS_get0_type.pod b/doc/man3/CMS_get0_type.pod
index bd45e14..986154f 100644
--- a/doc/man3/CMS_get0_type.pod
+++ b/doc/man3/CMS_get0_type.pod
@@ -20,7 +20,8 @@ an ASN1_OBJECT pointer. An application can then decide how to process the
 CMS_ContentInfo structure based on this value.
 
 CMS_set1_eContentType() sets the embedded content type of a CMS_ContentInfo
-structure. It should be called with CMS functions with the B<CMS_PARTIAL>
+structure. It should be called with CMS functions (such as L<CMS_sign>, L<CMS_encrypt>)
+with the B<CMS_PARTIAL>
 flag and B<before> the structure is finalised, otherwise the results are
 undefined.