[openssl-commits] [openssl] master update

[matthias.st.pierre at ncp-e.com]

The branch master has been updated
       via  4a56d2a3b3dca6f73e46b56625e1c0ac3634e62c (commit)
      from  178989b4a3ed714fa169cae5865c75f156ec9fdb (commit)


- Log -----------------------------------------------------------------
commit 4a56d2a3b3dca6f73e46b56625e1c0ac3634e62c
Author: Ivan Filenko <ivan.filenko at protonmail.com>
Date:   Sun Feb 25 16:49:27 2018 +0300

    Fix typo in ASN1_STRING_length doc
    
    CLA: trivial
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/5458)

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

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

diff --git a/doc/man3/ASN1_STRING_length.pod b/doc/man3/ASN1_STRING_length.pod
index 1888612..85d3565 100644
--- a/doc/man3/ASN1_STRING_length.pod
+++ b/doc/man3/ASN1_STRING_length.pod
@@ -71,8 +71,8 @@ utility functions should be used instead.
 In general it cannot be assumed that the data returned by ASN1_STRING_data()
 is null terminated or does not contain embedded nulls. The actual format
 of the data will depend on the actual string type itself: for example
-for and IA5String the data will be ASCII, for a BMPString two bytes per
-character in big endian format, UTF8String will be in UTF8 format.
+for an IA5String the data will be ASCII, for a BMPString two bytes per
+character in big endian format, and for an UTF8String it will be in UTF8 format.
 
 Similar care should be take to ensure the data is in the correct format
 when calling ASN1_STRING_set().