Commit ecd4b8fe authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix some errors and missing info in the CMS docs 



Fixes #5063

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6134)
parent 8a0c91d3

doc/man1/cms.pod

+8 −8
Original line number Diff line number Diff line
@@ -394,6 +394,9 @@ When encrypting a message this option may be used multiple times to specify 
each recipient. This form B<must> be used if customised parameters are

required (for example to specify RSA-OAEP).



Only certificates carrying RSA, Diffie-Hellman or EC keys are supported by this

option.



=item B<-keyid>



Use subject key identifier to identify certificates instead of issuer name and
@@ -718,19 +721,16 @@ No revocation checking is done on the signer's certificate. 
=head1 HISTORY



The use of multiple B<-signer> options and the B<-resign> command were first

added in OpenSSL 1.0.0



The B<keyopt> option was first added in OpenSSL 1.1.0

added in OpenSSL 1.0.0.



The use of B<-recip> to specify the recipient when encrypting mail was first

added to OpenSSL 1.1.0

The B<keyopt> option was first added in OpenSSL 1.0.2.



Support for RSA-OAEP and RSA-PSS was first added to OpenSSL 1.1.0.

Support for RSA-OAEP and RSA-PSS was first added to OpenSSL 1.0.2.



The use of non-RSA keys with B<-encrypt> and B<-decrypt> was first added

to OpenSSL 1.1.0.

to OpenSSL 1.0.2.



The -no_alt_chains options was first added to OpenSSL 1.1.0.

The -no_alt_chains options was first added to OpenSSL 1.0.2b.



=head1 COPYRIGHT

doc/man3/CMS_encrypt.pod

+2 −3
Original line number Diff line number Diff line
@@ -19,9 +19,8 @@ B<cipher> is the symmetric cipher to use. B<flags> is an optional set of flags. 


=head1 NOTES



Only certificates carrying RSA keys are supported so the recipient certificates

supplied to this function must all contain RSA public keys, though they do not

have to be signed using the RSA algorithm.

Only certificates carrying RSA, Diffie-Hellman or EC keys are supported by this

function.



EVP_des_ede3_cbc() (triple DES) is the algorithm of choice for S/MIME use

because most clients will support it.