[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  c4eec78d221c6aa8d96d4d0ea9e7525490ffe222 (commit)
      from  dee0cc108fa92952df1f0a246e9e86bb660f1211 (commit)


- Log -----------------------------------------------------------------
commit c4eec78d221c6aa8d96d4d0ea9e7525490ffe222
Author: Konstantin Shemyak <konstantin at shemyak.com>
Date:   Thu Mar 22 19:53:59 2018 +0200

    doc/man1/x509.pod: corrected "S/MIME signing" requirements
    
    When the "certificate purpose" is checked and KeyUsage extension is present,
    either 'digitalSignature' or 'nonRepudiation' is accepted.
    
    Manual page corrected to reflect the above.
    
    Signed-off-by: Konstantin Shemyak <konstantin at shemyak.com>
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5727)

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

Summary of changes:
 doc/man1/x509.pod | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/man1/x509.pod b/doc/man1/x509.pod
index 81ce560..c375b3b 100644
--- a/doc/man1/x509.pod
+++ b/doc/man1/x509.pod
@@ -871,8 +871,8 @@ this is because some Verisign certificates don't set the S/MIME bit.
 
 =item B<S/MIME Signing>
 
-In addition to the common S/MIME client tests the digitalSignature bit must
-be set if the keyUsage extension is present.
+In addition to the common S/MIME client tests the digitalSignature bit or
+the nonRepudiation bit must be set if the keyUsage extension is present.
 
 =item B<S/MIME Encryption>