[openssl] master update

[tmraz at fedoraproject.org]

The branch master has been updated
       via  02f209bb47bdf6a03489d57ac1ba6ae5f2ed8c78 (commit)
      from  a6dfa188204f81231a9d25cd007d0753657bcc1a (commit)


- Log -----------------------------------------------------------------
commit 02f209bb47bdf6a03489d57ac1ba6ae5f2ed8c78
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Wed Jun 12 12:01:19 2019 +0200

    ts: Fix awkward sentences in the documentation and the default digest
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/9143)

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

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

diff --git a/doc/man1/ts.pod b/doc/man1/ts.pod
index 66b8295..ade077a 100644
--- a/doc/man1/ts.pod
+++ b/doc/man1/ts.pod
@@ -170,7 +170,7 @@ in use. (Optional)
 
 The message digest to apply to the data file.
 Any digest supported by the OpenSSL B<dgst> command can be used.
-The default is SHA-1. (Optional)
+The default is SHA-256. (Optional)
 
 =item B<-tspolicy> object_id
 
@@ -530,8 +530,9 @@ openssl/apps/openssl.cnf will do.
 
 =head2 Time Stamp Request
 
-To create a time stamp request for design1.txt with SHA-256
-without nonce and policy and no certificate is required in the response:
+To create a time stamp request for design1.txt with SHA-256 digest,
+without nonce and policy, and without requirement for a certificate
+in the response:
 
   openssl ts -query -data design1.txt -no_nonce \
         -out design1.tsq
@@ -547,7 +548,7 @@ To print the content of the previous request in human readable format:
   openssl ts -query -in design1.tsq -text
 
 To create a time stamp request which includes the SHA-512 digest
-of design2.txt, requests the signer certificate and nonce,
+of design2.txt, requests the signer certificate and nonce, and
 specifies a policy id (assuming the tsa_policy1 name is defined in the
 OID section of the config file):