[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  ee215c7eea91f193d4765127eb31332758753058 (commit)
      from  dcb982d792d6064ed3493e79749208d8c257ff04 (commit)


- Log -----------------------------------------------------------------
commit ee215c7eea91f193d4765127eb31332758753058
Author: Jakub Wilk <jwilk at jwilk.net>
Date:   Wed Apr 10 12:00:20 2019 +0200

    Fix typos
    
    CLA: trivial
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/8714)

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

Summary of changes:
 apps/include/fmt.h | 4 ++--
 ssl/ssl_locl.h     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/include/fmt.h b/apps/include/fmt.h
index 538a20a..e3da9a4 100644
--- a/apps/include/fmt.h
+++ b/apps/include/fmt.h
@@ -32,8 +32,8 @@
 # define FORMAT_PKCS12   6
 # define FORMAT_SMIME   (7 | B_FORMAT_TEXT)
 # define FORMAT_ENGINE   8                      /* Not really a file format */
-# define FORMAT_PEMRSA  (9 | B_FORMAT_TEXT)     /* PEM RSAPubicKey format */
-# define FORMAT_ASN1RSA  10                     /* DER RSAPubicKey format */
+# define FORMAT_PEMRSA  (9 | B_FORMAT_TEXT)     /* PEM RSAPublicKey format */
+# define FORMAT_ASN1RSA  10                     /* DER RSAPublicKey format */
 # define FORMAT_MSBLOB   11                     /* MS Key blob format */
 # define FORMAT_PVK      12                     /* MS PVK file format */
 # define FORMAT_HTTP     13                     /* Download using HTTP */
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 1d3397d..a5df3cf 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -1527,7 +1527,7 @@ typedef struct cert_pkey_st CERT_PKEY;
  * CERT_PKEY entries
  */
 typedef struct {
-    int nid; /* NID of pubic key algorithm */
+    int nid; /* NID of public key algorithm */
     uint32_t amask; /* authmask corresponding to key type */
 } SSL_CERT_LOOKUP;