[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  55c5c1b63a5f2497e26d734d597c40e4a36fe4af (commit)
      from  0df65d82dbc41e8da00adb243de5918db532c8a6 (commit)


- Log -----------------------------------------------------------------
commit 55c5c1b63a5f2497e26d734d597c40e4a36fe4af
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Jun 13 00:29:48 2018 +0200

    doc/man7/passphrase-encoding.pod: Make consistent
    
    The man name didn't match the file name, and some places had
    'password' instead of 'pass phrase'.
    
    Fixes #6474
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6476)

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

Summary of changes:
 doc/man7/passphrase-encoding.pod | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/man7/passphrase-encoding.pod b/doc/man7/passphrase-encoding.pod
index d5c9d1e..6810844 100644
--- a/doc/man7/passphrase-encoding.pod
+++ b/doc/man7/passphrase-encoding.pod
@@ -4,7 +4,7 @@
 
 =head1 NAME
 
-password encoding
+passphrase-encoding
 - How diverse parts of OpenSSL treat pass phrases character encoding
 
 =head1 DESCRIPTION
@@ -61,11 +61,11 @@ OpenSSL still does this, to be able to read files produced with older versions.
 
 It should be noted that this approach isn't entirely fault free.
 
-A passphrase encoded in ISO-8859-2 could very well have a sequence such as
+A pass phrase encoded in ISO-8859-2 could very well have a sequence such as
 0xC3 0xAF (which is the two characters "LATIN CAPITAL LETTER A WITH BREVE"
 and "LATIN CAPITAL LETTER Z WITH DOT ABOVE" in ISO-8859-2 encoding), but would
 be misinterpreted as the perfectly valid UTF-8 encoded code point U+00EF (LATIN
-SMALL LETTER I WITH DIARESIS) I<if the passphrase doesn't contain anything that
+SMALL LETTER I WITH DIARESIS) I<if the pass phrase doesn't contain anything that
 would be invalid UTF-8>.
 A pass phrase that contains this kind of byte sequence will give a different
 outcome in OpenSSL 1.1.0 and newer than in OpenSSL older than 1.1.0.
@@ -133,7 +133,7 @@ following:
 
 =item 1.
 
-Try the password that you have as it is in the character encoding of your
+Try the pass phrase that you have as it is in the character encoding of your
 environment.
 It's possible that its byte sequence is exactly right.